Skip to content

Commit cef971c

Browse files
[Java][RestTemplate] Gradle Build include non-compatible Spring Dependency with jakarta disabled (#21426)
* [Java][resttemplate] fix spring-web dependency for gradle without jakarta enabled * fix samples
1 parent 8d8e3dd commit cef971c

File tree

83 files changed

+94
-63
lines changed

Some content is hidden

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

83 files changed

+94
-63
lines changed

.github/workflows/samples-java-client-jdk11.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ jobs:
110110
path: |
111111
~/.m2
112112
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
113-
- name: Build
113+
- name: Build with Maven
114114
working-directory: ${{ matrix.sample }}
115115
run: mvn clean package --no-transfer-progress
116+
117+
- name: Cache gradle dependencies
118+
uses: actions/cache@v4
119+
env:
120+
cache-name: gradle-caches
121+
with:
122+
path: ~/.gradle/caches
123+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
124+
125+
- name: Cache gradle wrapper
126+
uses: actions/cache@v4
127+
env:
128+
cache-name: gradle-wrapper
129+
with:
130+
path: ~/.gradle/wrapper
131+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
132+
133+
- name: Build with Gradle
134+
working-directory: ${{ matrix.sample }}
135+
if: ${{ hashFiles('./gradlew') != '' }}
136+
run: ./gradlew build -x test

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
9797
}
9898

9999
task sourcesJar(type: Jar, dependsOn: classes) {
100-
classifier = 'sources'
100+
archiveClassifier = 'sources'
101101
from sourceSets.main.allSource
102102
}
103103

104104
task javadocJar(type: Jar, dependsOn: javadoc) {
105-
classifier = 'javadoc'
105+
archiveClassifier = 'javadoc'
106106
from javadoc.destinationDir
107107
}
108108

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,12 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
ext {
101-
swagger_annotations_version = "1.6.5"
101+
{{#swagger1AnnotationLibrary}}
102+
swagger_annotations_version = "1.6.6"
103+
{{/swagger1AnnotationLibrary}}
104+
{{#swagger2AnnotationLibrary}}
105+
swagger_annotations_version = "2.2.15"
106+
{{/swagger2AnnotationLibrary}}
102107
jackson_version = "2.17.1"
103108
jackson_databind_version = "2.17.1"
104109
{{#openApiNullable}}
@@ -122,7 +127,12 @@ ext {
122127
}
123128

124129
dependencies {
130+
{{#swagger1AnnotationLibrary}}
125131
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
132+
{{/swagger1AnnotationLibrary}}
133+
{{#swagger2AnnotationLibrary}}
134+
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
135+
{{/swagger2AnnotationLibrary}}
126136
implementation "com.google.code.findbugs:jsr305:3.0.2"
127137
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
128138
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,25 @@ if(hasProperty('target') && target == 'android') {
106106
}
107107

108108
ext {
109+
{{#swagger1AnnotationLibrary}}
110+
swagger_annotations_version = "1.6.9"
111+
{{/swagger1AnnotationLibrary}}
112+
{{#swagger2AnnotationLibrary}}
113+
swagger_annotations_version = "2.2.9"
114+
{{/swagger2AnnotationLibrary}}
109115
jakarta_annotation_version = "1.3.5"
116+
{{#useBeanValidation}}
117+
bean_validation_version = "2.0.2"
118+
{{/useBeanValidation}}
110119
}
111120

112121
dependencies {
113-
implementation 'io.swagger:swagger-annotations:1.6.8'
122+
{{#swagger1AnnotationLibrary}}
123+
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
124+
{{/swagger1AnnotationLibrary}}
125+
{{#swagger2AnnotationLibrary}}
126+
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
127+
{{/swagger2AnnotationLibrary}}
114128
implementation "com.google.code.findbugs:jsr305:3.0.2"
115129
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
116130
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
@@ -134,6 +148,9 @@ dependencies {
134148
implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
135149
{{/dynamicOperations}}
136150
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
151+
{{#useBeanValidation}}
152+
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
153+
{{/useBeanValidation}}
137154
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
138155
testImplementation 'org.mockito:mockito-core:3.12.4'
139156
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ ext {
121121
jackson_databind_nullable_version = "0.2.6"
122122
{{/openApiNullable}}
123123
{{#useJakartaEe}}
124-
spring_web_version = "6.1.5"
124+
spring_web_version = "6.2.8"
125125
jakarta_annotation_version = "2.1.1"
126-
beanvalidation_version = "3.0.2"
126+
bean_validation_version = "3.0.2"
127127
{{/useJakartaEe}}
128128
{{^useJakartaEe}}
129-
spring_web_version = "6.2.8"
129+
spring_web_version = "5.3.33"
130130
jakarta_annotation_version = "1.3.5"
131-
beanvalidation_version = "2.0.2"
131+
bean_validation_version = "2.0.2"
132132
{{/useJakartaEe}}
133133
jodatime_version = "2.9.9"
134134
junit_version = "5.10.2"
@@ -163,8 +163,12 @@ dependencies {
163163
{{/joda}}
164164
{{#withXml}}
165165
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
166+
implementation "io.github.threeten-jaxb:threeten-jaxb-core:1.2"
166167
{{/withXml}}
167168
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
169+
{{#useBeanValidation}}
170+
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
171+
{{/useBeanValidation}}
168172
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
169173
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
170174
}

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ dependencies {
134134
implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
135135
{{/useRxJava2}}
136136
{{#useRxJava3}}
137-
implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
137+
implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
138138
implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
139139
{{/useRxJava3}}
140140
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"

samples/client/echo_api/java/apache-httpclient/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
9797
}
9898

9999
task sourcesJar(type: Jar, dependsOn: classes) {
100-
classifier = 'sources'
100+
archiveClassifier = 'sources'
101101
from sourceSets.main.allSource
102102
}
103103

104104
task javadocJar(type: Jar, dependsOn: javadoc) {
105-
classifier = 'javadoc'
105+
archiveClassifier = 'javadoc'
106106
from javadoc.destinationDir
107107
}
108108

samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/echo_api/java/okhttp-gson/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/echo_api/java/resttemplate/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.2.8"
103+
spring_web_version = "5.3.33"
104104
jakarta_annotation_version = "1.3.5"
105-
beanvalidation_version = "2.0.2"
105+
bean_validation_version = "2.0.2"
106106
jodatime_version = "2.9.9"
107107
junit_version = "5.10.2"
108108
}

samples/client/echo_api/kotlin-jvm-okhttp/gradlew

100644100755
File mode changed.

samples/client/echo_api/kotlin-jvm-spring-3-restclient/gradlew

100644100755
File mode changed.

samples/client/echo_api/kotlin-jvm-spring-3-webclient/gradlew

100644100755
File mode changed.

samples/client/echo_api/kotlin-model-prefix-type-mappings/gradlew

100644100755
File mode changed.

samples/client/others/java/jersey2-oneOf-Mixed/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
ext {
101-
swagger_annotations_version = "1.6.5"
102101
jackson_version = "2.17.1"
103102
jackson_databind_version = "2.17.1"
104103
jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
108107
}
109108

110109
dependencies {
111-
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
112110
implementation "com.google.code.findbugs:jsr305:3.0.2"
113111
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
114112
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"

samples/client/others/java/jersey2-oneOf-Mixed/gradlew

100644100755
File mode changed.

samples/client/others/java/jersey2-oneOf-duplicates/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
ext {
101-
swagger_annotations_version = "1.6.5"
102101
jackson_version = "2.17.1"
103102
jackson_databind_version = "2.17.1"
104103
jackson_databind_nullable_version = "0.2.6"
@@ -108,7 +107,6 @@ ext {
108107
}
109108

110109
dependencies {
111-
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
112110
implementation "com.google.code.findbugs:jsr305:3.0.2"
113111
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
114112
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"

samples/client/others/java/jersey2-oneOf-duplicates/gradlew

100644100755
File mode changed.

samples/client/others/java/okhttp-gson-oneOf-array/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ if(hasProperty('target') && target == 'android') {
103103

104104
ext {
105105
jakarta_annotation_version = "1.3.5"
106+
bean_validation_version = "2.0.2"
106107
}
107108

108109
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110110
implementation "com.google.code.findbugs:jsr305:3.0.2"
111111
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112112
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
@@ -116,6 +116,7 @@ dependencies {
116116
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
117117
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
118118
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
119+
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
119120
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
120121
testImplementation 'org.mockito:mockito-core:3.12.4'
121122
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'

samples/client/others/java/okhttp-gson-oneOf-array/gradlew

100644100755
File mode changed.

samples/client/others/java/okhttp-gson-oneOf/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/others/java/okhttp-gson-oneOf/gradlew

100644100755
File mode changed.

samples/client/others/java/okhttp-gson-streaming/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/others/java/okhttp-gson-streaming/gradlew

100644100755
File mode changed.

samples/client/others/java/restclient-useAbstractionForFiles/gradlew

100644100755
File mode changed.

samples/client/others/java/resttemplate-list-schema-validation/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.2.8"
103+
spring_web_version = "5.3.33"
104104
jakarta_annotation_version = "1.3.5"
105-
beanvalidation_version = "2.0.2"
105+
bean_validation_version = "2.0.2"
106106
jodatime_version = "2.9.9"
107107
junit_version = "5.10.2"
108108
}
@@ -118,6 +118,7 @@ dependencies {
118118
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
119119
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
120120
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
121+
implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
121122
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
122123
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
123124
}

samples/client/others/java/resttemplate-list-schema-validation/gradlew

100644100755
File mode changed.

samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.2.8"
103+
spring_web_version = "5.3.33"
104104
jakarta_annotation_version = "1.3.5"
105-
beanvalidation_version = "2.0.2"
105+
bean_validation_version = "2.0.2"
106106
jodatime_version = "2.9.9"
107107
junit_version = "5.10.2"
108108
}

samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew

100644100755
File mode changed.

samples/client/others/java/webclient-useAbstractionForFiles/gradlew

100644100755
File mode changed.

samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/gradlew

100644100755
File mode changed.

samples/client/others/kotlin-jvm-okhttp-parameter-tests/gradlew

100644100755
File mode changed.

samples/client/others/kotlin-jvm-okhttp-path-comments/gradlew

100644100755
File mode changed.

samples/client/petstore/java/apache-httpclient/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ if(hasProperty('target') && target == 'android') {
9797
}
9898

9999
task sourcesJar(type: Jar, dependsOn: classes) {
100-
classifier = 'sources'
100+
archiveClassifier = 'sources'
101101
from sourceSets.main.allSource
102102
}
103103

104104
task javadocJar(type: Jar, dependsOn: javadoc) {
105-
classifier = 'javadoc'
105+
archiveClassifier = 'javadoc'
106106
from javadoc.destinationDir
107107
}
108108

samples/client/petstore/java/apache-httpclient/gradlew

100644100755
File mode changed.

samples/client/petstore/java/feign-hc5/gradlew

100644100755
File mode changed.

samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
ext {
101-
swagger_annotations_version = "1.6.5"
102101
jackson_version = "2.17.1"
103102
jackson_databind_version = "2.17.1"
104103
jackson_databind_nullable_version = "0.2.6"
@@ -109,7 +108,6 @@ ext {
109108
}
110109

111110
dependencies {
112-
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
113111
implementation "com.google.code.findbugs:jsr305:3.0.2"
114112
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
115113
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"

samples/client/petstore/java/jersey2-java8-localdatetime/gradlew

100644100755
File mode changed.

samples/client/petstore/java/jersey2-java8/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ if(hasProperty('target') && target == 'android') {
9898
}
9999

100100
ext {
101-
swagger_annotations_version = "1.6.5"
102101
jackson_version = "2.17.1"
103102
jackson_databind_version = "2.17.1"
104103
jackson_databind_nullable_version = "0.2.6"
@@ -109,7 +108,6 @@ ext {
109108
}
110109

111110
dependencies {
112-
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
113111
implementation "com.google.code.findbugs:jsr305:3.0.2"
114112
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
115113
implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"

samples/client/petstore/java/jersey2-java8/gradlew

100644100755
File mode changed.

samples/client/petstore/java/jersey3-oneOf/gradlew

100644100755
File mode changed.

samples/client/petstore/java/jersey3/gradlew

100644100755
File mode changed.

samples/client/petstore/java/native-jakarta/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-3.1/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-3.1/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-awsv4signature/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-group-parameter/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-nullable-required/gradlew

100644100755
File mode changed.

samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111110
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
112111
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'

samples/client/petstore/java/okhttp-gson-parcelableModel/gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)