loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

upgrade swagger-parser to latest version (#18436)

Browse Source 
* upgrade swagger-parser to latest version

* additional upgrades to address gradle failures
This commit is contained in:
Charles Treatman 2024-05-08 23:29:33 -05:00 committed by GitHub
parent 98f9c07bc4
commit 75dd531e65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
modules/openapi-generator-gradle-plugin/pom.xml
View File

@ -17,8 +17,8 @@
<properties> <properties>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<gradleVersion>7.6</gradleVersion> <gradleVersion>7.6.4</gradleVersion>
<gradle-tooling.version>7.3-20210825160000+0000</gradle-tooling.version> <gradle-tooling.version>7.4.2</gradle-tooling.version>
</properties> </properties>
<pluginRepositories> <pluginRepositories>

2
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskConfigurationCacheTest.kt
View File

@ -20,7 +20,7 @@ class GenerateTaskConfigurationCacheTest : TestBase() {
} }
@DataProvider(name = "gradle_version_provider") @DataProvider(name = "gradle_version_provider")
private fun gradleVersionProviderWithConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6")) private fun gradleVersionProviderWithConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
@DataProvider(name = "gradle_version_provider_without_cc") @DataProvider(name = "gradle_version_provider_without_cc")
private fun gradleVersionProviderWithoutConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("5.6.1")) private fun gradleVersionProviderWithoutConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("5.6.1"))

2
modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt
View File

@ -22,7 +22,7 @@ class GenerateTaskFromCacheTest : TestBase() {
} }
@DataProvider(name = "gradle_version_provider") @DataProvider(name = "gradle_version_provider")
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6")) private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
// inputSpec tests // inputSpec tests

2
modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt
View File

@ -9,7 +9,7 @@ import kotlin.test.assertEquals
class GenerateTaskUpToDateTest : TestBase() { class GenerateTaskUpToDateTest : TestBase() {
@DataProvider(name = "gradle_version_provider") @DataProvider(name = "gradle_version_provider")
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6")) private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
// inputSpec tests // inputSpec tests

4
modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt
View File

@ -17,8 +17,8 @@ class ValidateTaskDslTest : TestBase() {
@DataProvider(name = "gradle_version_provider") @DataProvider(name = "gradle_version_provider")
fun gradleVersionProvider(): Array<Array<String?>> = arrayOf( fun gradleVersionProvider(): Array<Array<String?>> = arrayOf(
arrayOf(null), // uses the version of Gradle used to build the plugin itself arrayOf(null), // uses the version of Gradle used to build the plugin itself
arrayOf("8.1.1"), arrayOf("8.7"),
arrayOf("7.6") arrayOf("7.6.4")
) )
private fun getGradleRunner(gradleVersion: String?): GradleRunner { private fun getGradleRunner(gradleVersion: String?): GradleRunner {

6
pom.xml
View File

@ -1227,8 +1227,8 @@
<guava.version>32.1.3-jre</guava.version> <guava.version>32.1.3-jre</guava.version>
<handlebars-java.version>4.3.1</handlebars-java.version> <handlebars-java.version>4.3.1</handlebars-java.version>
<jackson-threetenbp.version>2.15.2</jackson-threetenbp.version> <jackson-threetenbp.version>2.15.2</jackson-threetenbp.version>
<jackson-databind.version>2.15.3</jackson-databind.version> <jackson-databind.version>2.16.2</jackson-databind.version>
<jackson.version>2.15.3</jackson.version> <jackson.version>2.16.2</jackson.version>
<jacoco.version>0.8.10</jacoco.version> <jacoco.version>0.8.10</jacoco.version>
<jmustache.version>1.15</jmustache.version> <jmustache.version>1.15</jmustache.version>
<junit.version>5.10.2</junit.version> <junit.version>5.10.2</junit.version>
@ -1252,7 +1252,7 @@
<slf4j.version>1.7.36</slf4j.version> <slf4j.version>1.7.36</slf4j.version>
<spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version> <spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version>
<swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version> <swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
<swagger-parser.version>2.1.19</swagger-parser.version> <swagger-parser.version>2.1.22</swagger-parser.version>
<testng.version>7.5</testng.version> <testng.version>7.5</testng.version>
<violations-maven-plugin.version>1.34</violations-maven-plugin.version> <violations-maven-plugin.version>1.34</violations-maven-plugin.version>
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version> <wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>