Skip to content

Commit a8313da

Browse files
havetisyanhavetisyan
authored
Upgrade to jersey 2.27 (AthenZ#561)
1 parent c3be5ba commit a8313da

18 files changed

+80
-6
lines changed

‎clients/java/zms/examples/tls-support/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
30-
<athenz.version>1.7.33</athenz.version>
30+
<athenz.version>1.8.1</athenz.version>
3131
</properties>
3232

3333
<dependencies>

‎clients/java/zms/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,17 @@
4242
<artifactId>athenz-auth-core</artifactId>
4343
<version>${project.parent.version}</version>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.glassfish.jersey.inject</groupId>
47+
<artifactId>jersey-hk2</artifactId>
48+
<version>${jersey.version}</version>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>javax.inject</groupId>
52+
<artifactId>javax.inject</artifactId>
53+
</exclusion>
54+
</exclusions>
55+
</dependency>
4556
<dependency>
4657
<groupId>org.glassfish.jersey.media</groupId>
4758
<artifactId>jersey-media-json-jackson</artifactId>

‎clients/java/zts/core/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@
5353
<artifactId>athenz-auth-core</artifactId>
5454
<version>${project.parent.version}</version>
5555
</dependency>
56+
<dependency>
57+
<groupId>org.glassfish.jersey.inject</groupId>
58+
<artifactId>jersey-hk2</artifactId>
59+
<version>${jersey.version}</version>
60+
<exclusions>
61+
<exclusion>
62+
<groupId>javax.inject</groupId>
63+
<artifactId>javax.inject</artifactId>
64+
</exclusion>
65+
</exclusions>
66+
</dependency>
5667
<dependency>
5768
<groupId>org.glassfish.jersey.media</groupId>
5869
<artifactId>jersey-media-json-jackson</artifactId>

‎clients/java/zts/shade/pom.xml

+18
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,22 @@
5959
<artifactId>athenz-auth-core</artifactId>
6060
<version>${project.parent.version}</version>
6161
</dependency>
62+
<dependency>
63+
<groupId>org.glassfish.jersey.inject</groupId>
64+
<artifactId>jersey-hk2</artifactId>
65+
<version>${jersey.version}</version>
66+
<exclusions>
67+
<exclusion>
68+
<groupId>javax.inject</groupId>
69+
<artifactId>javax.inject</artifactId>
70+
</exclusion>
71+
</exclusions>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.glassfish.jersey.core</groupId>
75+
<artifactId>jersey-common</artifactId>
76+
<version>${jersey.version}</version>
77+
</dependency>
6278
<dependency>
6379
<groupId>org.glassfish.jersey.media</groupId>
6480
<artifactId>jersey-media-json-jackson</artifactId>
@@ -144,6 +160,8 @@
144160
<include>org.glassfish.jersey.ext</include>
145161
<include>org.glassfish.jersey.core</include>
146162
<include>org.glassfish.jersey.media</include>
163+
<include>org.glassfish.jersey.internal</include>
164+
<include>org.glassfish.jersey.inject</include>
147165
<include>org.glassfish.jersey.bundles.repackaged</include>
148166
<include>com.fasterxml.jackson.core</include>
149167
<include>com.fasterxml.jackson.jaxrs</include>

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.core.JsonFactory ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.core.JsonFactory

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.core.ObjectCodec ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.core.ObjectCodec

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.databind.Module ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.com.fasterxml.jackson.databind.Module

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.client.ClientBuilder ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.client.ClientBuilder

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.MessageBodyReader ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.MessageBodyReader

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.MessageBodyWriter ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.MessageBodyWriter

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.RuntimeDelegate ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.javax.ws.rs.ext.RuntimeDelegate

File renamed without changes.

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.org.glassfish.hk2.extension.ServiceLocatorGenerator ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.org.glassfish.hk2.extension.ServiceLocatorGenerator

File renamed without changes.

‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.org.glassfish.jersey.internal.inject.InjectionManagerFactory

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
athenz.shade.zts.org.glassfish.jersey.inject.hk2.Hk2InjectionManagerFactory

‎clients/java/zts/core/src/main/resources/META-INF/services/athenz.shade.zts.org.glassfish.jersey.internal.spi.AutoDiscoverable ‎clients/java/zts/shade/src/main/resources/META-INF/services/athenz.shade.zts.org.glassfish.jersey.internal.spi.AutoDiscoverable

File renamed without changes.

‎containers/jetty/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@
5454
<artifactId>athenz-instance-provider</artifactId>
5555
<version>${project.parent.version}</version>
5656
</dependency>
57+
<dependency>
58+
<groupId>org.glassfish.jersey.inject</groupId>
59+
<artifactId>jersey-hk2</artifactId>
60+
<version>${jersey.version}</version>
61+
<exclusions>
62+
<exclusion>
63+
<groupId>javax.inject</groupId>
64+
<artifactId>javax.inject</artifactId>
65+
</exclusion>
66+
</exclusions>
67+
</dependency>
5768
<dependency>
5869
<groupId>org.glassfish.jersey.media</groupId>
5970
<artifactId>jersey-media-json-jackson</artifactId>

‎pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@
7070

7171
<properties>
7272
<jetty.version>9.4.12.v20180830</jetty.version>
73-
<jersey.version>2.25.1</jersey.version>
74-
<jackson.version>2.9.6</jackson.version>
73+
<jersey.version>2.27</jersey.version>
74+
<jackson.version>2.9.7</jackson.version>
7575
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
76-
<rdl.version>1.4.14</rdl.version>
76+
<rdl.version>1.5.1</rdl.version>
7777
<bouncycastle.version>1.60</bouncycastle.version>
78-
<aws.version>1.11.401</aws.version>
78+
<aws.version>1.11.416</aws.version>
7979
<guava.version>26.0-jre</guava.version>
8080
<logback.version>1.2.3</logback.version>
8181
<javax.version>3.1.0</javax.version>
82-
<mockito.version>2.21.0</mockito.version>
82+
<mockito.version>2.22.0</mockito.version>
8383
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8484
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
8585
</properties>

‎servers/zms/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@
6767
<groupId>com.amazonaws</groupId>
6868
<artifactId>aws-java-sdk-rds</artifactId>
6969
</dependency>
70+
<dependency>
71+
<groupId>org.glassfish.jersey.inject</groupId>
72+
<artifactId>jersey-hk2</artifactId>
73+
<version>${jersey.version}</version>
74+
<exclusions>
75+
<exclusion>
76+
<groupId>javax.inject</groupId>
77+
<artifactId>javax.inject</artifactId>
78+
</exclusion>
79+
</exclusions>
80+
</dependency>
7081
<dependency>
7182
<groupId>org.glassfish.jersey.media</groupId>
7283
<artifactId>jersey-media-json-jackson</artifactId>

‎servers/zts/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@
7070
<artifactId>athenz-instance-provider</artifactId>
7171
<version>${project.parent.version}</version>
7272
</dependency>
73+
<dependency>
74+
<groupId>org.glassfish.jersey.inject</groupId>
75+
<artifactId>jersey-hk2</artifactId>
76+
<version>${jersey.version}</version>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>javax.inject</groupId>
80+
<artifactId>javax.inject</artifactId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
7384
<dependency>
7485
<groupId>org.glassfish.jersey.media</groupId>
7586
<artifactId>jersey-media-json-jackson</artifactId>

0 commit comments

Comments
 (0)