diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index c594694ead3..5fcf6e8ab52 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -132,8 +132,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.openapitools diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index 70dea8f3f25..6a12e63d329 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -56,7 +56,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -129,6 +129,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" {{#threetenbp}} jackson_threetenbp_version = "2.9.10" {{/threetenbp}} @@ -161,6 +162,6 @@ dependencies { {{^java8}} implementation "com.brsanthu:migbase64:2.2" {{/java8}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache index b12d43c0440..89c3f5ffaf3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache @@ -321,9 +321,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -345,9 +345,9 @@ {{/parcelableModel}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -366,7 +366,10 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 1.0.0 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index eda36125e37..93944f967e2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -105,6 +105,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" {{#threetenbp}} jackson_threetenbp_version = "2.9.10" {{/threetenbp}} @@ -140,7 +141,7 @@ dependencies { implementation "com.brsanthu:migbase64:2.2" implementation "com.github.scribejava:scribejava-core:$scribejava_version" implementation "com.brsanthu:migbase64:2.2" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "org.junit.jupiter:junit-jupiter:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache index 95745cdad26..f2912f0dfb9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache @@ -23,7 +23,7 @@ lazy val root = (project in file(".")). "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "org.junit.jupiter" % "junit-jupiter" % "5.7.0" % "test", "org.junit.jupiter" % "junit-jupiter-params" % "5.7.0" % "test", "com.github.tomakehurst" % "wiremock-jre8" % "2.27.2" % "test", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index 28b5437ccc0..5f87e95f569 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -311,9 +311,9 @@ ${scribejava-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -371,7 +371,7 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 5.7.0 1.0.0 8.0.0 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 6abca3fddb7..766ddb5c52d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -113,6 +113,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" @@ -147,6 +148,6 @@ dependencies { {{#withXml}} implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" {{/withXml}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache index be30ae48caf..721b638dd9d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache @@ -27,7 +27,7 @@ lazy val root = (project in file(".")). {{#threetenbp}} "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", {{/threetenbp}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index fdcb6953faf..bcd5b7d3bff 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -298,9 +298,9 @@ {{/threetenbp}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -328,7 +328,7 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 1.0.0 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 378de9fb1e1..95c49396bfa 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -112,6 +112,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" {{#threetenbp}} @@ -157,7 +158,7 @@ dependencies { {{^java8}} implementation "com.brsanthu:migbase64:2.2" {{/java8}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache index 9823c3c657e..910f21f798d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache @@ -36,7 +36,7 @@ lazy val root = (project in file(".")). {{^java8}} "com.brsanthu" % "migbase64" % "2.2", {{/java8}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index f36f0cd8817..4a87eaeed45 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -344,16 +344,16 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -379,7 +379,10 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 4.13.1 {{#hasHttpSignatureMethods}} 1.5 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache index 6803b15c083..642e02c21c3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache @@ -67,8 +67,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -82,9 +82,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} provided @@ -109,19 +109,19 @@ {{/disableMultipart}} - javax.json.bind - javax.json.bind-api - 1.0 + jakarta.json.bind + jakarta.json.bind-api + ${jakarta.json.bind-version} - javax.json - javax.json-api - 1.1.4 + jakarta.json + jakarta.json-api + ${jakarta.json-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} com.sun.xml.bind @@ -134,9 +134,9 @@ 2.2.11 - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + ${jakarta.activation-version} {{#java8}} @@ -161,9 +161,9 @@ {{/useBeanValidationFeature}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -184,13 +184,17 @@ 9.2.9.v20150224 4.13.1 1.2.0 - 2.5 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 3.2.7 2.9.7 - 1.3.2 + 1.2.2 + 1.3.5 + 1.0.2 + 1.1.6 + 2.1.6 + 2.3.3 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache index 36504882370..46d8966d431 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache @@ -63,6 +63,7 @@ artifacts { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.4" + jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" {{#threetenbp}} threetenbp_version = "2.9.10" @@ -77,7 +78,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:0.2.1" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" {{#threetenbp}} implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" {{/threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache index 4a90d80c3dc..d81feac5e79 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache @@ -208,9 +208,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -230,7 +230,7 @@ 11 2.10.4 0.2.1 - 1.3.2 + 1.3.5 {{#threetenbp}} 2.9.10 {{/threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index e02068856b6..7ed25443766 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -56,7 +56,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:javax.annotation-api:1.3.2' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -101,6 +101,10 @@ if(hasProperty('target') && target == 'android') { } } +ext { + jakarta_annotation_version = "1.3.5" +} + dependencies { implementation 'io.swagger:swagger-annotations:1.5.24' implementation "com.google.code.findbugs:jsr305:3.0.2" @@ -124,7 +128,7 @@ dependencies { {{#dynamicOperations}} implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' {{/dynamicOperations}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation 'junit:junit:4.13.1' } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache index ccab8251805..907e8a916ec 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache @@ -30,9 +30,9 @@ lazy val root = (project in file(".")). "io.swagger.parser.v3" % "swagger-parser-v3" "2.0.23" % "compile" {{/dynamicOperations}} "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 39f6f2b5c4b..780b025dbc7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -284,9 +284,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -298,9 +298,9 @@ 5.4.1.Final - javax.el - el-api - 2.2 + jakarta.el + jakarta.el-api + ${jakarta.el-version} {{/performBeanValidation}} {{#parcelableModel}} @@ -313,9 +313,9 @@ {{/parcelableModel}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided {{#openApiNullable}} @@ -357,7 +357,13 @@ {{#threetenbp}} 1.5.0 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#performBeanValidation}} + 3.0.3 +{{/performBeanValidation}} +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 4.13.1 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index 4659399ee1d..a1db459b5ae 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -104,6 +104,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" {{#threetenbp}} jackson_threetenbp_version = "2.10.0" {{/threetenbp}} @@ -158,11 +159,11 @@ dependencies { {{/threetenbp}} implementation "com.squareup.okio:okio:$okio_version" {{#useBeanValidation}} - implementation "javax.validation:validation-api:2.0.1.Final" + implementation "jakarta.validation:jakarta.validation-api:2.0.2" {{/useBeanValidation}} {{#performBeanValidation}} implementation "org.hibernate:hibernate-validator:6.0.19.Final" {{/performBeanValidation}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index 48a8c8dfcb7..22390e12e0e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -45,12 +45,12 @@ lazy val root = (project in file(".")). {{/threetenbp}} "com.squareup.okio" % "okio" % "1.17.5" % "compile", {{#useBeanValidation}} - "javax.validation" % "validation-api" % "2.0.1.Final" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", {{/useBeanValidation}} {{#performBeanValidation}} "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", {{/performBeanValidation}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index 57d94de93ef..7a26d17a1d9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -231,9 +231,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -322,9 +322,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -363,7 +363,10 @@ 2.10.0 {{/threetenbp}} {{/jackson}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 1.17.5 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index 852a2f638a5..67083a02010 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -100,6 +100,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" threetenbp_version = "2.9.10" resteasy_version = "4.5.11.Final" junit_version = "4.13" @@ -119,6 +120,6 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index 785100fb678..957990ebf21 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -18,7 +18,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index edeb08f18c1..4f7c83977d5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -191,14 +191,6 @@ net.jcip jcip-annotations - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - - javax.activation - activation - @@ -214,10 +206,6 @@ com.sun.mail javax.mail - - javax.activation - activation - @@ -269,9 +257,9 @@ ${threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -289,7 +277,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 2.9.10 1.0.0 4.13 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 433d396baf4..43c5845302c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -113,6 +113,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" spring_web_version = "5.2.5.RELEASE" jodatime_version = "2.9.9" junit_version = "4.13.1" @@ -146,6 +147,6 @@ dependencies { {{#withXml}} implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" {{/withXml}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 17dd7024edd..ae3ceab2455 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -299,9 +299,9 @@ {{/threetenbp}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -320,7 +320,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 {{#joda}} 2.9.9 {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache index ec85f6ec71b..34d66a2d530 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -105,6 +105,7 @@ ext { oltu_version = "1.0.1" retrofit_version = "1.9.0" swagger_annotations_version = "1.5.21" + jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" jodatime_version = "2.9.3" {{#threetenbp}} @@ -122,6 +123,6 @@ dependencies { {{#threetenbp}} implementation "org.threeten:threetenbp:$threetenbp_version" {{/threetenbp}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache index cef4b1c048d..b279317657f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache @@ -17,7 +17,7 @@ lazy val root = (project in file(".")). {{#threetenbp}} "org.threeten" % "threetenbp" % "1.4.0" % "compile", {{/threetenbp}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache index b495864db77..1566db9a17f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache @@ -265,9 +265,9 @@ {{/parcelableModel}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -288,7 +288,7 @@ 1.4.0 {{/threetenbp}} 1.0.1 - 1.3.2 + 1.3.5 1.0.0 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 090eefa3383..fe9207df02d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -115,6 +115,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" {{#play24}} play_version = "2.4.11" {{/play24}} @@ -176,7 +177,7 @@ dependencies { {{#usePlayWS}} {{#play26}} implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" - implementation "javax.validation:validation-api:1.1.0.Final" + implementation "jakarta.validation:jakarta.validation-api:2.0.2" {{/play26}} {{^play26}} implementation "com.typesafe.play:play-java-ws_2.11:$play_version" @@ -190,6 +191,6 @@ dependencies { {{/openApiNullable}} implementation "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version" {{/usePlayWS}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index a9301f736a4..d859cf83d24 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -23,7 +23,7 @@ lazy val root = (project in file(".")). {{/play25}} {{#play26}} "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", - "javax.validation" % "validation-api" % "1.1.0.Final" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", {{/play26}} "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", @@ -51,7 +51,7 @@ lazy val root = (project in file(".")). "org.threeten" % "threetenbp" % "1.4.0" % "compile", {{/threetenbp}} "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index b8b3d5dcb28..66609e17c2d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -372,9 +372,9 @@ ${play-version} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} {{/play26}} {{/usePlayWS}} @@ -388,9 +388,9 @@ {{/parcelableModel}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -439,7 +439,10 @@ {{#threetenbp}} 1.4.0 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 1.0.1 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index 143a1936217..1fce1c6262c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -35,6 +35,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" {{#threetenbp}} jackson_threeten_version = "2.9.10" {{/threetenbp}} @@ -60,7 +61,7 @@ dependencies { {{#openApiNullable}} implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index 5432485d9df..cd17acbc20f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -281,9 +281,9 @@ {{/threetenbp}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -309,7 +309,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index 9d352d127f9..d419eb4010d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -56,7 +56,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -130,7 +130,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} - javax_annotation_version = "1.3.2" + jakarta_annotation_version = "1.3.5" reactor_version = "3.4.3" reactor_netty_version = "0.7.15.RELEASE" jodatime_version = "2.9.9" @@ -159,6 +159,6 @@ dependencies { {{^java8}} implementation "com.brsanthu:migbase64:2.2" {{/java8}} - implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index 0b24d140966..3e8e1d6da3f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -132,9 +132,9 @@ {{/joda}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -155,7 +155,7 @@ {{#openApiNullable}} 0.2.1 {{/openApiNullable}} - 1.3.2 + 1.3.5 4.13.1 3.4.3 0.7.15.RELEASE diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index 20b602c5421..ccb784c095d 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -321,9 +321,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -345,9 +345,9 @@ {{/parcelableModel}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -366,7 +366,10 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 1.0.0 4.13.1 diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache index d49ea4d9a61..7599d6e08ef 100644 --- a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache @@ -127,9 +127,9 @@ ${swagger-inflector-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -148,7 +148,7 @@ 1.0.14 9.2.9.v20150224 1.0.1 - 1.3.2 + 1.3.5 4.13.1 1.6.3 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache index ad111b7111c..046297f2ad7 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache @@ -95,13 +95,19 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} + +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} + + diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache index 33836935a5a..2c36ff37ee4 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache @@ -51,8 +51,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -217,9 +217,8 @@ 9.2.9.v20150224 4.13.1 1.2.0 - 2.5 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 3.3.0 2.9.9 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache index 35daec1ecb8..c523f0a994c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache @@ -57,8 +57,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -155,8 +155,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api {{^generateSpringBootApplication}} ${beanvalidation-version} {{/generateSpringBootApplication}} @@ -338,7 +338,7 @@ 1.5.18 9.2.9.v20150224 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} {{#generateSpringApplication}} {{^generateSpringBootApplication}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache index 0a1eb949a0b..9787babbd3a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -51,8 +51,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -194,9 +194,9 @@ {{/useBeanValidationFeature}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -217,13 +217,12 @@ 9.2.9.v20150224 4.13.1 1.2.0 - 2.5 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 7f8a635e216..5649020a9ab 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -51,8 +51,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -136,8 +136,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -238,9 +238,9 @@ {{/generateSpringBootApplication}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided {{#useSwaggerUI}} @@ -268,9 +268,8 @@ 9.2.9.v20150224 4.13 1.2.0 - 2.5 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} {{#generateSpringApplication}} 4.3.13.RELEASE @@ -280,7 +279,7 @@ {{/generateSpringBootApplication}} 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 3b4215b98c4..0bef89d2309 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -54,8 +54,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -139,8 +139,8 @@ ${jersey-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -189,8 +189,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -211,14 +211,14 @@ ${java.version} 1.5.22 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 9.2.9.v20150224 1.19.1 2.9.9 1.7.21 4.13 - 2.5 + 4.0.4 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 591e0337edf..9d55026baf1 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache @@ -62,8 +62,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -136,8 +136,8 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -193,8 +193,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -216,7 +216,7 @@ ${java.version} 1.5.18 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 9.2.9.v20150224 2.22.2 @@ -227,7 +227,7 @@ {{/supportJava6}} 4.13.1 1.2.0 - 2.5 + 4.0.4 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index b1f08021b4e..b343b8ec954 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache @@ -12,11 +12,11 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' {{#useBeanValidation}} - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' {{/useBeanValidation}} {{^java8}} compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index b6b8841c739..86e1c728807 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -73,8 +73,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -110,9 +110,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -150,9 +150,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -192,6 +192,10 @@ 3.0.11.Final 1.6.3 4.8.1 - 2.5 + 4.0.4 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} + 1.3.5 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index 6427c11001b..cd6febf1470 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -12,13 +12,13 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' {{#useBeanValidation}} - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' {{/useBeanValidation}} compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache index b23f9688274..b1b3bddee0c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -91,8 +91,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -128,9 +128,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -187,9 +187,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -211,6 +211,10 @@ 3.13.0.Final 1.6.3 4.13.1 - 2.5 + 4.0.4 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/pom.mustache index 1a1d93bd214..e72b2b5d440 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/helidon/pom.mustache @@ -24,7 +24,7 @@ 3.0.2 1.1.2 2.29 - 1.2.0 + 1.2.2 5.1.0 @@ -97,8 +97,8 @@ runtime - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api ${version.lib.activation-api} runtime diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/pom.mustache index 344bf268fbe..6719f55780c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/openliberty/pom.mustache @@ -38,9 +38,9 @@ provided - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} com.fasterxml.jackson.core @@ -61,6 +61,7 @@ usr ${project.artifactId} ${project.build.directory}/${app.name}.zip + 2.0.2 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache index 9d5d85ddbe3..48ac267133b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache @@ -65,9 +65,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} provided {{#java8}} @@ -132,9 +132,9 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} @@ -142,5 +142,9 @@ 2.9.9 4.13.1 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} + 2.1.6 diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index d5ae34ff8a5..58b6e67d34c 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -99,9 +99,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api {{/useSpringfox}} {{^useSpringfox}} @@ -167,8 +166,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api {{/useBeanValidation}} {{#virtualService}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index e7ca6777fca..7179f1abe40 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -52,8 +52,8 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -138,14 +138,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} {{#useSpringfox}} @@ -243,15 +243,15 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -279,15 +279,17 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 {{#useBeanValidation}} - 1.1.0.Final + 2.0.2 {{/useBeanValidation}} 4.3.20.RELEASE {{#openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache index 60c5a11683e..3bde01d7112 100644 --- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache @@ -47,8 +47,8 @@ - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -67,9 +67,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -86,9 +86,9 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 2.5 + 4.0.4 2.8.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache index f1b5a3c4425..6339f166a70 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache @@ -15,7 +15,7 @@ 1.2.5 1.2.5 3.10.0 - 1.3.2 + 1.3.5 2.6.0 2.6.0 1.7.25 @@ -162,9 +162,9 @@ 1.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided {{#pkmstInterceptor}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache index cfc42f1da0d..a74c26927bc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -131,14 +131,14 @@ {{#useBeanValidation}} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api {{/useBeanValidation}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache index f225974d193..1daf924bb13 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache @@ -14,6 +14,7 @@ 1.8 1.3.10 true + 1.3.5 4.13 3.4.1 3.8.1 @@ -51,9 +52,9 @@ - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} org.jetbrains.kotlin diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/build.gradle.mustache index c4e0d84b6cb..2ad0d4a0de0 100644 --- a/modules/openapi-generator/src/main/resources/scala-httpclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/scala-httpclient/build.gradle.mustache @@ -48,7 +48,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -96,6 +96,7 @@ if(hasProperty('target') && target == 'android') { ext { scala_version = "2.10.4" + jakarta_annotation_version = "1.3.5" joda_version = "1.2" jodatime_version = "2.2" jersey_version = "1.19" diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache index 83787752471..c6122070664 100644 --- a/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/scala-play-server/build.sbt.mustache @@ -11,7 +11,7 @@ libraryDependencies ++= Seq( {{#useSwaggerUI}} "org.webjars" % "swagger-ui" % "3.1.5", {{/useSwaggerUI}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "org.scalatest" %% "scalatest" % "3.0.4" % Test, "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test ) diff --git a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache index 378de9fb1e1..95c49396bfa 100644 --- a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache @@ -55,7 +55,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -112,6 +112,7 @@ ext { {{#openApiNullable}} jackson_databind_nullable_version = "0.2.1" {{/openApiNullable}} + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" {{#threetenbp}} @@ -157,7 +158,7 @@ dependencies { {{^java8}} implementation "com.brsanthu:migbase64:2.2" {{/java8}} - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache index 9823c3c657e..910f21f798d 100644 --- a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache @@ -36,7 +36,7 @@ lazy val root = (project in file(".")). {{^java8}} "com.brsanthu" % "migbase64" % "2.2", {{/java8}} - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache index f36f0cd8817..4a87eaeed45 100644 --- a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache @@ -344,16 +344,16 @@ {{#useBeanValidation}} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided {{/useBeanValidation}} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -379,7 +379,10 @@ {{#threetenbp}} 2.9.10 {{/threetenbp}} - 1.3.2 + 1.3.5 +{{#useBeanValidation}} + 2.0.2 +{{/useBeanValidation}} 4.13.1 {{#hasHttpSignatureMethods}} 1.5 diff --git a/samples/client/petstore/java/apache-httpclient/build.gradle b/samples/client/petstore/java/apache-httpclient/build.gradle index eec12618591..fee361a3cbe 100644 --- a/samples/client/petstore/java/apache-httpclient/build.gradle +++ b/samples/client/petstore/java/apache-httpclient/build.gradle @@ -50,7 +50,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -115,6 +115,7 @@ ext { jackson_version = "2.12.1" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jackson_threetenbp_version = "2.9.10" jersey_version = "1.19.4" jodatime_version = "2.9.9" @@ -133,6 +134,6 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/apache-httpclient/pom.xml b/samples/client/petstore/java/apache-httpclient/pom.xml index 0c99a14aa39..24ca1bbbc19 100644 --- a/samples/client/petstore/java/apache-httpclient/pom.xml +++ b/samples/client/petstore/java/apache-httpclient/pom.xml @@ -272,9 +272,9 @@ ${jackson-threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -291,7 +291,7 @@ 1.19.4 2.12.1 2.9.10 - 1.3.2 + 1.3.5 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/feign-no-nullable/build.gradle b/samples/client/petstore/java/feign-no-nullable/build.gradle index f7c9d2b424e..e8630f875ec 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.gradle +++ b/samples/client/petstore/java/feign-no-nullable/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -102,6 +102,7 @@ ext { swagger_annotations_version = "1.5.24" jackson_version = "2.10.3" jackson_databind_version = "2.10.3" + jakarta_annotation_version = "1.3.5" jackson_threetenbp_version = "2.9.10" feign_version = "10.11" feign_form_version = "3.8.0" @@ -124,7 +125,7 @@ dependencies { implementation "com.brsanthu:migbase64:2.2" implementation "com.github.scribejava:scribejava-core:$scribejava_version" implementation "com.brsanthu:migbase64:2.2" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "org.junit.jupiter:junit-jupiter:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version" diff --git a/samples/client/petstore/java/feign-no-nullable/build.sbt b/samples/client/petstore/java/feign-no-nullable/build.sbt index cdf3cd5db6b..5f47c449575 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.sbt +++ b/samples/client/petstore/java/feign-no-nullable/build.sbt @@ -23,7 +23,7 @@ lazy val root = (project in file(".")). "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "org.junit.jupiter" % "junit-jupiter" % "5.7.0" % "test", "org.junit.jupiter" % "junit-jupiter-params" % "5.7.0" % "test", "com.github.tomakehurst" % "wiremock-jre8" % "2.27.2" % "test", diff --git a/samples/client/petstore/java/feign-no-nullable/pom.xml b/samples/client/petstore/java/feign-no-nullable/pom.xml index c81c63c999c..798bebf47d5 100644 --- a/samples/client/petstore/java/feign-no-nullable/pom.xml +++ b/samples/client/petstore/java/feign-no-nullable/pom.xml @@ -273,9 +273,9 @@ ${scribejava-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -328,7 +328,7 @@ 2.10.3 2.10.3 2.9.10 - 1.3.2 + 1.3.5 5.7.0 1.0.0 8.0.0 diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index 394cdda63a9..6a9e84819fc 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -103,6 +103,7 @@ ext { jackson_version = "2.10.3" jackson_databind_version = "2.10.3" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jackson_threetenbp_version = "2.9.10" feign_version = "10.11" feign_form_version = "3.8.0" @@ -126,7 +127,7 @@ dependencies { implementation "com.brsanthu:migbase64:2.2" implementation "com.github.scribejava:scribejava-core:$scribejava_version" implementation "com.brsanthu:migbase64:2.2" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "org.junit.jupiter:junit-jupiter:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version" diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt index 5f999c727fe..50dd4219edb 100644 --- a/samples/client/petstore/java/feign/build.sbt +++ b/samples/client/petstore/java/feign/build.sbt @@ -23,7 +23,7 @@ lazy val root = (project in file(".")). "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "org.junit.jupiter" % "junit-jupiter" % "5.7.0" % "test", "org.junit.jupiter" % "junit-jupiter-params" % "5.7.0" % "test", "com.github.tomakehurst" % "wiremock-jre8" % "2.27.2" % "test", diff --git a/samples/client/petstore/java/feign/feign10x/pom.xml b/samples/client/petstore/java/feign/feign10x/pom.xml index 5016e9ac36f..772091df060 100644 --- a/samples/client/petstore/java/feign/feign10x/pom.xml +++ b/samples/client/petstore/java/feign/feign10x/pom.xml @@ -273,9 +273,9 @@ ${oltu-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -311,7 +311,7 @@ 0.2.1 2.10.3 2.9.10 - 1.3.2 + 1.3.5 4.13 1.0.0 1.0.1 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 57974bab472..b6ab732f2d4 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -278,9 +278,9 @@ ${scribejava-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -334,7 +334,7 @@ 0.2.1 2.10.3 2.9.10 - 1.3.2 + 1.3.5 5.7.0 1.0.0 8.0.0 diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index a13141ccd06..39ed02a1cd4 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -99,6 +99,7 @@ ext { jackson_version = "2.12.1" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" @@ -117,6 +118,6 @@ dependencies { implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt index 4de7cb971b0..ad1c65c2f6b 100644 --- a/samples/client/petstore/java/google-api-client/build.sbt +++ b/samples/client/petstore/java/google-api-client/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml index 16e1cae0bfe..7614163bc46 100644 --- a/samples/client/petstore/java/google-api-client/pom.xml +++ b/samples/client/petstore/java/google-api-client/pom.xml @@ -249,9 +249,9 @@ ${jackson-threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -272,7 +272,7 @@ 2.10.4 0.2.1 2.9.10 - 1.3.2 + 1.3.5 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle index 26176baae04..ad75b3eaeb9 100644 --- a/samples/client/petstore/java/jersey1/build.gradle +++ b/samples/client/petstore/java/jersey1/build.gradle @@ -50,7 +50,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -115,6 +115,7 @@ ext { jackson_version = "2.12.1" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jackson_threetenbp_version = "2.9.10" jersey_version = "1.19.4" jodatime_version = "2.9.9" @@ -133,6 +134,6 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" implementation "com.brsanthu:migbase64:2.2" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey1/pom.xml b/samples/client/petstore/java/jersey1/pom.xml index 27fd6628515..04222d57919 100644 --- a/samples/client/petstore/java/jersey1/pom.xml +++ b/samples/client/petstore/java/jersey1/pom.xml @@ -273,9 +273,9 @@ 2.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -292,7 +292,7 @@ 1.19.4 2.12.1 2.9.10 - 1.3.2 + 1.3.5 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle b/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle index 69c3ef01c35..70f7fb88421 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" scribejava_apis_version = "6.9.0" @@ -117,7 +118,7 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/build.sbt b/samples/client/petstore/java/jersey2-java8-localdatetime/build.sbt index 87d9502a1f2..8b7bfc7e620 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/build.sbt +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/build.sbt @@ -20,7 +20,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml b/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml index 195e915d565..cbbdb8ce35d 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml @@ -281,9 +281,9 @@ ${scribejava-apis-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -306,7 +306,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 6.9.0 diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index cad4adf93db..84fe3e2c33d 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" scribejava_apis_version = "6.9.0" @@ -117,7 +118,7 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index 6eeba2a7096..3d0a3ff1a8c 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -20,7 +20,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 1fb675e1439..deffd3c8cc1 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -281,9 +281,9 @@ ${scribejava-apis-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -306,7 +306,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 6.9.0 diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml index 442314e9649..39b65989001 100644 --- a/samples/client/petstore/java/microprofile-rest-client/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml @@ -71,9 +71,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} provided @@ -96,19 +96,19 @@ 3.2.6 - javax.json.bind - javax.json.bind-api - 1.0 + jakarta.json.bind + jakarta.json.bind-api + ${jakarta.json.bind-version} - javax.json - javax.json-api - 1.1.4 + jakarta.json + jakarta.json-api + ${jakarta.json-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} com.sun.xml.bind @@ -121,9 +121,9 @@ 2.2.11 - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + ${jakarta.activation-version} @@ -132,9 +132,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -155,10 +155,14 @@ 9.2.9.v20150224 4.13.1 1.2.0 - 2.5 3.2.7 2.9.7 - 1.3.2 + 1.2.2 + 1.3.5 + 1.0.2 + 1.1.6 + 2.1.6 + 2.3.3 UTF-8 diff --git a/samples/client/petstore/java/native-async/build.gradle b/samples/client/petstore/java/native-async/build.gradle index 9e037855cba..6bebeffcdd4 100644 --- a/samples/client/petstore/java/native-async/build.gradle +++ b/samples/client/petstore/java/native-async/build.gradle @@ -63,6 +63,7 @@ artifacts { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.4" + jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" } @@ -74,6 +75,6 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:0.2.1" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/native-async/pom.xml b/samples/client/petstore/java/native-async/pom.xml index de6911c94fd..eb1bf8a993f 100644 --- a/samples/client/petstore/java/native-async/pom.xml +++ b/samples/client/petstore/java/native-async/pom.xml @@ -194,9 +194,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -216,7 +216,7 @@ 11 2.10.4 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/client/petstore/java/native/build.gradle b/samples/client/petstore/java/native/build.gradle index 9e037855cba..6bebeffcdd4 100644 --- a/samples/client/petstore/java/native/build.gradle +++ b/samples/client/petstore/java/native/build.gradle @@ -63,6 +63,7 @@ artifacts { ext { swagger_annotations_version = "1.5.22" jackson_version = "2.10.4" + jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" } @@ -74,6 +75,6 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:0.2.1" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/native/pom.xml b/samples/client/petstore/java/native/pom.xml index de6911c94fd..eb1bf8a993f 100644 --- a/samples/client/petstore/java/native/pom.xml +++ b/samples/client/petstore/java/native/pom.xml @@ -194,9 +194,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -216,7 +216,7 @@ 11 2.10.4 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle index e5d608265de..3ba63d7bf1e 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle @@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:javax.annotation-api:1.3.2' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -97,6 +97,10 @@ if(hasProperty('target') && target == 'android') { } } +ext { + jakarta_annotation_version = "1.3.5" +} + dependencies { implementation 'io.swagger:swagger-annotations:1.5.24' implementation "com.google.code.findbugs:jsr305:3.0.2" @@ -109,7 +113,7 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation 'junit:junit:4.13.1' } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt index 96c44f5d7de..2957b77a9e6 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt @@ -19,9 +19,9 @@ lazy val root = (project in file(".")). "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.swagger.parser.v3" % "swagger-parser-v3" "2.0.23" % "compile" "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml index c4c2c923a10..169961f2e35 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml @@ -262,9 +262,9 @@ 2.0.23 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -297,7 +297,7 @@ 3.11 0.2.1 1.5.0 - 1.3.2 + 1.3.5 4.13.1 UTF-8 diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle index 157cb472fc0..67f50a9726a 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle @@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:javax.annotation-api:1.3.2' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -97,6 +97,10 @@ if(hasProperty('target') && target == 'android') { } } +ext { + jakarta_annotation_version = "1.3.5" +} + dependencies { implementation 'io.swagger:swagger-annotations:1.5.24' implementation "com.google.code.findbugs:jsr305:3.0.2" @@ -108,7 +112,7 @@ dependencies { implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation 'junit:junit:4.13.1' } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt index 89da006858c..e566d0fb4fb 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt @@ -18,9 +18,9 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 5b92eb11c69..cbded0cff24 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -264,9 +264,9 @@ provided - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -299,7 +299,7 @@ 3.11 0.2.1 1.5.0 - 1.3.2 + 1.3.5 4.13.1 UTF-8 diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index bfa3f209830..bbcaa86c63c 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:javax.annotation-api:1.3.2' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -97,6 +97,10 @@ if(hasProperty('target') && target == 'android') { } } +ext { + jakarta_annotation_version = "1.3.5" +} + dependencies { implementation 'io.swagger:swagger-annotations:1.5.24' implementation "com.google.code.findbugs:jsr305:3.0.2" @@ -108,7 +112,7 @@ dependencies { implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation 'org.threeten:threetenbp:1.4.3' - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation 'junit:junit:4.13.1' } diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt index 5b476bc7d12..a791297fd3e 100644 --- a/samples/client/petstore/java/okhttp-gson/build.sbt +++ b/samples/client/petstore/java/okhttp-gson/build.sbt @@ -18,9 +18,9 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index 302f2cf0248..7406e439fd1 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -257,9 +257,9 @@ ${threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -292,7 +292,7 @@ 3.11 0.2.1 1.5.0 - 1.3.2 + 1.3.5 4.13.1 UTF-8 diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index 4a4238e9451..126452afdc1 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.gradle +++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -101,6 +101,7 @@ ext { jackson_version = "2.10.3" jackson_databind_version = "2.10.3" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" okio_version = "1.17.5" } @@ -115,8 +116,8 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.squareup.okio:okio:$okio_version" - implementation "javax.validation:validation-api:2.0.1.Final" + implementation "jakarta.validation:jakarta.validation-api:2.0.2" implementation "org.hibernate:hibernate-validator:6.0.19.Final" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/rest-assured-jackson/build.sbt b/samples/client/petstore/java/rest-assured-jackson/build.sbt index cffebbde699..4422008b635 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.sbt +++ b/samples/client/petstore/java/rest-assured-jackson/build.sbt @@ -19,9 +19,9 @@ lazy val root = (project in file(".")). "org.openapitools" % "jackson-databind-nullable" % "0.2.1", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.3", "com.squareup.okio" % "okio" % "1.17.5" % "compile", - "javax.validation" % "validation-api" % "2.0.1.Final" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml index ca8195e3e45..0c2e6e4bc45 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -222,9 +222,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -261,9 +261,9 @@ - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -288,7 +288,8 @@ 1.8.4 2.10.3 0.2.1 - 1.3.2 + 1.3.5 + 2.0.2 1.17.5 4.13.1 diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index 4b26258f395..928f5dd4918 100644 --- a/samples/client/petstore/java/rest-assured/build.gradle +++ b/samples/client/petstore/java/rest-assured/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -112,8 +112,8 @@ dependencies { implementation 'com.google.code.gson:gson:$gson_version' implementation "org.threeten:threetenbp:$threetenbp_version" implementation "com.squareup.okio:okio:$okio_version" - implementation "javax.validation:validation-api:2.0.1.Final" + implementation "jakarta.validation:jakarta.validation-api:2.0.2" implementation "org.hibernate:hibernate-validator:6.0.19.Final" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt index e5f9285fd7e..9fe390caca5 100644 --- a/samples/client/petstore/java/rest-assured/build.sbt +++ b/samples/client/petstore/java/rest-assured/build.sbt @@ -17,9 +17,9 @@ lazy val root = (project in file(".")). "io.gsonfire" % "gson-fire" % "1.8.4" % "compile", "org.threeten" % "threetenbp" % "1.4.3" % "compile", "com.squareup.okio" % "okio" % "1.17.5" % "compile", - "javax.validation" % "validation-api" % "2.0.1.Final" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml index 48e826a48e9..8a6b704adb0 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -211,9 +211,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -243,9 +243,9 @@ - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -269,7 +269,8 @@ 2.8.6 1.8.4 1.4.3 - 1.3.2 + 1.3.5 + 2.0.2 1.17.5 4.13.1 diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index 47a46676967..49838b21fe2 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" threetenbp_version = "2.9.10" resteasy_version = "4.5.11.Final" junit_version = "4.13" @@ -115,6 +116,6 @@ dependencies { implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index 2686e7b74de..915c8f01189 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -18,7 +18,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index 6e429c2da2d..6fbca0739e0 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -184,14 +184,6 @@ net.jcip jcip-annotations - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - - - javax.activation - activation - @@ -207,10 +199,6 @@ com.sun.mail javax.mail - - javax.activation - activation - @@ -250,9 +238,9 @@ ${threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -270,7 +258,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 2.9.10 1.0.0 4.13 diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index f3a4d1fbaee..7e3a6d9dd83 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -99,6 +99,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" spring_web_version = "5.2.5.RELEASE" jodatime_version = "2.9.9" junit_version = "4.13.1" @@ -118,6 +119,6 @@ dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index e8e0ab812eb..8c6793c1c40 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -268,9 +268,9 @@ ${jackson-threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -289,7 +289,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 2.9.10 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 4a60d33ebe7..d5e355df064 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -99,6 +99,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" spring_web_version = "5.2.5.RELEASE" jodatime_version = "2.9.9" junit_version = "4.13.1" @@ -117,6 +118,6 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 9569cedb754..9921e8011ee 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -260,9 +260,9 @@ ${jackson-threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -281,7 +281,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 2.9.10 1.0.0 4.13.1 diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index 69c39e5fcd5..eb0580bd8c2 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -100,6 +100,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" play_version = "2.6.7" swagger_annotations_version = "1.5.22" junit_version = "4.13.1" @@ -119,13 +120,13 @@ dependencies { implementation "io.gsonfire:gson-fire:$json_fire_version" implementation "org.threeten:threetenbp:$threetenbp_version" implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" - implementation "javax.validation:validation-api:1.1.0.Final" + implementation "jakarta.validation:jakarta.validation-api:2.0.2" implementation "com.squareup.retrofit2:converter-jackson:$retrofit_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-databind:$jackson_databind_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt index 68c717dc37d..3b482330d1e 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.sbt +++ b/samples/client/petstore/java/retrofit2-play26/build.sbt @@ -12,7 +12,7 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", - "javax.validation" % "validation-api" % "1.1.0.Final" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile", @@ -21,7 +21,7 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index d0fc81c43ca..baf6f9835fc 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -283,14 +283,14 @@ ${play-version} - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -313,7 +313,8 @@ 0.2.1 2.5.0 1.4.0 - 1.3.2 + 1.3.5 + 2.0.2 1.0.1 4.13.1 diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle index b1b43ae2fb4..4dafb81ae67 100644 --- a/samples/client/petstore/java/retrofit2/build.gradle +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -114,6 +114,6 @@ dependencies { } implementation "io.gsonfire:gson-fire:$json_fire_version" implementation "org.threeten:threetenbp:$threetenbp_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt index 8ad7b88e1ae..10ac2d347a1 100644 --- a/samples/client/petstore/java/retrofit2/build.sbt +++ b/samples/client/petstore/java/retrofit2/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 10c1ec0dc8b..e184e4db6c6 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -247,9 +247,9 @@ ${threetenbp-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -269,7 +269,7 @@ 1.5.22 2.5.0 1.4.0 - 1.3.2 + 1.3.5 1.0.1 4.13.1 diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle index 9766c51dbf9..4c801b8e23d 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.gradle +++ b/samples/client/petstore/java/retrofit2rx2/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -117,6 +117,6 @@ dependencies { } implementation "io.gsonfire:gson-fire:$json_fire_version" implementation "org.threeten:threetenbp:$threetenbp_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt index d6abba22867..63064b30ddf 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.sbt +++ b/samples/client/petstore/java/retrofit2rx2/build.sbt @@ -18,7 +18,7 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index 29e33941239..c841514837e 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -257,9 +257,9 @@ ${retrofit-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -280,7 +280,7 @@ 2.5.0 2.1.1 1.4.0 - 1.3.2 + 1.3.5 1.0.1 4.13.1 diff --git a/samples/client/petstore/java/retrofit2rx3/build.gradle b/samples/client/petstore/java/retrofit2rx3/build.gradle index bbb209016f5..96760ecfecc 100644 --- a/samples/client/petstore/java/retrofit2rx3/build.gradle +++ b/samples/client/petstore/java/retrofit2rx3/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -117,6 +117,6 @@ dependencies { } implementation "io.gsonfire:gson-fire:$json_fire_version" implementation "org.threeten:threetenbp:$threetenbp_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2rx3/build.sbt b/samples/client/petstore/java/retrofit2rx3/build.sbt index e543cc28dc6..a5a113fd9dc 100644 --- a/samples/client/petstore/java/retrofit2rx3/build.sbt +++ b/samples/client/petstore/java/retrofit2rx3/build.sbt @@ -18,7 +18,7 @@ lazy val root = (project in file(".")). "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.threeten" % "threetenbp" % "1.4.0" % "compile", "io.gsonfire" % "gson-fire" % "1.8.0" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2rx3/pom.xml b/samples/client/petstore/java/retrofit2rx3/pom.xml index 67178524622..adb7eb9927b 100644 --- a/samples/client/petstore/java/retrofit2rx3/pom.xml +++ b/samples/client/petstore/java/retrofit2rx3/pom.xml @@ -257,9 +257,9 @@ 3.0.0 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -280,7 +280,7 @@ 2.5.0 3.0.4 1.4.0 - 1.3.2 + 1.3.5 1.0.1 4.13.1 diff --git a/samples/client/petstore/java/vertx-no-nullable/build.gradle b/samples/client/petstore/java/vertx-no-nullable/build.gradle index b707ad140bb..ef71d28b690 100644 --- a/samples/client/petstore/java/vertx-no-nullable/build.gradle +++ b/samples/client/petstore/java/vertx-no-nullable/build.gradle @@ -32,6 +32,7 @@ ext { jackson_databind_version = "2.10.5.1" vertx_version = "3.4.2" junit_version = "4.13.1" + jakarta_annotation_version = "1.3.5" jackson_threeten_version = "2.9.10" } @@ -45,7 +46,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:jackson_threeten_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/samples/client/petstore/java/vertx-no-nullable/pom.xml b/samples/client/petstore/java/vertx-no-nullable/pom.xml index ed82307ce4f..c0c0281f9eb 100644 --- a/samples/client/petstore/java/vertx-no-nullable/pom.xml +++ b/samples/client/petstore/java/vertx-no-nullable/pom.xml @@ -251,9 +251,9 @@ 2.9.10 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -279,7 +279,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index 063f228289b..7d499745c83 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -33,6 +33,7 @@ ext { vertx_version = "3.4.2" junit_version = "4.13.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" } dependencies { @@ -45,7 +46,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml index 07d20c311d1..e751a57d090 100644 --- a/samples/client/petstore/java/vertx/pom.xml +++ b/samples/client/petstore/java/vertx/pom.xml @@ -251,9 +251,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -279,7 +279,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/client/petstore/java/webclient-nulable-arrays/build.gradle b/samples/client/petstore/java/webclient-nulable-arrays/build.gradle index 85246dc6513..686f85f5ace 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/build.gradle +++ b/samples/client/petstore/java/webclient-nulable-arrays/build.gradle @@ -50,7 +50,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -116,7 +116,7 @@ ext { jackson_version = "2.11.3" jackson_databind_version = "2.11.3" jackson_databind_nullable_version = "0.2.1" - javax_annotation_version = "1.3.2" + jakarta_annotation_version = "1.3.5" reactor_version = "3.4.3" reactor_netty_version = "0.7.15.RELEASE" jodatime_version = "2.9.9" @@ -135,6 +135,6 @@ dependencies { implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/webclient-nulable-arrays/pom.xml b/samples/client/petstore/java/webclient-nulable-arrays/pom.xml index 30382edacdf..6a4e433806c 100644 --- a/samples/client/petstore/java/webclient-nulable-arrays/pom.xml +++ b/samples/client/petstore/java/webclient-nulable-arrays/pom.xml @@ -109,9 +109,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -130,7 +130,7 @@ 2.11.3 2.11.3 0.2.1 - 1.3.2 + 1.3.5 4.13.1 3.4.3 0.7.15.RELEASE diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 6091974a8bc..eb34d7a99cc 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -50,7 +50,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -116,7 +116,7 @@ ext { jackson_version = "2.11.3" jackson_databind_version = "2.11.3" jackson_databind_nullable_version = "0.2.1" - javax_annotation_version = "1.3.2" + jakarta_annotation_version = "1.3.5" reactor_version = "3.4.3" reactor_netty_version = "0.7.15.RELEASE" jodatime_version = "2.9.9" @@ -135,6 +135,6 @@ dependencies { implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml index fd9ba167047..fa73267d009 100644 --- a/samples/client/petstore/java/webclient/pom.xml +++ b/samples/client/petstore/java/webclient/pom.xml @@ -109,9 +109,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -130,7 +130,7 @@ 2.11.3 2.11.3 0.2.1 - 1.3.2 + 1.3.5 4.13.1 3.4.3 0.7.15.RELEASE diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml index aa59537336d..7fccbfb562e 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml @@ -149,9 +149,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -175,7 +175,7 @@ 2.5 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index fe612296899..d2c3b968a2a 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -149,9 +149,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -175,7 +175,7 @@ 2.5 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/client/petstore/scala-httpclient-deprecated/build.gradle b/samples/client/petstore/scala-httpclient-deprecated/build.gradle index ef58789495a..90b3353edf6 100644 --- a/samples/client/petstore/scala-httpclient-deprecated/build.gradle +++ b/samples/client/petstore/scala-httpclient-deprecated/build.gradle @@ -48,7 +48,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -96,6 +96,7 @@ if(hasProperty('target') && target == 'android') { ext { scala_version = "2.10.4" + jakarta_annotation_version = "1.3.5" joda_version = "1.2" jodatime_version = "2.2" jersey_version = "1.19" diff --git a/samples/client/petstore/spring-stubs/pom.xml b/samples/client/petstore/spring-stubs/pom.xml index f19b4e5ddf4..2ae7301fc58 100644 --- a/samples/client/petstore/spring-stubs/pom.xml +++ b/samples/client/petstore/spring-stubs/pom.xml @@ -40,9 +40,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -55,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle index 63613e700e0..7af266cd572 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" threetenbp_version = "2.9.10" @@ -117,7 +118,7 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" implementation "com.brsanthu:migbase64:2.2" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.sbt b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.sbt index 2bd6f3ba8fb..6f45ec3cc59 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.sbt +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.sbt @@ -20,7 +20,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", "com.brsanthu" % "migbase64" % "2.2", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml index 1640fe3346e..4b679de53da 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml @@ -282,9 +282,9 @@ 2.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -308,7 +308,7 @@ 2.10.5.1 0.2.1 2.9.10 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle index aea71f87096..b8563fe54bf 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" } @@ -115,7 +116,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.sbt b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.sbt index 9bcab931704..f45421c8d9a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.sbt +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.sbt @@ -19,7 +19,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml index 5a6affc0fa6..ac61d729960 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml @@ -276,9 +276,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -301,7 +301,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle index ea8b5ac0593..88a93f54b5e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle @@ -49,7 +49,7 @@ if(hasProperty('target') && target == 'android') { } dependencies { - provided 'javax.annotation:jsr250-api:1.0' + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" } } @@ -98,6 +98,7 @@ ext { jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" jackson_databind_nullable_version = "0.2.1" + jakarta_annotation_version = "1.3.5" jersey_version = "2.27" junit_version = "4.13.1" scribejava_apis_version = "6.9.0" @@ -119,7 +120,7 @@ dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt b/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt index fa36119041e..35a6095582d 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt @@ -21,7 +21,7 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", "org.tomitribe" % "tomitribe-http-signatures" % "1.5" % "compile", - "javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile", + "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.1" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml index bfe48b1b028..0de23c35d49 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml @@ -286,9 +286,9 @@ ${scribejava-apis-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -311,7 +311,7 @@ 2.10.5 2.10.5.1 0.2.1 - 1.3.2 + 1.3.5 4.13.1 1.5 6.9.0 diff --git a/samples/openapi3/client/petstore/java/native/pom.xml b/samples/openapi3/client/petstore/java/native/pom.xml index 58e5bf25f54..0fa9f4b7b94 100644 --- a/samples/openapi3/client/petstore/java/native/pom.xml +++ b/samples/openapi3/client/petstore/java/native/pom.xml @@ -194,9 +194,9 @@ 3.0.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -216,7 +216,7 @@ 11 2.10.4 0.2.1 - 1.3.2 + 1.3.5 4.13.1 diff --git a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/pom.xml b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/pom.xml index c35a2bc81fb..5af87d3e0da 100644 --- a/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/pom.xml +++ b/samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable/pom.xml @@ -154,9 +154,9 @@ ${jackson-databind-nullable-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -180,7 +180,7 @@ 2.5 3.3.0 2.9.9 - 1.3.2 + 1.3.5 0.2.1 UTF-8 diff --git a/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml index cfbc66f6dc9..915ec6f9513 100644 --- a/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml +++ b/samples/openapi3/server/petstore/kotlin-springboot-reactive/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -125,9 +125,9 @@ validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/openapi3/server/petstore/kotlin-springboot/pom.xml b/samples/openapi3/server/petstore/kotlin-springboot/pom.xml index 8af5e943b3a..1bfa3bec626 100644 --- a/samples/openapi3/server/petstore/kotlin-springboot/pom.xml +++ b/samples/openapi3/server/petstore/kotlin-springboot/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -115,9 +115,9 @@ validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml index 6190136fc91..7330747f60e 100644 --- a/samples/server/petstore/java-inflector/pom.xml +++ b/samples/server/petstore/java-inflector/pom.xml @@ -127,9 +127,9 @@ ${swagger-inflector-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -148,7 +148,7 @@ 1.0.14 9.2.9.v20150224 1.0.1 - 1.3.2 + 1.3.5 4.8.2 1.6.3 diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index 638d1a5fb56..d2a5c14078d 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -47,8 +47,8 @@ - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -67,9 +67,9 @@ ${jackson-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -86,9 +86,9 @@ 1.7 ${java.version} ${java.version} - 2.5 + 4.0.4 2.8.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/server/petstore/java-pkmst/pom.xml b/samples/server/petstore/java-pkmst/pom.xml index 853d9b990f6..98a9d112a1a 100644 --- a/samples/server/petstore/java-pkmst/pom.xml +++ b/samples/server/petstore/java-pkmst/pom.xml @@ -15,7 +15,7 @@ 1.2.5 1.2.5 3.10.0 - 1.3.2 + 1.3.5 2.6.0 2.6.0 1.7.25 @@ -139,9 +139,9 @@ 1.2 - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index 9cadde2c712..bb88fe50d58 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -41,8 +41,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -124,8 +124,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -180,9 +180,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -203,11 +203,10 @@ 9.2.9.v20150224 4.13 1.2.0 - 2.5 - 1.1.0.Final + 2.0.2 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf-cdi-default-value/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi-default-value/pom.xml index 4b8ee0f1827..b85ec260a72 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi-default-value/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-cdi-default-value/pom.xml @@ -87,12 +87,16 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided + + 2.0.2 + + diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml index e924d7a7910..c2d476250e2 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml @@ -87,12 +87,16 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided + + 2.0.2 + + diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index 668a0a3f507..37380542275 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -41,8 +41,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -124,8 +124,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -180,9 +180,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -203,11 +203,10 @@ 9.2.9.v20150224 4.13 1.2.0 - 2.5 - 1.1.0.Final + 2.0.2 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index ae4de62e07c..a4a13cf0922 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -41,8 +41,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -124,8 +124,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -180,9 +180,9 @@ ${jackson-jaxrs-version} - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -203,11 +203,10 @@ 9.2.9.v20150224 4.13 1.2.0 - 2.5 - 1.1.0.Final + 2.0.2 3.3.0 2.9.9 - 1.3.2 + 1.3.5 UTF-8 diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml index 006d336efa5..9a6ef106bfe 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml +++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml @@ -54,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -161,8 +161,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -182,13 +182,13 @@ ${java.version} ${java.version} 1.5.18 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 2.22.2 2.9.9 4.13.1 1.2.0 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml index d3cde5f366d..1f10526075d 100644 --- a/samples/server/petstore/jaxrs-jersey/pom.xml +++ b/samples/server/petstore/jaxrs-jersey/pom.xml @@ -54,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -161,8 +161,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -182,13 +182,13 @@ ${java.version} ${java.version} 1.5.18 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 2.22.2 2.9.9 4.13.1 1.2.0 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle b/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle index b4805e5de7b..dd8b11f8b67 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle @@ -12,12 +12,12 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml index 23fba0b0d9e..928711e47ad 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default-value/pom.xml @@ -84,8 +84,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -121,9 +121,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -170,9 +170,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -193,6 +193,8 @@ 3.13.0.Final 1.6.3 4.13.1 - 2.5 + 4.0.4 + 1.3.5 + 2.0.2 diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle index b4805e5de7b..dd8b11f8b67 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle @@ -12,12 +12,12 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index 95c2c1342eb..4e86fffb5d9 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -84,8 +84,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -121,9 +121,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -170,9 +170,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -193,6 +193,8 @@ 3.13.0.Final 1.6.3 4.13.1 - 2.5 + 4.0.4 + 1.3.5 + 2.0.2 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle index 6498d44c2e8..68567d57b78 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle @@ -12,10 +12,10 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9' testCompile 'junit:junit:4.13', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml index 9abc115ec5b..44b7c44fe09 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -66,8 +66,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -103,9 +103,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -142,9 +142,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -169,6 +169,8 @@ 3.0.11.Final 1.6.3 4.8.1 - 2.5 + 4.0.4 + 2.0.2 + 1.3.5 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index 8e189f8148c..6c0bb712e06 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle @@ -12,10 +12,10 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.13', diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 6b25997d1c8..de6afb232c2 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -66,8 +66,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -103,9 +103,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -142,9 +142,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -174,6 +174,8 @@ 3.0.11.Final 1.6.3 4.8.1 - 2.5 + 4.0.4 + 2.0.2 + 1.3.5 diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index 8e189f8148c..6c0bb712e06 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle @@ -12,10 +12,10 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.13', diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index ff234bc266e..336166cdf9c 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -66,8 +66,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -103,9 +103,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -142,9 +142,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -174,6 +174,8 @@ 3.0.11.Final 1.6.3 4.8.1 - 2.5 + 4.0.4 + 2.0.2 + 1.3.5 diff --git a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle index b4805e5de7b..dd8b11f8b67 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle @@ -12,12 +12,12 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature diff --git a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml index 2fecf534a14..c2a4501fca0 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml @@ -84,8 +84,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -121,9 +121,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -165,9 +165,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -188,6 +188,8 @@ 3.13.0.Final 1.6.3 4.13.1 - 2.5 + 4.0.4 + 1.3.5 + 2.0.2 diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle index b4805e5de7b..dd8b11f8b67 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle @@ -12,12 +12,12 @@ dependencies { providedCompile 'org.jboss.resteasy:jaxrs-api:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final' providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final' - providedCompile 'javax.annotation:javax.annotation-api:1.2' + providedCompile 'jakarta.annotation:jakarta.annotation-api:1.3.5' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - providedCompile 'javax.validation:validation-api:1.1.0.Final' + providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2' compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index d539b83828c..d31af2a492f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -84,8 +84,8 @@ ${slf4j-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} provided @@ -121,9 +121,9 @@ provided - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided @@ -170,9 +170,9 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided @@ -193,6 +193,8 @@ 3.13.0.Final 1.6.3 4.13.1 - 2.5 + 4.0.4 + 1.3.5 + 2.0.2 diff --git a/samples/server/petstore/jaxrs-spec-interface/pom.xml b/samples/server/petstore/jaxrs-spec-interface/pom.xml index 33f4064e9d4..bb8acd34af9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/pom.xml +++ b/samples/server/petstore/jaxrs-spec-interface/pom.xml @@ -38,9 +38,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} provided @@ -73,14 +73,16 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided 2.9.9 4.13.1 + 2.0.2 + 2.1.6 diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml index c3216b9b4a6..0ed13d0cdda 100644 --- a/samples/server/petstore/jaxrs-spec/pom.xml +++ b/samples/server/petstore/jaxrs-spec/pom.xml @@ -53,9 +53,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-version} provided @@ -108,14 +108,16 @@ - javax.validation - validation-api - 1.1.0.Final + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} provided 2.9.9 4.13.1 + 2.0.2 + 2.1.6 diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml index 4730e2d1a86..232ac76fcc3 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml @@ -46,8 +46,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -130,8 +130,8 @@ ${jersey-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -179,8 +179,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -199,13 +199,13 @@ ${java.version} ${java.version} 1.5.22 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 1.19.1 2.9.9 1.7.21 4.13 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index 76be24bcdad..9356dcfe7eb 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -46,8 +46,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -130,8 +130,8 @@ ${jersey-version} - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -179,8 +179,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -199,13 +199,13 @@ ${java.version} ${java.version} 1.5.22 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 1.19.1 2.9.9 1.7.21 4.13 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index 31e30816611..47724379c18 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -54,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -161,8 +161,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -182,13 +182,13 @@ ${java.version} ${java.version} 1.5.18 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 2.22.2 2.9.9 4.13.1 1.2.0 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index f46407987ae..018c3a205cc 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -54,8 +54,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -127,8 +127,8 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} @@ -161,8 +161,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -182,13 +182,13 @@ ${java.version} ${java.version} 1.5.18 - 1.1.0.Final + 2.0.2 9.2.9.v20150224 2.22.2 2.9.9 4.13.1 1.2.0 - 2.5 + 4.0.4 UTF-8 diff --git a/samples/server/petstore/kotlin-springboot-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-delegate/pom.xml index 32a5347bada..f7094ec0e10 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/pom.xml +++ b/samples/server/petstore/kotlin-springboot-delegate/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -111,13 +111,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml index 8af5e943b3a..1bfa3bec626 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml +++ b/samples/server/petstore/kotlin-springboot-modelMutable/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -115,9 +115,9 @@ validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml index 17b60380752..cb52346a5c9 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml +++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -121,13 +121,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml index 32a5347bada..f7094ec0e10 100644 --- a/samples/server/petstore/kotlin-springboot/pom.xml +++ b/samples/server/petstore/kotlin-springboot/pom.xml @@ -8,7 +8,7 @@ 1.3.30 1.2.0 - 1.3.2 + 1.3.5 org.springframework.boot @@ -111,13 +111,13 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api - javax.annotation - javax.annotation-api - ${javax-annotation-version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} provided diff --git a/samples/server/petstore/kotlin/vertx/pom.xml b/samples/server/petstore/kotlin/vertx/pom.xml index 2c2af368f31..9d151636971 100644 --- a/samples/server/petstore/kotlin/vertx/pom.xml +++ b/samples/server/petstore/kotlin/vertx/pom.xml @@ -14,6 +14,7 @@ 1.8 1.3.10 true + 1.3.5 4.13 3.4.1 3.8.1 @@ -51,9 +52,9 @@ - javax.annotation - javax.annotation-api - 1.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} org.jetbrains.kotlin diff --git a/samples/server/petstore/spring-mvc-default-value/pom.xml b/samples/server/petstore/spring-mvc-default-value/pom.xml index da3d53777b0..fa8da51ae2d 100644 --- a/samples/server/petstore/spring-mvc-default-value/pom.xml +++ b/samples/server/petstore/spring-mvc-default-value/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index e694563c2f8..8d2528b1b2a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -44,8 +44,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -96,14 +96,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} @@ -139,14 +139,14 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -165,14 +165,16 @@ 1.8 ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 - 1.1.0.Final + 2.0.2 4.3.20.RELEASE 0.2.1 2.9.8 diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml index 0014c2edaaa..6155fc3e512 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml @@ -44,8 +44,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -96,14 +96,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} @@ -139,14 +139,14 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -165,14 +165,16 @@ 1.8 ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 - 1.1.0.Final + 2.0.2 4.3.20.RELEASE 0.2.1 2.9.8 diff --git a/samples/server/petstore/spring-mvc-no-nullable/pom.xml b/samples/server/petstore/spring-mvc-no-nullable/pom.xml index bd986111e16..126e6408ffc 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/pom.xml +++ b/samples/server/petstore/spring-mvc-no-nullable/pom.xml @@ -44,8 +44,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -96,14 +96,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} @@ -134,14 +134,14 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -160,14 +160,16 @@ 1.8 ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 - 1.1.0.Final + 2.0.2 4.3.20.RELEASE 2.9.8 diff --git a/samples/server/petstore/spring-mvc-spring-pageable/pom.xml b/samples/server/petstore/spring-mvc-spring-pageable/pom.xml index 2eb530e02b7..c448133c798 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/pom.xml +++ b/samples/server/petstore/spring-mvc-spring-pageable/pom.xml @@ -44,8 +44,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -96,14 +96,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} @@ -139,14 +139,14 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -165,14 +165,16 @@ 1.8 ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 - 1.1.0.Final + 2.0.2 4.3.20.RELEASE 0.2.1 2.9.8 diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index 515caf3d99a..c61218492ae 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -44,8 +44,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} @@ -96,14 +96,14 @@ ${spring-version} - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} - javax.xml.bind - jaxb-api - 2.2.11 + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-version} @@ -139,14 +139,14 @@ test - javax.servlet - servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-api-version} - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${beanvalidation-version} provided @@ -165,14 +165,16 @@ 1.8 ${java.version} ${java.version} + 1.3.5 + 2.3.3 9.2.15.v20160210 1.7.21 4.13.1 - 2.5 + 4.0.4 2.8.0 2.9.9 2.8.4 - 1.1.0.Final + 2.0.2 4.3.20.RELEASE 0.2.1 2.9.8 diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml index 2ddc19a9ad0..2c3a945d191 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.github.joschi.jackson @@ -64,8 +63,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml index 2513ea62aa9..ae8ec70bc1c 100644 --- a/samples/server/petstore/springboot-beanvalidation/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index b39fd49019a..14ed219b34c 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml index dc5d49ec292..f5fe58e2f14 100644 --- a/samples/server/petstore/springboot-delegate/pom.xml +++ b/samples/server/petstore/springboot-delegate/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-implicitHeaders/pom.xml b/samples/server/petstore/springboot-implicitHeaders/pom.xml index a76942cd3e2..149407e2aad 100644 --- a/samples/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml index 4bf88f96666..bc82bfdfef5 100644 --- a/samples/server/petstore/springboot-reactive/pom.xml +++ b/samples/server/petstore/springboot-reactive/pom.xml @@ -76,8 +76,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml index 4994d159114..d129b82917e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.github.joschi.jackson @@ -69,8 +68,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml index 2b0c56c20ea..5a29021686c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml index 442a2b387d4..62d59d9d1d7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.github.joschi.jackson @@ -69,8 +68,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-spring-pageable/pom.xml b/samples/server/petstore/springboot-spring-pageable/pom.xml index 8f9635c9d14..38fbd7d57fa 100644 --- a/samples/server/petstore/springboot-spring-pageable/pom.xml +++ b/samples/server/petstore/springboot-spring-pageable/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-useoptional/pom.xml b/samples/server/petstore/springboot-useoptional/pom.xml index cd0114f1e82..bbfc822dfba 100644 --- a/samples/server/petstore/springboot-useoptional/pom.xml +++ b/samples/server/petstore/springboot-useoptional/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core diff --git a/samples/server/petstore/springboot-virtualan/pom.xml b/samples/server/petstore/springboot-virtualan/pom.xml index 8dc39bea12e..920b8d60089 100644 --- a/samples/server/petstore/springboot-virtualan/pom.xml +++ b/samples/server/petstore/springboot-virtualan/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml index 0fedc5a3c63..62aa1140a3e 100644 --- a/samples/server/petstore/springboot/pom.xml +++ b/samples/server/petstore/springboot/pom.xml @@ -53,9 +53,8 @@ ${springfox-version} - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api com.fasterxml.jackson.datatype @@ -68,8 +67,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api com.fasterxml.jackson.core