Skip to content

Commit 12d9ad9

Browse files
arcuri82arcuri82
authored
Merge pull request #1613 from WebFuzzing/jersey-update
starting to update Jersey
2 parents b74acec + 330f2e3 commit 12d9ad9

4 files changed

Lines changed: 63 additions & 35 deletions

File tree

‎client-java/pom.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
</licenses>
3737

3838
<properties>
39+
<!-- 2.x latest using JDK 8. 3.x needs JDK 11, 4.x needs JDK 17.
40+
Also, 3.x switches package from javax to jakarta, so actually
41+
hopefully it should help with split between core and client-java.
42+
Note that branch 2.x is still maintained with new updated versions
43+
-->
44+
<jersey.version>2.48</jersey.version>
3945
<!-- THOSE ARE ONLY FOR TESTING -->
4046
<springboot.version>2.5.4</springboot.version>
4147
</properties>
@@ -60,6 +66,41 @@
6066
<artifactId>javax.servlet-api</artifactId>
6167
<version>3.1.0</version>
6268
</dependency>
69+
70+
71+
<!-- Jersey -->
72+
<dependency>
73+
<groupId>org.glassfish.jersey.core</groupId>
74+
<artifactId>jersey-client</artifactId>
75+
<version>${jersey.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.glassfish.jersey.core</groupId>
79+
<artifactId>jersey-server</artifactId>
80+
<version>${jersey.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.glassfish.jersey.containers</groupId>
84+
<artifactId>jersey-container-servlet-core</artifactId>
85+
<version>${jersey.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.glassfish.jersey.containers</groupId>
89+
<artifactId>jersey-container-jetty-http</artifactId>
90+
<version>${jersey.version}</version>
91+
<exclusions>
92+
<exclusion>
93+
<groupId>org.eclipse.jetty</groupId>
94+
<artifactId>*</artifactId>
95+
</exclusion>
96+
</exclusions>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.glassfish.jersey.inject</groupId>
100+
<artifactId>jersey-hk2</artifactId>
101+
<version>${jersey.version}</version>
102+
</dependency>
103+
63104
</dependencies>
64105
</dependencyManagement>
65106

‎core-parent/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<name>${project.groupId}:${project.artifactId}</name>
1515

1616
<properties>
17+
<!-- Before we can upgrade this, need to get rid off Jersey/Jetty in client-java -->
18+
<jersey.version>2.48</jersey.version>
1719
<!-- upgrading to 1.0.68 breaks Spring... TODO would need try upgrading in own branch -->
1820
<swagger.parser-v2.version>1.0.64</swagger.parser-v2.version>
1921
<!-- upgrading to 2.1.18 breaks Spring... TODO would need try upgrading in own branch -->
@@ -24,6 +26,25 @@
2426

2527
<dependencyManagement>
2628
<dependencies>
29+
30+
<!-- Jersey -->
31+
<dependency>
32+
<groupId>org.glassfish.jersey.media</groupId>
33+
<artifactId>jersey-media-json-jackson</artifactId>
34+
<version>${jersey.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.glassfish.jersey.core</groupId>
38+
<artifactId>jersey-client</artifactId>
39+
<version>${jersey.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.glassfish.jersey.inject</groupId>
43+
<artifactId>jersey-hk2</artifactId>
44+
<version>${jersey.version}</version>
45+
</dependency>
46+
47+
2748
<!-- Dependency Injection -->
2849
<dependency>
2950
<groupId>com.google.inject</groupId>

‎core/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@
422422
<plugin>
423423
<groupId>org.apache.maven.plugins</groupId>
424424
<artifactId>maven-shade-plugin</artifactId>
425-
<version>3.5.0</version>
426425
<executions>
427426
<execution>
428427
<id>shade</id>

‎pom.xml‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@
224224
<springfox.version>3.0.0</springfox.version>
225225
<jetty.version>9.4.29.v20200521</jetty.version>
226226
<slf4j.version>1.7.24</slf4j.version>
227-
<jersey.version>2.33</jersey.version>
228227
<javax.el.version>2.2.5</javax.el.version>
229228
<!--
230229
Using latest, eg 2.16.0, breaks build, as Maven Shade Plugin
@@ -579,38 +578,6 @@
579578
<version>${jetty.version}</version>
580579
</dependency>
581580

582-
<!-- Jersey -->
583-
<dependency>
584-
<groupId>org.glassfish.jersey.core</groupId>
585-
<artifactId>jersey-client</artifactId>
586-
<version>${jersey.version}</version>
587-
</dependency>
588-
<dependency>
589-
<groupId>org.glassfish.jersey.core</groupId>
590-
<artifactId>jersey-server</artifactId>
591-
<version>${jersey.version}</version>
592-
</dependency>
593-
<dependency>
594-
<groupId>org.glassfish.jersey.containers</groupId>
595-
<artifactId>jersey-container-servlet-core</artifactId>
596-
<version>${jersey.version}</version>
597-
</dependency>
598-
<dependency>
599-
<groupId>org.glassfish.jersey.containers</groupId>
600-
<artifactId>jersey-container-jetty-http</artifactId>
601-
<version>${jersey.version}</version>
602-
<exclusions>
603-
<exclusion>
604-
<groupId>org.eclipse.jetty</groupId>
605-
<artifactId>*</artifactId>
606-
</exclusion>
607-
</exclusions>
608-
</dependency>
609-
<dependency>
610-
<groupId>org.glassfish.jersey.inject</groupId>
611-
<artifactId>jersey-hk2</artifactId>
612-
<version>${jersey.version}</version>
613-
</dependency>
614581

615582
<!-- Jackson -->
616583
<dependency>
@@ -1231,7 +1198,7 @@
12311198
<plugin>
12321199
<groupId>org.apache.maven.plugins</groupId>
12331200
<artifactId>maven-shade-plugin</artifactId>
1234-
<version>3.2.1</version>
1201+
<version>3.6.2</version>
12351202
</plugin>
12361203

12371204
<!-- To sign Jar files before uploading them to Maven Central -->

0 commit comments

Comments
 (0)