This is an automated email from the ASF dual-hosted git repository.
shashikant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new a7a754b HDDS-3469. Add third party jar versions as properties in
pom.xml (#878)
a7a754b is described below
commit a7a754be06713d44ee6e3558f1523a2334f36226
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Apr 30 11:09:53 2020 +0200
HDDS-3469. Add third party jar versions as properties in pom.xml (#878)
---
hadoop-hdds/common/pom.xml | 14 --
hadoop-hdds/container-service/pom.xml | 22 +-
hadoop-hdds/docs/pom.xml | 1 -
hadoop-hdds/framework/pom.xml | 6 -
hadoop-hdds/pom.xml | 27 --
hadoop-hdds/server-scm/pom.xml | 6 +-
hadoop-hdds/test-utils/pom.xml | 1 -
hadoop-hdds/tools/pom.xml | 1 -
hadoop-ozone/common/pom.xml | 1 -
hadoop-ozone/dist/pom.xml | 3 -
.../fault-injection-test/network-tests/pom.xml | 1 -
hadoop-ozone/insight/pom.xml | 1 -
hadoop-ozone/integration-test/pom.xml | 1 +
hadoop-ozone/ozone-manager/pom.xml | 1 -
hadoop-ozone/ozonefs/pom.xml | 5 +-
hadoop-ozone/pom.xml | 20 --
hadoop-ozone/recon-codegen/pom.xml | 3 -
hadoop-ozone/recon/pom.xml | 43 +---
hadoop-ozone/s3gateway/pom.xml | 21 --
hadoop-ozone/tools/pom.xml | 4 -
pom.xml | 276 +++++++++++++++++++--
21 files changed, 269 insertions(+), 189 deletions(-)
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index f8c01ea..c95dd86 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -28,11 +28,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<name>Apache Hadoop HDDS Common</name>
<packaging>jar</packaging>
- <properties>
- <log4j2.version>2.11.0</log4j2.version>
- <disruptor.version>3.4.2</disruptor.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -41,7 +36,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
- <version>3.9.6</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -79,7 +73,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -116,7 +109,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.2.0</version>
<optional>true</optional>
</dependency>
@@ -149,18 +141,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/commons-validator/commons-validator -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.6</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -170,17 +159,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
- <version>${jaeger.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
- <version>0.33.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.16</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/hadoop-hdds/container-service/pom.xml
b/hadoop-hdds/container-service/pom.xml
index 653e2a9..8b24e6a 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -51,10 +51,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-server-framework</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdds-client</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdds-client</artifactId>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
@@ -69,23 +69,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.16</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>2.0.4</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -96,7 +93,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml
index cb600f2..4c16606 100644
--- a/hadoop-hdds/docs/pom.xml
+++ b/hadoop-hdds/docs/pom.xml
@@ -36,7 +36,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index a320423..0333d67 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -68,22 +68,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
- <version>6.6.4</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_dropwizard</artifactId>
- <version>0.7.0</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_common</artifactId>
- <version>0.7.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson2.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -98,7 +94,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp</groupId>
@@ -109,7 +104,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 659f316..f84556c 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -44,14 +44,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<module>test-utils</module>
</modules>
- <properties>
- <protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
- <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
-
- <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
-
- <junit.jupiter.version>5.3.1</junit.jupiter.version>
- </properties>
<repositories>
<repository>
<id>apache.snapshots.https</id>
@@ -164,18 +156,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-core</artifactId>
- <version>1.19</version>
- </dependency>
-
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-generator-annprocess</artifactId>
- <version>1.19</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto-shaded</artifactId>
<version>${ratis.version}</version>
@@ -216,13 +196,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 7c26fb6..dcbc42a 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -93,10 +93,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -115,13 +112,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <version>${mockito1-hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 24f4c6f..814584d 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -49,7 +49,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index e7eac57..f362a0b 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -69,7 +69,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.25.2</version>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index a875a60..7e696f5 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -145,7 +145,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.29.0</version>
<configuration>
<images>
<image>
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 8b2f3c3..b51fb3c 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -173,7 +173,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>copy-compose-files</id>
@@ -428,7 +427,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.29.0</version>
<executions>
<execution>
<goals>
@@ -460,7 +458,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.29.0</version>
<executions>
<execution>
<goals>
diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
index b361e55..49c5098 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
@@ -31,7 +31,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>copy-resources</id>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 10575dd..f401750 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -78,7 +78,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>3.2.4</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index 799b7bf..17e42ea 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -110,6 +110,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <version>${mockito1-hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 9a619c6..9f02e79 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -95,7 +95,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>1.24</version>
<scope>test</scope>
</dependency>
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index d7831d0..8cc2434 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
+ <version>${mockito1-powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -145,13 +145,12 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.6.5</version>
+ <version>${powermock1.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.6.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 947462e..5daddbc 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -207,26 +207,6 @@
<version>${hdds.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
diff --git a/hadoop-ozone/recon-codegen/pom.xml
b/hadoop-ozone/recon-codegen/pom.xml
index c26825a..7595089 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -31,12 +31,10 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.25.2</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
- <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -61,7 +59,6 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>${guice.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index d0a3889..159ea1a 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -87,7 +86,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.6</version>
<configuration>
<installDirectory>target</installDirectory>
<workingDirectory>${basedir}/src/main/resources/webapps/recon/ozone-recon-web</workingDirectory>
@@ -220,68 +218,38 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assistedinject</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
- <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
- <version>2.27</version>
- <exclusions>
- <exclusion>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-api</artifactId>
- </exclusion>
- </exclusions>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.27</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>guice-bridge</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>2.27</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>2.27</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-assistedinject</artifactId>
- <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
- <version>2.27</version>
- <exclusions>
- <exclusion>
- <artifactId>hk2-api</artifactId>
- <groupId>org.glassfish.hk2</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-utils</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -334,12 +302,10 @@
<dependency>
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
- <version>0.8.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.25.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -349,7 +315,6 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index d0a9e50..80bd34f 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -48,51 +48,30 @@
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
- <version>2.4.7.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.27</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>jersey-cdi1x</artifactId>
- <version>2.27</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
- <version>2.27</version>
- <exclusions>
- <exclusion>
- <artifactId>hk2-api</artifactId>
- <groupId>org.glassfish.hk2</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hk2-utils</artifactId>
- <groupId>org.glassfish.hk2</groupId>
- </exclusion>
- <exclusion>
- <artifactId>aopalliance-repackaged</artifactId>
- <groupId>org.glassfish.hk2.external</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>2.9.0</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 5e52635..7fb0833 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -86,13 +86,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.19</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.19</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -102,12 +100,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
- <version>1.11.615</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
- <version>1.11.615</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
diff --git a/pom.xml b/pom.xml
index 50a2f23..48ed6eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,12 +122,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<!-- jersey version -->
<jersey.version>1.19</jersey.version>
+ <jersey2.version>2.27</jersey2.version>
<!-- jackson versions -->
<jackson2.version>2.10.3</jackson2.version>
<!-- jaegertracing veresion -->
<jaeger.version>1.2.0</jaeger.version>
+ <opentracing.version>0.33.0</opentracing.version>
+
+ <jmh.version>1.19</jmh.version>
+ <hk2.version>2.5.0</hk2.version>
<!-- httpcomponents versions -->
<httpclient.version>4.5.2</httpclient.version>
@@ -136,6 +141,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<!-- SLF4J/LOG4J version -->
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.11.0</log4j2.version>
+ <disruptor.version>3.4.2</disruptor.version>
+
+ <prometheus.version>0.7.0</prometheus.version>
<!-- com.google.re2j version -->
<re2j.version>1.1</re2j.version>
@@ -162,7 +171,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<hikari.version>2.4.12</hikari.version>
<mssql.version>6.2.1.jre7</mssql.version>
<okhttp.version>2.7.5</okhttp.version>
- <mockito-core.version>2.28.2</mockito-core.version>
+ <mockito1-hadoop.version>1.8.5</mockito1-hadoop.version>
+ <mockito1-powermock.version>1.10.19</mockito1-powermock.version>
+ <mockito2.version>2.28.2</mockito2.version>
+ <hamcrest.version>1.3</hamcrest.version>
+ <powermock1.version>1.6.5</powermock1.version>
+ <powermock2.version>2.0.4</powermock2.version>
+ <junit.jupiter.version>5.3.1</junit.jupiter.version>
<!-- Maven protoc compiler -->
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
@@ -192,7 +207,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
- <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
+ <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-shade-plugin.version>3.2.0</maven-shade-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
@@ -212,9 +227,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<checkstyle.version>8.19</checkstyle.version>
<surefire.fork.timeout>900</surefire.fork.timeout>
- <aws-java-sdk.version>1.11.375</aws-java-sdk.version>
+ <aws-java-sdk.version>1.11.615</aws-java-sdk.version>
<hsqldb.version>2.3.4</hsqldb.version>
- <frontend-maven-plugin.version>1.5</frontend-maven-plugin.version>
+ <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<!-- the version of Hadoop declared in the version resources; can be
overridden
so that Hadoop 3.x can declare itself a 2.x artifact. -->
<declared.hadoop.version>${hadoop.version}</declared.hadoop.version>
@@ -239,6 +254,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ <version>3.9.6</version>
+ </dependency>
+ <dependency>
<groupId>jdiff</groupId>
<artifactId>jdiff</artifactId>
<version>${jdiff.version}</version>
@@ -644,12 +664,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.19</version>
+ <version>${jmh.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.19</version>
+ <version>${jmh.version}</version>
</dependency>
@@ -716,6 +736,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>3.6</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
@@ -766,6 +811,67 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>javax.servlet</artifactId>
<version>3.1</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>guice-bridge</artifactId>
+ <version>${hk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
+ <version>${hk2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>${jersey2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet-core</artifactId>
+ <version>${jersey2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.ext.cdi</groupId>
+ <artifactId>jersey-cdi1x</artifactId>
+ <version>${jersey2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
+ <version>${jersey2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>aopalliance-repackaged</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-jackson</artifactId>
+ <version>${jersey2.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -816,22 +922,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.2.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>
-
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>3.2.0</version>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>${guice.version}</version>
</dependency>
-
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>${guice.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.jolbox</groupId>
+ <artifactId>bonecp</artifactId>
+ <version>0.8.0.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>3.2.0</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
@@ -925,7 +1052,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
@@ -975,14 +1102,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-bundle</artifactId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>${aws-java-sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
@@ -1015,6 +1141,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>4.11</version>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
@@ -1101,14 +1233,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>${jackson2.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <version>1.24</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
+ <version>${mockito2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1179,6 +1334,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>3.2.4</version>
</dependency>
<dependency>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-client</artifactId>
+ <version>${jaeger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>${opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_dropwizard</artifactId>
+ <version>${prometheus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_common</artifactId>
+ <version>${prometheus.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-sls</artifactId>
<version>${hadoop.version}</version>
@@ -1206,9 +1381,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>${findbugs.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0.1</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@ -1377,10 +1562,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>2.4.7.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>1.0.13</version>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock1.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>${powermock2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ <version>6.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.25.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1388,6 +1606,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>${frontend-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
@@ -1557,6 +1780,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
</plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.29.0</version>
+ </plugin>
</plugins>
</pluginManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
