Skip to content

Commit 970e1c3

Browse files
committed
update deps
1 parent 7b341ac commit 970e1c3

File tree

21 files changed

+47
-32
lines changed

21 files changed

+47
-32
lines changed

src/main/resources/handlebars/Java/build.gradle.java11.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repositories {
1313
ext {
1414
swagger_annotations_version = "{{#useOas2}}1.5.24{{/useOas2}}{{^useOas2}}2.0.0{{/useOas2}}"
1515
jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
16-
jersey_version = "1.19.4"
16+
jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
1717
jodatime_version = "2.10.5"
1818
junit_version = "4.13.1"
1919
}
@@ -38,7 +38,7 @@ dependencies {
3838
{{#threetenbp}}
3939
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
4040
{{/threetenbp}}
41-
implementation 'com.sun.xml.ws:jaxws-rt:2.3.3'
41+
implementation 'com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}'
4242
testImplementation "junit:junit:$junit_version"
4343
{{#wiremock}}
4444
testImplementation "com.github.tomakehurst:wiremock:2.27.2"
@@ -73,4 +73,4 @@ publishing {
7373

7474
tasks.withType(JavaCompile) {
7575
options.encoding = 'UTF-8'
76-
}
76+
}

src/main/resources/handlebars/Java/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ ext {
113113
swagger_annotations_version = "2.0.0"
114114
{{/useOas2}}
115115
jackson_version = "2.10.1"
116-
jersey_version = "1.19.4"
116+
jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
117117
jodatime_version = "2.9.9"
118118
junit_version = "4.12"
119119
}

src/main/resources/handlebars/Java/libraries/feign/build.gradle.java11.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dependencies {
5050
}
5151
implementation "org.json:json:20180130"
5252
implementation "com.brsanthu:migbase64:2.2"
53-
implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
53+
implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
5454
testImplementation "junit:junit:$junit_version"
5555
testImplementation "com.squareup.okhttp3:mockwebserver:3.6.0"
5656
testImplementation "org.assertj:assertj-core:1.7.1"
@@ -87,4 +87,4 @@ publishing {
8787

8888
tasks.withType(JavaCompile) {
8989
options.encoding = 'UTF-8'
90-
}
90+
}

src/main/resources/handlebars/Java/libraries/feign/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<dependency>
176176
<groupId>com.sun.xml.ws</groupId>
177177
<artifactId>jaxws-rt</artifactId>
178-
<version>2.3.3</version>
178+
<version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
179179
<type>pom</type>
180180
</dependency>
181181
</dependencies>

src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.java11.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repositories {
1313
ext {
1414
swagger_annotations_version = "{{#useOas2}}1.5.24{{/useOas2}}{{^useOas2}}2.0.0{{/useOas2}}"
1515
jackson_version = "2.6.4"
16-
jersey_version = "2.29.1"
16+
jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.29.1{{/jakarta}}"
1717
junit_version = "4.13.1"
1818
}
1919

src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ext {
112112
swagger_annotations_version = "2.0.0"
113113
{{/useOas2}}
114114
jackson_version = "2.10.1"
115-
jersey_version = "2.26"
115+
jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.26{{/jakarta}}"
116116
{{#supportJava6}}
117117
commons_io_version=2.5
118118
commons_lang3_version=3.6

src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.java11.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
{{#threetenbp}}
2828
implementation 'org.threeten:threetenbp:1.3.5'
2929
{{/threetenbp}}
30-
implementation 'com.sun.xml.ws:jaxws-rt:2.3.3'
30+
implementation 'com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}'
3131
testImplementation 'junit:junit:4.13.1'
3232
{{#wiremock}}
3333
testImplementation "com.github.tomakehurst:wiremock:2.27.2"

src/main/resources/handlebars/Java/libraries/okhttp-gson/pom.mustache

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<dependency>
177177
<groupId>com.sun.xml.ws</groupId>
178178
<artifactId>jaxws-rt</artifactId>
179-
<version>2.3.3</version>
179+
<version>{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}</version>
180180
<type>pom</type>
181181
</dependency>
182182
</dependencies>
@@ -266,13 +266,22 @@
266266
<dependency>
267267
<groupId>org.hibernate</groupId>
268268
<artifactId>hibernate-validator</artifactId>
269-
<version>5.4.1.Final</version>
269+
<version>{{#jakarta}}8.0.0.Final{{/jakarta}}{{^jakarta}}5.4.1.Final{{/jakarta}}</version>
270270
</dependency>
271+
{{#jakarta}}
272+
<dependency>
273+
<groupId>jakarta.el</groupId>
274+
<artifactId>jakarta.el-api</artifactId>
275+
<version>5.0.1</version>
276+
</dependency>
277+
{{/jakarta}}
278+
{{^jakarta}}
271279
<dependency>
272280
<groupId>javax.el</groupId>
273281
<artifactId>el-api</artifactId>
274282
<version>2.2</version>
275283
</dependency>
284+
{{/jakarta}}
276285
{{/performBeanValidation}}
277286
{{#parcelableModel}}
278287
<!-- Needed for Parcelable support-->

src/main/resources/handlebars/Java/libraries/resteasy/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ext {
112112
swagger_annotations_version = "2.0.0"
113113
{{/useOas2}}
114114
jackson_version = "2.10.1"
115-
jersey_version = "2.22.2"
115+
jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}2.22.2{{/jakarta}}"
116116
{{^java8}}
117117
jodatime_version = "2.9.4"
118118
{{/java8}}

src/main/resources/handlebars/Java/libraries/resttemplate/build.gradle.java11.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
{{#withXml}}
4444
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
4545
{{/withXml}}
46-
implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
46+
implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
4747
testImplementation "junit:junit:$junit_version"
4848
{{#wiremock}}
4949
testImplementation "com.github.tomakehurst:wiremock:2.27.2"
@@ -78,4 +78,4 @@ publishing {
7878

7979
tasks.withType(JavaCompile) {
8080
options.encoding = 'UTF-8'
81-
}
81+
}

0 commit comments

Comments
 (0)