Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions sdks/java-v2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ repositories {
mavenCentral()
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.21.6"
jackson_annotations_version = "2.21"
jackson_databind_version = "2.21.6"
jakarta_annotation_version = "2.1.0"
jersey_version = "3.0.4"
junit_version = "5.8.2"
mockito_version = "3.12.4"
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
Expand Down Expand Up @@ -57,16 +68,6 @@ artifacts {
archives javadocJar, sourcesJar, fatJar
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jakarta_annotation_version = "2.1.0"
jersey_version = "3.0.4"
junit_version = "5.8.2"
mockito_version = "3.12.4"
}

dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
Expand All @@ -76,11 +77,10 @@ dependencies {
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"

testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation "org.mockito:mockito-core:$mockito_version"
Expand Down
10 changes: 5 additions & 5 deletions sdks/java-v2/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ lazy val root = (project in file(".")).
organization := "com.dropbox.sign",
name := "dropbox-sign",
version := "2.7-dev",
scalaVersion := "2.11.4",
scalaVersion := "2.11.12",
scalacOptions ++= Seq("-feature"),
Compile / javacOptions ++= Seq("-Xlint:deprecation"),
Compile / packageDoc / publishArtifact := false,
Expand All @@ -17,10 +17,10 @@ lazy val root = (project in file(".")).
"org.glassfish.jersey.media" % "jersey-media-multipart" % "3.0.4",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "3.0.4",
"org.glassfish.jersey.connectors" % "jersey-apache-connector" % "3.0.4",
"com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.6" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.6" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "2.1.0" % "compile",
"org.junit.jupiter" % "junit-jupiter-api" % "5.8.2" % "test"
)
Expand Down
2 changes: 1 addition & 1 deletion sdks/java-v2/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 8 additions & 6 deletions sdks/java-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
<version>${jackson-annotations-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -323,6 +323,7 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<!-- Note: for useJackson3, jackson-datatype-jsr310 is included in jackson-databind -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down Expand Up @@ -351,12 +352,13 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey-version>3.1.1</jersey-version>
<jackson-version>2.17.1</jackson-version>
<jackson-databind-version>2.17.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
<jersey-version>3.1.11</jersey-version>
<jackson-version>2.21.6</jackson-version>
<jackson-annotations-version>2.21</jackson-annotations-version>
<jackson-databind-version>2.21.6</jackson-databind-version>
<jackson-databind-nullable-version>0.2.12</jackson-databind-nullable-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<beanvalidation-version>3.0.2</beanvalidation-version>
<beanvalidation-version>3.1.1</beanvalidation-version>
<junit-version>5.10.0</junit-version>
<spotless.version>2.21.0</spotless.version>
<mockito.version>3.12.4</mockito.version>
Expand Down
4 changes: 2 additions & 2 deletions sdks/java-v2/run-build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

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

set -e

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

docker run --rm \
-v "${DIR}/:/local" \
openapitools/openapi-generator-cli:v7.12.0 generate \
openapitools/openapi-generator-cli:v7.26.0 generate \
-i "/local/openapi-sdk.yaml" \
-c "/local/openapi-config.yaml" \
-t "/local/templates" \
Expand Down
Loading
Loading