Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions client-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
</licenses>

<properties>
<!-- 2.x latest using JDK 8. 3.x needs JDK 11, 4.x needs JDK 17.
Also, 3.x switches package from javax to jakarta, so actually
hopefully it should help with split between core and client-java.
Note that branch 2.x is still maintained with new updated versions
-->
<jersey.version>2.48</jersey.version>
<!-- THOSE ARE ONLY FOR TESTING -->
<springboot.version>2.5.4</springboot.version>
</properties>
Expand All @@ -60,6 +66,41 @@
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>


<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-http</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
21 changes: 21 additions & 0 deletions core-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<name>${project.groupId}:${project.artifactId}</name>

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

<dependencyManagement>
<dependencies>

<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>


<!-- Dependency Injection -->
<dependency>
<groupId>com.google.inject</groupId>
Expand Down
1 change: 0 additions & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>shade</id>
Expand Down
35 changes: 1 addition & 34 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
<springfox.version>3.0.0</springfox.version>
<jetty.version>9.4.29.v20200521</jetty.version>
<slf4j.version>1.7.24</slf4j.version>
<jersey.version>2.33</jersey.version>
<javax.el.version>2.2.5</javax.el.version>
<!--
Using latest, eg 2.16.0, breaks build, as Maven Shade Plugin
Expand Down Expand Up @@ -579,38 +578,6 @@
<version>${jetty.version}</version>
</dependency>

<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-http</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>

<!-- Jackson -->
<dependency>
Expand Down Expand Up @@ -1231,7 +1198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.6.2</version>
</plugin>

<!-- To sign Jar files before uploading them to Maven Central -->
Expand Down
Loading