Update outdated dependencies: jetty, jersey and others

pr-link: #9942 change-id: cid-e9ff93c86c8002e2a91464b62e6a8664369def13
Alluxio · Feb 26, 2020 · 2093388 · 2093388
1 parent e97c213
commit 2093388
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 26 deletions.
diff --git a/core/common/src/test/java/alluxio/security/authentication/GrpcSecurityTest.java b/core/common/src/test/java/alluxio/security/authentication/GrpcSecurityTest.java
@@ -64,7 +64,7 @@ public void before() {
   @Test
   public void testServerUnsupportedAuthentication() {
     mThrown.expect(RuntimeException.class);
-    mThrown.expectMessage(new StringStartsWith(
+    mThrown.expectMessage(new StringStartsWith(false,
         "No factory could create a UserState with authType: " + AuthType.KERBEROS.name()));
     createServer(AuthType.KERBEROS);
   }

diff --git a/core/server/common/pom.xml b/core/server/common/pom.xml
@@ -126,6 +126,11 @@
       <artifactId>jersey-server</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <!-- Internal dependencies -->
     <dependency>

diff --git a/core/server/master/pom.xml b/core/server/master/pom.xml
@@ -70,6 +70,10 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.rocksdb</groupId>
       <artifactId>rocksdbjni</artifactId>

diff --git a/...server/master/src/main/java/alluxio/master/metrics/MetricsMasterClientServiceHandler.java b/...server/master/src/main/java/alluxio/master/metrics/MetricsMasterClientServiceHandler.java
@@ -24,7 +24,7 @@
 import com.google.common.base.Preconditions;
 
 import io.grpc.stub.StreamObserver;
-import jersey.repackaged.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/core/server/proxy/pom.xml b/core/server/proxy/pom.xml
@@ -74,6 +74,10 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
     <!-- Required at runtime to decode json objects for rest API -->
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>

diff --git a/core/server/worker/pom.xml b/core/server/worker/pom.xml
@@ -74,6 +74,10 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
 
     <!-- Internal dependencies -->
     <dependency>

diff --git a/core/transport/pom.xml b/core/transport/pom.xml
@@ -109,14 +109,14 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.5.0.Final</version>
+        <version>1.6.2</version>
       </extension>
     </extensions>
     <plugins>
       <plugin>
         <groupId>org.xolstice.maven.plugins</groupId>
         <artifactId>protobuf-maven-plugin</artifactId>
-        <version>0.5.0</version>
+        <version>0.6.1</version>
         <configuration>
           <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>

diff --git a/job/server/pom.xml b/job/server/pom.xml
@@ -50,12 +50,14 @@
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet-core</artifactId>
-      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
-      <version>${jersey.version}</version>
     </dependency>
 
     <!-- Internal dependencies -->

diff --git a/pom.xml b/pom.xml
@@ -128,24 +128,22 @@
     <aws.amazonaws.version>1.11.215</aws.amazonaws.version>
     <build.path>build</build.path>
     <copycat.version>1.2.14</copycat.version>
-    <cxf.version>2.7.0</cxf.version>
     <glusterfs-hadoop.version>2.3.13</glusterfs-hadoop.version>
-    <gmetric4j.version>1.0.7</gmetric4j.version>
     <grpc.version>1.27.0</grpc.version>
     <netty.version>4.1.42.Final</netty.version>
+    <rocksdb.version>5.15.10</rocksdb.version>
     <hadoop.version>2.7.3</hadoop.version>
-    <hadoop-openstack.version>2.6.0</hadoop-openstack.version>
     <jacoco.version>0.8.5</jacoco.version>
     <java.version>1.8</java.version>
-    <jersey.version>2.22</jersey.version>
-    <jetty.version>9.2.16.v20160414</jetty.version>
+    <jersey.version>2.29.1</jersey.version>
+    <jetty.version>9.2.28.v20190418</jetty.version>
     <junit.version>4.12</junit.version>
     <log4j.version>1.2.17</log4j.version>
     <maven.version>3.3.9</maven.version>
     <metrics.version>3.1.2</metrics.version>
     <oshi.version>4.2.0</oshi.version>
     <powermock.version>1.6.2</powermock.version>
-    <prometheus.version>0.3.0</prometheus.version>
+    <prometheus.version>0.8.0</prometheus.version>
     <guava.version>27.0.1-jre</guava.version>
     <parquet.version>1.10.0</parquet.version>
     <protobuf.version>3.11.0</protobuf.version>
@@ -228,7 +226,7 @@
       <dependency>
         <groupId>com.github.serceman</groupId>
         <artifactId>jnr-fuse</artifactId>
-        <version>0.5.1</version>
+        <version>0.5.3</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -255,12 +253,12 @@
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.3.1</version>
+        <version>1.4</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.10</version>
+        <version>1.13</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>
@@ -270,7 +268,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.4</version>
+        <version>2.6</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
@@ -282,11 +280,6 @@
         <artifactId>commons-logging</artifactId>
         <version>1.1.1</version>
       </dependency>
-      <dependency>
-        <groupId>info.ganglia.gmetric4j</groupId>
-        <artifactId>gmetric4j</artifactId>
-        <version>${gmetric4j.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-core</artifactId>
@@ -321,11 +314,23 @@
         <groupId>io.grpc</groupId>
         <artifactId>grpc-netty</artifactId>
         <version>${grpc.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-protobuf</artifactId>
         <version>${grpc.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.api.grpc</groupId>
+            <artifactId>proto-google-common-protos</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
@@ -585,11 +590,21 @@
         <artifactId>jersey-server</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-json-jackson</artifactId>
         <version>${jersey.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.gluster</groupId>
         <artifactId>glusterfs-hadoop</artifactId>
@@ -620,12 +635,12 @@
       <dependency>
         <groupId>org.reflections</groupId>
         <artifactId>reflections</artifactId>
-        <version>0.9.10</version>
+        <version>0.9.12</version>
       </dependency>
       <dependency>
         <groupId>org.rocksdb</groupId>
         <artifactId>rocksdbjni</artifactId>
-        <version>5.15.10</version>
+        <version>${rocksdb.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -655,6 +670,12 @@
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.curator</groupId>
@@ -668,11 +689,10 @@
         <version>${hadoop.version}</version>
         <scope>test</scope>
       </dependency>
-      <!-- TODO(andrew): Update to a non-rc version before final Alluxio release -->
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest</artifactId>
-        <version>2.1-rc4</version>
+        <version>2.2</version>
         <scope>test</scope>
       </dependency>
       <dependency>

diff --git a/tests/src/test/java/alluxio/server/ft/MasterFaultToleranceIntegrationTest.java b/tests/src/test/java/alluxio/server/ft/MasterFaultToleranceIntegrationTest.java
@@ -42,7 +42,7 @@
 import alluxio.util.WaitForOptions;
 import alluxio.util.io.PathUtils;
 
-import jersey.repackaged.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;