update deps

swagger-api · Dec 28, 2022 · 970e1c3 · 970e1c3
1 parent 7b341ac
commit 970e1c3
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 32 deletions.
diff --git a/src/main/resources/handlebars/Java/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/build.gradle.java11.mustache
@@ -13,7 +13,7 @@ repositories {
 ext {
     swagger_annotations_version = "{{#useOas2}}1.5.24{{/useOas2}}{{^useOas2}}2.0.0{{/useOas2}}"
     jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
-    jersey_version = "1.19.4"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
     jodatime_version = "2.10.5"
     junit_version = "4.13.1"
 }
@@ -38,7 +38,7 @@ dependencies {
     {{#threetenbp}}
     implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
     {{/threetenbp}}
-    implementation 'com.sun.xml.ws:jaxws-rt:2.3.3'
+    implementation 'com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}'
     testImplementation "junit:junit:$junit_version"
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"
@@ -73,4 +73,4 @@ publishing {
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-}
+}
diff --git a/src/main/resources/handlebars/Java/build.gradle.mustache b/src/main/resources/handlebars/Java/build.gradle.mustache
@@ -113,7 +113,7 @@ ext {
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
     jackson_version = "2.10.1"
-    jersey_version = "1.19.4"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
     jodatime_version = "2.9.9"
     junit_version = "4.12"
 }

diff --git a/src/main/resources/handlebars/Java/libraries/feign/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/feign/build.gradle.java11.mustache
@@ -50,7 +50,7 @@ dependencies {
     }
     implementation "org.json:json:20180130"
     implementation "com.brsanthu:migbase64:2.2"
-    implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
+    implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
     testImplementation "junit:junit:$junit_version"
     testImplementation "com.squareup.okhttp3:mockwebserver:3.6.0"
     testImplementation "org.assertj:assertj-core:1.7.1"
@@ -87,4 +87,4 @@ publishing {
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-}
+}
diff --git a/src/main/resources/handlebars/Java/libraries/feign/pom.mustache b/src/main/resources/handlebars/Java/libraries/feign/pom.mustache
@@ -175,7 +175,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>

diff --git a/src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.java11.mustache
@@ -13,7 +13,7 @@ repositories {
 ext {
     swagger_annotations_version = "{{#useOas2}}1.5.24{{/useOas2}}{{^useOas2}}2.0.0{{/useOas2}}"
     jackson_version = "2.6.4"
-    jersey_version = "2.29.1"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.29.1{{/jakarta}}"
     junit_version = "4.13.1"
 }
 

diff --git a/src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache b/src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache
@@ -112,7 +112,7 @@ ext {
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
     jackson_version = "2.10.1"
-    jersey_version = "2.26"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.26{{/jakarta}}"
     {{#supportJava6}}
     commons_io_version=2.5
     commons_lang3_version=3.6

diff --git a/src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.java11.mustache
@@ -27,7 +27,7 @@ dependencies {
     {{#threetenbp}}
     implementation 'org.threeten:threetenbp:1.3.5'
     {{/threetenbp}}
-    implementation 'com.sun.xml.ws:jaxws-rt:2.3.3'
+    implementation 'com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}'
     testImplementation 'junit:junit:4.13.1'
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"

diff --git a/src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache b/src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache
@@ -176,7 +176,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>
@@ -266,13 +266,22 @@
     <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
-        <version>5.4.1.Final</version>
+        <version>{{#jakarta}}8.0.0.Final{{/jakarta}}{{^jakarta}}5.4.1.Final{{/jakarta}}</version>
     </dependency>
+      {{#jakarta}}
+      <dependency>
+        <groupId>jakarta.el</groupId>
+        <artifactId>jakarta.el-api</artifactId>
+        <version>5.0.1</version>
+      </dependency>
+      {{/jakarta}}
+      {{^jakarta}}
     <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
         <version>2.2</version>
     </dependency>
+      {{/jakarta}}
     {{/performBeanValidation}}
     {{#parcelableModel}}
     <!-- Needed for Parcelable support-->

diff --git a/src/main/resources/handlebars/Java/libraries/resteasy/build.gradle.mustache b/src/main/resources/handlebars/Java/libraries/resteasy/build.gradle.mustache
@@ -112,7 +112,7 @@ ext {
     swagger_annotations_version = "2.0.0"
     {{/useOas2}}
     jackson_version = "2.10.1"
-    jersey_version = "2.22.2"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.22.2{{/jakarta}}"
     {{^java8}}
     jodatime_version = "2.9.4"
     {{/java8}}

diff --git a/src/main/resources/handlebars/Java/libraries/resttemplate/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/resttemplate/build.gradle.java11.mustache
@@ -43,7 +43,7 @@ dependencies {
     {{#withXml}}
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
     {{/withXml}}
-    implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
+    implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
     testImplementation "junit:junit:$junit_version"
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"
@@ -78,4 +78,4 @@ publishing {
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-}
+}
diff --git a/src/main/resources/handlebars/Java/libraries/resttemplate/pom.mustache b/src/main/resources/handlebars/Java/libraries/resttemplate/pom.mustache
@@ -191,7 +191,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>

diff --git a/src/main/resources/handlebars/Java/libraries/retrofit/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/retrofit/build.gradle.java11.mustache
@@ -33,7 +33,7 @@ dependencies {
     }
     implementation "org.json:json:20180130"
     implementation "joda-time:joda-time:$jodatime_version"
-    implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
+    implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
     testImplementation "junit:junit:$junit_version"
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"

diff --git a/src/main/resources/handlebars/Java/libraries/retrofit/pom.mustache b/src/main/resources/handlebars/Java/libraries/retrofit/pom.mustache
@@ -184,7 +184,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>

diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/build.gradle.java11.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/build.gradle.java11.mustache
@@ -77,7 +77,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     {{/usePlayWS}}
-    implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
+    implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"
     {{/wiremock}}

diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/pom.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/pom.mustache
@@ -176,7 +176,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>

diff --git a/src/main/resources/handlebars/Java/pom.mustache b/src/main/resources/handlebars/Java/pom.mustache
@@ -191,7 +191,7 @@
             <dependency>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-rt</artifactId>
-                <version>2.3.3</version>
+                <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>

diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf/pom.mustache
@@ -191,18 +191,23 @@
     <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
-        <version>5.2.2.Final</version>
+      <version>{{#jakarta}}8.0.0.Final{{/jakarta}}{{^jakarta}}5.2.2.Final{{/jakarta}}</version>
     </dependency>
 {{/useBeanValidationFeature}}
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.2.6</version>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
     </dependency>
     <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>{{#jakarta}}4.0.1{{/jakarta}}{{^jakarta}}2.3.7{{/jakarta}}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>{{#jakarta}}2.1.0{{/jakarta}}{{^jakarta}}1.2.2{{/jakarta}}</version>
     </dependency>
   </dependencies>
   <repositories>
@@ -231,7 +236,7 @@
 {{#useBeanValidation}}
     <beanvalidation-version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}2.0.2{{/jakarta}}</beanvalidation-version>
 {{/useBeanValidation}}
-    <cxf-version>3.2.4</cxf-version>
+    <cxf-version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}3.2.4.Final{{/jakarta}}</cxf-version>
     <jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

diff --git a/src/main/resources/handlebars/JavaJaxRS/cxf/server/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/cxf/server/pom.mustache
@@ -303,7 +303,7 @@
 {{#generateSpringBootApplication}}
     <spring.boot-version>1.5.9.RELEASE</spring.boot-version>
 {{/generateSpringBootApplication}}
-    <cxf-version>3.2.4</cxf-version>
+    <cxf-version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}3.2.42.Final{{/jakarta}}</cxf-version>
     <jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

diff --git a/src/main/resources/handlebars/JavaJaxRS/spec/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/spec/pom.mustache
@@ -46,7 +46,7 @@
         <dependency>
           <groupId>com.sun.xml.ws</groupId>
           <artifactId>jaxws-rt</artifactId>
-          <version>2.3.3</version>
+          <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
           <type>pom</type>
         </dependency>
       </dependencies>

diff --git a/src/main/resources/handlebars/JavaSpring/libraries/spring-boot/pom.mustache b/src/main/resources/handlebars/JavaSpring/libraries/spring-boot/pom.mustache
@@ -55,7 +55,7 @@
                 <dependency>
                     <groupId>com.sun.xml.ws</groupId>
                     <artifactId>jaxws-rt</artifactId>
-                    <version>2.3.3</version>
+                  <version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
                     <type>pom</type>
                 </dependency>
             </dependencies>

diff --git a/src/test/java/io/swagger/codegen/v3/generators/options/JavaOptionsProvider.java b/src/test/java/io/swagger/codegen/v3/generators/options/JavaOptionsProvider.java
@@ -78,6 +78,7 @@ public JavaOptionsProvider() {
                 .put(CodegenConstants.USE_OAS2, "true")
                 .put(JavaClientCodegen.CHECK_DUPLICATED_MODEL_NAME, "false")
                 .put(JavaClientCodegen.WIREMOCK_OPTION, "false")
+                .put(JavaClientCodegen.JAKARTA, "false")
                 //.put("supportJava6", "true")
                 .build();
     }