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
23 changes: 22 additions & 1 deletion .github/workflows/samples-java-client-jdk11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,27 @@ jobs:
path: |
~/.m2
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
- name: Build
- name: Build with Maven
working-directory: ${{ matrix.sample }}
run: mvn clean package --no-transfer-progress

- name: Cache gradle dependencies
uses: actions/cache@v4
env:
cache-name: gradle-caches
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}

- name: Cache gradle wrapper
uses: actions/cache@v4
env:
cache-name: gradle-wrapper
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

- name: Build with Gradle
working-directory: ${{ matrix.sample }}
if: ${{ hashFiles('./gradlew') != '' }}
run: ./gradlew build -x test
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ if(hasProperty('target') && target == 'android') {
}

ext {
swagger_annotations_version = "1.6.5"
{{#swagger1AnnotationLibrary}}
swagger_annotations_version = "1.6.6"
{{/swagger1AnnotationLibrary}}
{{#swagger2AnnotationLibrary}}
swagger_annotations_version = "2.2.15"
{{/swagger2AnnotationLibrary}}
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
{{#openApiNullable}}
Expand All @@ -122,7 +127,12 @@ ext {
}

dependencies {
{{#swagger1AnnotationLibrary}}
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
{{/swagger1AnnotationLibrary}}
{{#swagger2AnnotationLibrary}}
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
{{/swagger2AnnotationLibrary}}
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,25 @@ if(hasProperty('target') && target == 'android') {
}

ext {
{{#swagger1AnnotationLibrary}}
swagger_annotations_version = "1.6.9"
{{/swagger1AnnotationLibrary}}
{{#swagger2AnnotationLibrary}}
swagger_annotations_version = "2.2.9"
{{/swagger2AnnotationLibrary}}
jakarta_annotation_version = "1.3.5"
{{#useBeanValidation}}
bean_validation_version = "2.0.2"
{{/useBeanValidation}}
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
{{#swagger1AnnotationLibrary}}
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
{{/swagger1AnnotationLibrary}}
{{#swagger2AnnotationLibrary}}
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
{{/swagger2AnnotationLibrary}}
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand All @@ -134,6 +148,9 @@ dependencies {
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
{{/dynamicOperations}}
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
{{#useBeanValidation}}
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
{{/useBeanValidation}}
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ ext {
jackson_databind_nullable_version = "0.2.6"
{{/openApiNullable}}
{{#useJakartaEe}}
spring_web_version = "6.1.5"
spring_web_version = "6.2.8"
jakarta_annotation_version = "2.1.1"
beanvalidation_version = "3.0.2"
bean_validation_version = "3.0.2"
{{/useJakartaEe}}
{{^useJakartaEe}}
spring_web_version = "6.2.8"
spring_web_version = "5.3.33"
jakarta_annotation_version = "1.3.5"
beanvalidation_version = "2.0.2"
bean_validation_version = "2.0.2"
{{/useJakartaEe}}
jodatime_version = "2.9.9"
junit_version = "5.10.2"
Expand Down Expand Up @@ -163,8 +163,12 @@ dependencies {
{{/joda}}
{{#withXml}}
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
implementation "io.github.threeten-jaxb:threeten-jaxb-core:1.2"
{{/withXml}}
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
{{#useBeanValidation}}
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
{{/useBeanValidation}}
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
{{/useRxJava2}}
{{#useRxJava3}}
implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
{{/useRxJava3}}
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
Expand Down
4 changes: 2 additions & 2 deletions samples/client/echo_api/java/apache-httpclient/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
1 change: 0 additions & 1 deletion samples/client/echo_api/java/okhttp-gson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
4 changes: 2 additions & 2 deletions samples/client/echo_api/java/resttemplate/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ ext {
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
spring_web_version = "6.2.8"
spring_web_version = "5.3.33"
jakarta_annotation_version = "1.3.5"
beanvalidation_version = "2.0.2"
bean_validation_version = "2.0.2"
jodatime_version = "2.9.9"
junit_version = "5.10.2"
}
Expand Down
Empty file modified samples/client/echo_api/kotlin-jvm-okhttp/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/echo_api/kotlin-jvm-spring-3-restclient/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/echo_api/kotlin-jvm-spring-3-webclient/gradlew
100644 → 100755
Empty file.
Empty file.
2 changes: 0 additions & 2 deletions samples/client/others/java/jersey2-oneOf-Mixed/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
Expand All @@ -108,7 +107,6 @@ ext {
}

dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
Expand Down
Empty file modified samples/client/others/java/jersey2-oneOf-Mixed/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
Expand All @@ -108,7 +107,6 @@ ext {
}

dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
Expand Down
Empty file modified samples/client/others/java/jersey2-oneOf-duplicates/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ if(hasProperty('target') && target == 'android') {

ext {
jakarta_annotation_version = "1.3.5"
bean_validation_version = "2.0.2"
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand All @@ -116,6 +116,7 @@ dependencies {
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
Expand Down
Empty file modified samples/client/others/java/okhttp-gson-oneOf-array/gradlew
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion samples/client/others/java/okhttp-gson-oneOf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file modified samples/client/others/java/okhttp-gson-oneOf/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file modified samples/client/others/java/okhttp-gson-streaming/gradlew
100644 → 100755
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ ext {
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
spring_web_version = "6.2.8"
spring_web_version = "5.3.33"
jakarta_annotation_version = "1.3.5"
beanvalidation_version = "2.0.2"
bean_validation_version = "2.0.2"
jodatime_version = "2.9.9"
junit_version = "5.10.2"
}
Expand All @@ -118,6 +118,7 @@ dependencies {
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
}
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ ext {
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
spring_web_version = "6.2.8"
spring_web_version = "5.3.33"
jakarta_annotation_version = "1.3.5"
beanvalidation_version = "2.0.2"
bean_validation_version = "2.0.2"
jodatime_version = "2.9.9"
junit_version = "5.10.2"
}
Expand Down
Empty file.
Empty file.
Empty file.
Empty file modified samples/client/others/kotlin-jvm-okhttp-parameter-tests/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/others/kotlin-jvm-okhttp-path-comments/gradlew
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions samples/client/petstore/java/apache-httpclient/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand Down
Empty file modified samples/client/petstore/java/apache-httpclient/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/petstore/java/feign-hc5/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
Expand All @@ -109,7 +108,6 @@ ext {
}

dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
Expand Down
Empty file.
2 changes: 0 additions & 2 deletions samples/client/petstore/java/jersey2-java8/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
}

ext {
swagger_annotations_version = "1.6.5"
jackson_version = "2.17.1"
jackson_databind_version = "2.17.1"
jackson_databind_nullable_version = "0.2.6"
Expand All @@ -109,7 +108,6 @@ ext {
}

dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
Expand Down
Empty file modified samples/client/petstore/java/jersey2-java8/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/petstore/java/jersey3-oneOf/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/petstore/java/jersey3/gradlew
100644 → 100755
Empty file.
Empty file modified samples/client/petstore/java/native-jakarta/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file.
1 change: 0 additions & 1 deletion samples/client/petstore/java/okhttp-gson-3.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file modified samples/client/petstore/java/okhttp-gson-3.1/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file modified samples/client/petstore/java/okhttp-gson-awsv4signature/gradlew
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
Expand Down
Empty file.
Loading
Loading