Skip to content

Commit 75dd531

Browse files
authored
upgrade swagger-parser to latest version (#18436)
* upgrade swagger-parser to latest version * additional upgrades to address gradle failures
1 parent 98f9c07 commit 75dd531

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

modules/openapi-generator-gradle-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<properties>
1919
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
20-
<gradleVersion>7.6</gradleVersion>
21-
<gradle-tooling.version>7.3-20210825160000+0000</gradle-tooling.version>
20+
<gradleVersion>7.6.4</gradleVersion>
21+
<gradle-tooling.version>7.4.2</gradle-tooling.version>
2222
</properties>
2323

2424
<pluginRepositories>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class GenerateTaskConfigurationCacheTest : TestBase() {
2020
}
2121

2222
@DataProvider(name = "gradle_version_provider")
23-
private fun gradleVersionProviderWithConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6"))
23+
private fun gradleVersionProviderWithConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
2424

2525
@DataProvider(name = "gradle_version_provider_without_cc")
2626
private fun gradleVersionProviderWithoutConfigurationCache(): Array<Array<String>> = arrayOf(arrayOf("5.6.1"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GenerateTaskFromCacheTest : TestBase() {
2222
}
2323

2424
@DataProvider(name = "gradle_version_provider")
25-
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6"))
25+
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
2626

2727
// inputSpec tests
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlin.test.assertEquals
99
class GenerateTaskUpToDateTest : TestBase() {
1010

1111
@DataProvider(name = "gradle_version_provider")
12-
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6"))
12+
private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.7"), arrayOf("7.6.4"))
1313

1414
// inputSpec tests
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class ValidateTaskDslTest : TestBase() {
1717
@DataProvider(name = "gradle_version_provider")
1818
fun gradleVersionProvider(): Array<Array<String?>> = arrayOf(
1919
arrayOf(null), // uses the version of Gradle used to build the plugin itself
20-
arrayOf("8.1.1"),
21-
arrayOf("7.6")
20+
arrayOf("8.7"),
21+
arrayOf("7.6.4")
2222
)
2323

2424
private fun getGradleRunner(gradleVersion: String?): GradleRunner {

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,8 +1227,8 @@
12271227
<guava.version>32.1.3-jre</guava.version>
12281228
<handlebars-java.version>4.3.1</handlebars-java.version>
12291229
<jackson-threetenbp.version>2.15.2</jackson-threetenbp.version>
1230-
<jackson-databind.version>2.15.3</jackson-databind.version>
1231-
<jackson.version>2.15.3</jackson.version>
1230+
<jackson-databind.version>2.16.2</jackson-databind.version>
1231+
<jackson.version>2.16.2</jackson.version>
12321232
<jacoco.version>0.8.10</jacoco.version>
12331233
<jmustache.version>1.15</jmustache.version>
12341234
<junit.version>5.10.2</junit.version>
@@ -1252,7 +1252,7 @@
12521252
<slf4j.version>1.7.36</slf4j.version>
12531253
<spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version>
12541254
<swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
1255-
<swagger-parser.version>2.1.19</swagger-parser.version>
1255+
<swagger-parser.version>2.1.22</swagger-parser.version>
12561256
<testng.version>7.5</testng.version>
12571257
<violations-maven-plugin.version>1.34</violations-maven-plugin.version>
12581258
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>

0 commit comments

Comments
 (0)