Skip to content

Commit

Permalink
Upgraded and aligned Jersey dependencies versions to 2.38
Browse files Browse the repository at this point in the history 
Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
  • Loading branch information
@Coduz
Coduz committed Jan 24, 2023
1 parent 30de227 commit 4e049e1
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 47 deletions.
1 change: 0 additions & 1 deletion assembly/broker/descriptors/kapua-broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-utils</include>
<include>org.glassfish.jersey.bundles.repackaged:jersey-guava</include>
<include>org.glassfish.jersey.core:jersey-client</include>
<include>org.glassfish.jersey.core:jersey-common</include>
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
Expand Down
6 changes: 1 addition & 5 deletions assembly/broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,12 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
<!-- dependencies added otherwise the unix assembly doesn't know the arctifact to add -->

<!-- dependencies added otherwise the unix assembly doesn't know the arctifact to add -->
<dependency>
<groupId>org.eclipse.kapua</groupId>
<artifactId>kapua-translator-kapua-kura</artifactId>
Expand Down
121 changes: 80 additions & 41 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<jaxb-core.version>2.3.0.1</jaxb-core.version>
<jaxb-impl.version>2.3.6</jaxb-impl.version>
<jbatch.version>1.0.2</jbatch.version>
<jersey.version>2.23.2</jersey.version>
<jersey.version>2.38</jersey.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<jetty-activemq.version>9.2.30.v20200428</jetty-activemq.version>
<joda.version>2.9.4</joda.version>
Expand Down Expand Up @@ -1840,46 +1840,12 @@
</dependency>

<!-- REST API -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-entity-filtering</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.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</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.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
Expand All @@ -1895,11 +1861,6 @@
<artifactId>hk2-locator</artifactId>
<version>${hk2-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
<version>${jersey.version}</version>
</dependency>

<!-- -->
<!-- Jackson -->
Expand Down Expand Up @@ -2211,6 +2172,84 @@
<version>${jetty.version}</version>
</dependency>

<!-- -->
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>jaxrs-ri</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>repackaged</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</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-servlet</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.core</groupId>
<artifactId>jersey-common</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.ext</groupId>
<artifactId>jersey-entity-filtering</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-sse</artifactId>
<version>${jersey.version}</version>
</dependency>

<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down
11 changes: 11 additions & 0 deletions qa/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
<artifactId>kapua-qa-integration</artifactId>

<dependencies>

<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>jaxrs-ri</artifactId>
<version>${jersey.version}</version>
</dependency>

<!-- Required service interfaces -->
<dependency>
<groupId>org.eclipse.kapua</groupId>
Expand Down
14 changes: 14 additions & 0 deletions rest-api/web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,20 @@
<packaging>war</packaging>

<dependencies>

<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>jaxrs-ri</artifactId>
</dependency>

<!-- Internal dependencies -->
<dependency>
<groupId>org.eclipse.kapua</groupId>
Expand Down

0 comments on commit 4e049e1

Please sign in to comment.