diff --git a/core/common/src/test/java/alluxio/security/authentication/GrpcSecurityTest.java b/core/common/src/test/java/alluxio/security/authentication/GrpcSecurityTest.java index 04f2cde3d2cc..0c917fd2e2bd 100644 --- 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 index 2c28cb7f1c0e..44db3e0226bd 100644 --- a/core/server/common/pom.xml +++ b/core/server/common/pom.xml @@ -126,6 +126,11 @@ jersey-server test + + org.glassfish.jersey.inject + jersey-hk2 + test + diff --git a/core/server/master/pom.xml b/core/server/master/pom.xml index a85b5fef9982..0a7597212ff5 100644 --- a/core/server/master/pom.xml +++ b/core/server/master/pom.xml @@ -70,6 +70,10 @@ org.glassfish.jersey.core jersey-server + + org.glassfish.jersey.inject + jersey-hk2 + org.rocksdb rocksdbjni diff --git a/core/server/master/src/main/java/alluxio/master/metrics/MetricsMasterClientServiceHandler.java b/core/server/master/src/main/java/alluxio/master/metrics/MetricsMasterClientServiceHandler.java index 84ceae98755b..f123033ce0ff 100644 --- a/core/server/master/src/main/java/alluxio/master/metrics/MetricsMasterClientServiceHandler.java +++ b/core/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 index 0222886156b5..ae0a2f4576ab 100644 --- a/core/server/proxy/pom.xml +++ b/core/server/proxy/pom.xml @@ -74,6 +74,10 @@ org.glassfish.jersey.core jersey-server + + org.glassfish.jersey.inject + jersey-hk2 + org.glassfish.jersey.media diff --git a/core/server/worker/pom.xml b/core/server/worker/pom.xml index b592e9d58db4..08192deccdb4 100644 --- a/core/server/worker/pom.xml +++ b/core/server/worker/pom.xml @@ -74,6 +74,10 @@ org.glassfish.jersey.core jersey-server + + org.glassfish.jersey.inject + jersey-hk2 + diff --git a/core/transport/pom.xml b/core/transport/pom.xml index 93431fcfe3e4..e299774a8a9f 100644 --- a/core/transport/pom.xml +++ b/core/transport/pom.xml @@ -109,14 +109,14 @@ kr.motd.maven os-maven-plugin - 1.5.0.Final + 1.6.2 org.xolstice.maven.plugins protobuf-maven-plugin - 0.5.0 + 0.6.1 com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java diff --git a/job/server/pom.xml b/job/server/pom.xml index baaaa397909d..18c5daa4604a 100644 --- a/job/server/pom.xml +++ b/job/server/pom.xml @@ -50,12 +50,14 @@ org.glassfish.jersey.containers jersey-container-servlet-core - ${jersey.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider org.glassfish.jersey.media jersey-media-json-jackson - ${jersey.version} diff --git a/pom.xml b/pom.xml index ba45248b2035..550966f5fdd9 100644 --- a/pom.xml +++ b/pom.xml @@ -128,24 +128,22 @@ 1.11.215 build 1.2.14 - 2.7.0 2.3.13 - 1.0.7 1.27.0 4.1.42.Final + 5.15.10 2.7.3 - 2.6.0 0.8.5 1.8 - 2.22 - 9.2.16.v20160414 + 2.29.1 + 9.2.28.v20190418 4.12 1.2.17 3.3.9 3.1.2 4.2.0 1.6.2 - 0.3.0 + 0.8.0 27.0.1-jre 1.10.0 3.11.0 @@ -228,7 +226,7 @@ com.github.serceman jnr-fuse - 0.5.1 + 0.5.3 com.google.guava @@ -255,12 +253,12 @@ commons-cli commons-cli - 1.3.1 + 1.4 commons-codec commons-codec - 1.10 + 1.13 commons-httpclient @@ -270,7 +268,7 @@ commons-io commons-io - 2.4 + 2.6 commons-lang @@ -282,11 +280,6 @@ commons-logging 1.1.1 - - info.ganglia.gmetric4j - gmetric4j - ${gmetric4j.version} - io.dropwizard.metrics metrics-core @@ -321,11 +314,23 @@ io.grpc grpc-netty ${grpc.version} + + + io.netty + * + + io.grpc grpc-protobuf ${grpc.version} + + + com.google.api.grpc + proto-google-common-protos + + io.grpc @@ -585,11 +590,21 @@ jersey-server ${jersey.version} + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + org.glassfish.jersey.media jersey-media-json-jackson ${jersey.version} + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + org.gluster glusterfs-hadoop @@ -620,12 +635,12 @@ org.reflections reflections - 0.9.10 + 0.9.12 org.rocksdb rocksdbjni - 5.15.10 + ${rocksdb.version} org.slf4j @@ -655,6 +670,12 @@ junit ${junit.version} test + + + org.hamcrest + hamcrest-core + + org.apache.curator @@ -668,11 +689,10 @@ ${hadoop.version} test - org.hamcrest hamcrest - 2.1-rc4 + 2.2 test diff --git a/tests/src/test/java/alluxio/server/ft/MasterFaultToleranceIntegrationTest.java b/tests/src/test/java/alluxio/server/ft/MasterFaultToleranceIntegrationTest.java index 09fe1f252b05..88426fd79b6e 100644 --- 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;