Skip to content

Commit 12e1c81

Browse files
[Java v2 SDK] Upgrades OpenAPI Generator from 7.12.0 to 7.26.0 (#586)
2 parents 1f70408 + 06a7379 commit 12e1c81

274 files changed

Lines changed: 3864 additions & 3660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎sdks/java-v2/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ repositories {
2222
mavenCentral()
2323
}
2424

25+
ext {
26+
swagger_annotations_version = "1.6.5"
27+
jackson_version = "2.21.6"
28+
jackson_annotations_version = "2.21"
29+
jackson_databind_version = "2.21.6"
30+
jakarta_annotation_version = "2.1.0"
31+
jersey_version = "3.0.4"
32+
junit_version = "5.8.2"
33+
mockito_version = "3.12.4"
34+
}
35+
2536
tasks.withType(JavaCompile).configureEach {
2637
options.encoding = 'UTF-8'
2738
}
@@ -57,16 +68,6 @@ artifacts {
5768
archives javadocJar, sourcesJar, fatJar
5869
}
5970

60-
ext {
61-
swagger_annotations_version = "1.6.5"
62-
jackson_version = "2.17.1"
63-
jackson_databind_version = "2.17.1"
64-
jakarta_annotation_version = "2.1.0"
65-
jersey_version = "3.0.4"
66-
junit_version = "5.8.2"
67-
mockito_version = "3.12.4"
68-
}
69-
7071
dependencies {
7172
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
7273
implementation "com.google.code.findbugs:jsr305:3.0.2"
@@ -76,11 +77,10 @@ dependencies {
7677
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
7778
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version"
7879
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
79-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
80+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
8081
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
8182
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
8283
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
83-
8484
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
8585
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
8686
testImplementation "org.mockito:mockito-core:$mockito_version"

‎sdks/java-v2/build.sbt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ lazy val root = (project in file(".")).
33
organization := "com.dropbox.sign",
44
name := "dropbox-sign",
55
version := "2.7-dev",
6-
scalaVersion := "2.11.4",
6+
scalaVersion := "2.11.12",
77
scalacOptions ++= Seq("-feature"),
88
Compile / javacOptions ++= Seq("-Xlint:deprecation"),
99
Compile / packageDoc / publishArtifact := false,
@@ -17,10 +17,10 @@ lazy val root = (project in file(".")).
1717
"org.glassfish.jersey.media" % "jersey-media-multipart" % "3.0.4",
1818
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.0.4",
1919
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.0.4",
20-
"com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile",
21-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile",
23-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.1" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.6" % "compile",
21+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
22+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.6" % "compile",
23+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
2424
"jakarta.annotation" % "jakarta.annotation-api" % "2.1.0" % "compile",
2525
"org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
2626
)

‎sdks/java-v2/gradle/wrapper/gradle-wrapper.properties‎

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-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎sdks/java-v2/pom.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
<dependency>
312312
<groupId>com.fasterxml.jackson.core</groupId>
313313
<artifactId>jackson-annotations</artifactId>
314-
<version>${jackson-version}</version>
314+
<version>${jackson-annotations-version}</version>
315315
</dependency>
316316
<dependency>
317317
<groupId>com.fasterxml.jackson.core</groupId>
@@ -323,6 +323,7 @@
323323
<artifactId>jackson-datatype-jsr310</artifactId>
324324
<version>${jackson-version}</version>
325325
</dependency>
326+
<!-- Note: for useJackson3, jackson-datatype-jsr310 is included in jackson-databind -->
326327
<dependency>
327328
<groupId>jakarta.annotation</groupId>
328329
<artifactId>jakarta.annotation-api</artifactId>
@@ -351,12 +352,13 @@
351352
</dependencies>
352353
<properties>
353354
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
354-
<jersey-version>3.1.1</jersey-version>
355-
<jackson-version>2.17.1</jackson-version>
356-
<jackson-databind-version>2.17.1</jackson-databind-version>
357-
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
355+
<jersey-version>3.1.11</jersey-version>
356+
<jackson-version>2.21.6</jackson-version>
357+
<jackson-annotations-version>2.21</jackson-annotations-version>
358+
<jackson-databind-version>2.21.6</jackson-databind-version>
359+
<jackson-databind-nullable-version>0.2.12</jackson-databind-nullable-version>
358360
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
359-
<beanvalidation-version>3.0.2</beanvalidation-version>
361+
<beanvalidation-version>3.1.1</beanvalidation-version>
360362
<junit-version>5.10.0</junit-version>
361363
<spotless.version>2.21.0</spotless.version>
362364
<mockito.version>3.12.4</mockito.version>

‎sdks/java-v2/run-build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# see https://github.com/OpenAPITools/openapi-generator/tree/v7.8.0/modules/openapi-generator/src/main/resources/Java
3+
# see https://github.com/OpenAPITools/openapi-generator/tree/v7.26.0/modules/openapi-generator/src/main/resources/Java
44

55
set -e
66

@@ -18,7 +18,7 @@ rm -f "${DIR}/src/main/java/com/dropbox/sign/model/"*.java
1818

1919
docker run --rm \
2020
-v "${DIR}/:/local" \
21-
openapitools/openapi-generator-cli:v7.12.0 generate \
21+
openapitools/openapi-generator-cli:v7.26.0 generate \
2222
-i "/local/openapi-sdk.yaml" \
2323
-c "/local/openapi-config.yaml" \
2424
-t "/local/templates" \

0 commit comments

Comments
 (0)