loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-08 19:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java][RestTemplate] Gradle Build include non-compatible Spring Dependency with jakarta disabled (#21426)

Browse Source 
* [Java][resttemplate] fix spring-web dependency for gradle without jakarta enabled

* fix samples
This commit is contained in:
Steven Blakowski
2025-06-19 10:11:37 +02:00
committed by GitHub
parent 8d8e3ddf16
commit cef971cf9a
83 changed files with 94 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
}

12
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache vendored
View File

@@ -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}}
@@ -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"

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

@@ -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'
@@ -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'

12
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache vendored
View File

@@ -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"
@@ -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"
}

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache vendored
View File

@@ -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"