mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-12-20 00:27:04 +00:00
[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
This commit is contained in:
@@ -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"
|
||||
@@ -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"
|
||||
|
||||
0
samples/client/others/java/jersey2-oneOf-Mixed/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/jersey2-oneOf-Mixed/gradlew
vendored
Normal file → Executable file
@@ -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"
|
||||
@@ -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"
|
||||
|
||||
0
samples/client/others/java/jersey2-oneOf-duplicates/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/jersey2-oneOf-duplicates/gradlew
vendored
Normal file → Executable file
@@ -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'
|
||||
@@ -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'
|
||||
|
||||
0
samples/client/others/java/okhttp-gson-oneOf-array/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/okhttp-gson-oneOf-array/gradlew
vendored
Normal file → Executable file
@@ -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'
|
||||
|
||||
0
samples/client/others/java/okhttp-gson-oneOf/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/okhttp-gson-oneOf/gradlew
vendored
Normal file → Executable file
@@ -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'
|
||||
|
||||
0
samples/client/others/java/okhttp-gson-streaming/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/okhttp-gson-streaming/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/restclient-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/restclient-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
@@ -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"
|
||||
}
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
0
samples/client/others/java/resttemplate-list-schema-validation/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/resttemplate-list-schema-validation/gradlew
vendored
Normal file → Executable file
@@ -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"
|
||||
}
|
||||
|
||||
0
samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/resttemplate-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/webclient-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
0
samples/client/others/java/webclient-useAbstractionForFiles/gradlew
vendored
Normal file → Executable file
Reference in New Issue
Block a user