forked from loafle/openapi-generator-original
[Java] Replace Java EE 8 dependencies by Jakarta EE 8 (#10513)
* Migrate javax.annotation:javax.annotation-api to jakarta.annotation:jakarta.annotation-api:1.3.5 * Migrate javax.annotation:javax.annotation-api to jakarta.annotation:jakarta.annotation-api:1.3.5 for sbt * Migrate javax.annotation:javax.annotation-api to jakarta.annotation:jakarta.annotation-api:1.3.5 for gradle * Commit samples files after the execution of the command "generate-samples.sh for configs java and kotlin * Delete org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec from the exclusion section of org.jboss.resteasy:resteasy-client in the resteasy module because jboss-annotations-api_1.2_spec isn't a transitive dependency * Migrate javax.validation:validation-api to jakarta.validation:jakarta.validation-api:2.0.2 for maven * Migrate javax.validation:validation-api to jakarta.validation:jakarta.validation-api:2.0.2 for gradle * Migrate javax.validation:validation-api to jakarta.validation:jakarta.validation-api:2.0.2 for sbt * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.ws.rs:javax.ws.rs-api to jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 for maven * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.json.bind:javax.json.bind-api to jakarta.json.bind:jakarta.json.bind-api:1.0.2 for maven * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.json:javax.json-api to jakarta.json:jakarta.json-api:1.1.6 for maven * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.xml.bind:jaxb-api to jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 for maven * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.el:el-api to jakarta.el:jakarta.el-api:3.0.3 for maven * Migrate javax.servlet:servlet-api to jakarta.servlet:jakarta.servlet-api:4.0.4 for maven * Delete the property servlet-api-version in pom files because it is useless * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Migrate javax.activation:activation to jakarta.activation:jakarta.activation-api:1.2.2 for maven * Delete javax.activation:activation from the exclusion section of org.jboss.resteasy:resteasy-client in the resteasy module because javax.activation:activation isn't a transitive dependency * Commit samples files after the execution of the command "generate-samples.sh for configs java, spring, jaxrs and kotlin * Fix the name of property jakarta.activation-version * Fix a missing property 'jakarta-annotation-version' in JavaJaxRS/resteasy/pom.mustache * generate samples * Fix version value of jakarta.validation-api artifact in Java/libraries/rest-assured/pom.mustache * Fix missing property jakarta-annotation-version in jaxrs-resteasy/eap/pom.mustache * generate samples * Revert changes in sample files after running the command generate-samples.sh in gitBash * Fix files in samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8 * Replace the old dependency javax.validation:validation-api by the new Jakarta EE 8 jakarta.validation:jakarta.validation-api in openapi-generator-online Co-authored-by: rpruvost <rpruvost@ITEM-S78402.emea.msad.sopra> Co-authored-by: rpruvost <romain.pruvost@soprasteria.com>
This commit is contained in:
RomainPruvostMHH
GitHub
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -282,9 +282,9 @@
|
||||
<version>2.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
<version>${javax-annotation-version}</version>
|
||||
<groupId>jakarta.annotation</groupId>
|
||||
<artifactId>jakarta.annotation-api</artifactId>
|
||||
<version>${jakarta-annotation-version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -308,7 +308,7 @@
|
||||
<jackson-databind-version>2.10.5.1</jackson-databind-version>
|
||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||
<threetenbp-version>2.9.10</threetenbp-version>
|
||||
<javax-annotation-version>1.3.2</javax-annotation-version>
|
||||
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
|
||||
<junit-version>4.13.1</junit-version>
|
||||
</properties>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user