This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d9c7d1deed HDDS-12176. Trivial dependency cleanup.(#7787)
d9c7d1deed is described below
commit d9c7d1deedc9468578e10771873cf0ea246099b0
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Feb 1 19:14:05 2025 +0100
HDDS-12176. Trivial dependency cleanup.(#7787)
---
hadoop-hdds/common/pom.xml | 6 --
hadoop-hdds/framework/pom.xml | 2 -
hadoop-hdds/hadoop-dependency-client/pom.xml | 2 -
hadoop-hdds/hadoop-dependency-server/pom.xml | 4 -
hadoop-hdds/hadoop-dependency-test/pom.xml | 2 -
hadoop-hdds/interface-client/pom.xml | 3 +-
hadoop-hdds/interface-server/pom.xml | 3 +-
hadoop-hdds/pom.xml | 51 +++++++------
hadoop-hdds/rocks-native/pom.xml | 4 +-
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 2 +-
hadoop-hdds/server-scm/pom.xml | 1 -
hadoop-hdds/tools/pom.xml | 2 -
hadoop-ozone/csi/pom.xml | 3 +-
hadoop-ozone/datanode/pom.xml | 1 -
hadoop-ozone/dist/pom.xml | 2 +
.../fault-injection-test/network-tests/pom.xml | 1 +
hadoop-ozone/httpfsgateway/pom.xml | 4 -
hadoop-ozone/integration-test/pom.xml | 1 -
hadoop-ozone/interface-client/pom.xml | 2 +-
hadoop-ozone/ozone-manager/pom.xml | 9 ---
hadoop-ozone/pom.xml | 53 ++++++-------
hadoop-ozone/recon/pom.xml | 4 +-
hadoop-ozone/s3-secret-store/pom.xml | 2 -
hadoop-ozone/s3gateway/pom.xml | 1 -
pom.xml | 88 ++++++++++++++++++----
25 files changed, 138 insertions(+), 115 deletions(-)
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 35fe32713b..d9e5f6b965 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -54,12 +54,10 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -84,8 +82,6 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
- <version>${io.grpc.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -186,7 +182,6 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -333,7 +328,6 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
</extension>
</extensions>
</build>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index e90b655148..b2f5907cc6 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -170,7 +169,6 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>rocksdb-checkpoint-differ</artifactId>
- <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml
b/hadoop-hdds/hadoop-dependency-client/pom.xml
index 6c2964c094..e9682a374e 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
@@ -206,7 +205,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp</groupId>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml
b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 324b21ef66..8b32774678 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
@@ -78,7 +77,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
@@ -153,8 +151,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml
b/hadoop-hdds/hadoop-dependency-test/pom.xml
index 6a2b8aa4e0..7385085703 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
<type>test-jar</type>
<exclusions>
<exclusion>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
<type>test-jar</type>
<exclusions>
<exclusion>
diff --git a/hadoop-hdds/interface-client/pom.xml
b/hadoop-hdds/interface-client/pom.xml
index da6dec5cda..4ba24837e6 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -48,7 +48,6 @@
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
- <version>${ratis.thirdparty.version}</version>
</dependency>
</dependencies>
<build>
@@ -128,8 +127,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<goals>
diff --git a/hadoop-hdds/interface-server/pom.xml
b/hadoop-hdds/interface-server/pom.xml
index 83aa5f72e3..94e52f61a4 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <scope>compile</scope>
</dependency>
<!-- required to use common hdds.proto -->
<dependency>
@@ -108,8 +107,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<goals>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index a2cd95066a..fe42204ce7 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -68,6 +68,12 @@
<artifactId>hdds-common</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
@@ -78,6 +84,12 @@
<artifactId>hdds-container-service</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
@@ -98,6 +110,11 @@
<artifactId>hdds-hadoop-dependency-server</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <version>${hdds.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
@@ -125,56 +142,40 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- <version>${hdds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- <version>${hdds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>hdds-rocks-native</artifactId>
+ <version>${hdds.rocks.native.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
+ <artifactId>hdds-server-framework</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
<version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
<version>${hdds.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <artifactId>hdds-test-utils</artifactId>
<version>${hdds.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>hdds-tools</artifactId>
<version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
<version>${hdds.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 087dc8c023..47d94d60df 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -207,7 +207,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-plugin</artifactId>
- <version>1.1.1</version>
<configuration>
<patchFile>${basedir}/src/main/patches/rocks-native.patch</patchFile>
<strip>1</strip>
@@ -224,8 +223,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>unzip-artifact</id>
@@ -308,7 +307,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
<configuration>
<includes>
<include>**/*.class</include>
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index cb7ff3acd5..ea392b659c 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -101,7 +101,6 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -129,6 +128,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 27dafa29b2..140c77557d 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index cc47e325cf..3eef19f323 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -98,7 +98,6 @@
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-tools</artifactId>
- <version>${ratis.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.ratis</groupId>
@@ -117,7 +116,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 905ef0f4ad..4ff4764eb1 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -247,6 +246,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -283,7 +283,6 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
</extension>
</extensions>
</build>
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 1c6bef22fc..3decba7b5a 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index f8a9377807..deff11e068 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -151,6 +151,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -223,6 +224,7 @@
here. As the dependencies will be handled in a separated way with
separated classpath definitions-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
diff --git a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
index 7cebddbf09..6c34fa1fe2 100644
--- a/hadoop-ozone/fault-injection-test/network-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/network-tests/pom.xml
@@ -39,6 +39,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/hadoop-ozone/httpfsgateway/pom.xml
b/hadoop-ozone/httpfsgateway/pom.xml
index a0e15dba14..4bb4aa24b0 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -55,8 +55,6 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -215,7 +213,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
<configuration>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
</configuration>
@@ -276,7 +273,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>create-web-xmls</id>
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index de43a67329..3e332d6347 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -77,7 +77,6 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index cc8a4e2fee..383d22a414 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -134,8 +134,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<goals>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 31ae740c7e..3df66eb503 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -180,13 +180,10 @@
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-intg</artifactId>
- <version>${ranger.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-common</artifactId>
- <version>${ranger.version}</version>
- <scope>compile</scope>
<!-- Workaround to prevent slf4j binding conflicts until ranger-intg is
fixed to not introduce this to the classpath -->
<exclusions>
@@ -279,12 +276,10 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -294,12 +289,10 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>${jackson-jaxr.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
@@ -314,7 +307,6 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -467,7 +459,6 @@
<plugin>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>${aspectj-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index f70bbb32f6..620bc5f41e 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -63,11 +63,23 @@
<artifactId>hdds-client</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
@@ -104,6 +116,11 @@
<artifactId>hdds-hadoop-dependency-server</artifactId>
<version>${hdds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <version>${hdds.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
@@ -145,6 +162,11 @@
<version>${hdds.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <version>${hdds.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-tools</artifactId>
@@ -253,6 +275,11 @@
<artifactId>ozone-recon</artifactId>
<version>${ozone.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-reconcodegen</artifactId>
+ <version>${ozone.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-s3-secret-store</artifactId>
@@ -273,32 +300,6 @@
<artifactId>rocksdb-checkpoint-differ</artifactId>
<version>${hdds.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
- <version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <version>${hdds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <version>${hdds.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 87e75e934b..7006a5d7b7 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -182,7 +182,6 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-reconcodegen</artifactId>
- <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
@@ -405,7 +404,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend-maven-plugin.version}</version>
<configuration>
<npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
<installDirectory>target</installDirectory>
@@ -451,8 +449,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>${maven-clean-plugin.version}</version>
<configuration>
<filesets>
<fileset>
diff --git a/hadoop-ozone/s3-secret-store/pom.xml
b/hadoop-ozone/s3-secret-store/pom.xml
index decc23ba8a..d44d9e0cf3 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-manager</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 63e2135982..ef5440caf8 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -171,7 +171,6 @@
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/pom.xml b/pom.xml
index f4d6d14f32..55898f7d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
<joda.time.version>2.12.7</joda.time.version>
<jooq.version>3.11.10</jooq.version>
<jsch.version>0.1.55</jsch.version>
+ <json-simple.version>1.1.1</json-simple.version>
<jsp-api.version>2.1</jsp-api.version>
<jsr311-api.version>1.1.1</jsr311-api.version>
<junit5.version>5.11.4</junit5.version>
@@ -155,6 +156,7 @@
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
+ <maven-patch-plugin.version>1.1.1</maven-patch-plugin.version>
<maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
<maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
@@ -405,6 +407,11 @@
<artifactId>compile-testing</artifactId>
<version>${compile-testing.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
+ </dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
@@ -465,6 +472,11 @@
<artifactId>commons-daemon</artifactId>
<version>${commons-daemon.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons-fileupload.version}</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -762,6 +774,12 @@
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
@@ -778,6 +796,11 @@
<version>${hadoop.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
@@ -833,6 +856,16 @@
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ranger</groupId>
+ <artifactId>ranger-intg</artifactId>
+ <version>${ranger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ranger</groupId>
+ <artifactId>ranger-plugins-common</artifactId>
+ <version>${ranger.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
@@ -919,6 +952,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -939,6 +982,21 @@
<artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson-jaxr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
@@ -1020,7 +1078,6 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey2.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2</groupId>
@@ -1082,6 +1139,11 @@
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.core</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@@ -1216,18 +1278,6 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
- <dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.core</artifactId>
- <version>${jacoco.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -1259,6 +1309,11 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>dev.aspectj</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>${aspectj-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -1296,6 +1351,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven-clean-plugin.version}</version>
</plugin>
@@ -1307,6 +1363,11 @@
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-patch-plugin</artifactId>
+ <version>${maven-patch-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -1684,6 +1745,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
