This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 cb980a03af HDDS-10013. Clean up test dependencies (#5879)
cb980a03af is described below
commit cb980a03af5e8ffd27e3e72c3c1da4f0bf35716e
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 2 23:24:25 2024 +0100
HDDS-10013. Clean up test dependencies (#5879)
---
hadoop-hdds/client/pom.xml | 25 +-
hadoop-hdds/common/pom.xml | 81 +-
hadoop-hdds/config/pom.xml | 23 +-
hadoop-hdds/container-service/pom.xml | 54 +-
.../common/utils/TestStorageVolumeUtil.java | 2 +-
.../container/common/volume/TestDbVolume.java | 2 +-
hadoop-hdds/erasurecode/pom.xml | 8 +-
hadoop-hdds/framework/pom.xml | 40 +-
hadoop-hdds/hadoop-dependency-test/pom.xml | 30 +-
hadoop-hdds/pom.xml | 17 -
hadoop-hdds/rocks-native/pom.xml | 937 ++++++++++-----------
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 39 +-
hadoop-hdds/server-scm/pom.xml | 74 +-
hadoop-hdds/tools/pom.xml | 55 +-
hadoop-ozone/client/pom.xml | 36 +-
hadoop-ozone/common/pom.xml | 56 +-
.../fault-injection-test/mini-chaos-tests/pom.xml | 20 +-
hadoop-ozone/insight/pom.xml | 12 +-
hadoop-ozone/integration-test/pom.xml | 20 -
.../container/ozoneimpl/TestOzoneContainer.java | 2 -
hadoop-ozone/interface-storage/pom.xml | 5 +-
hadoop-ozone/ozone-manager/pom.xml | 97 +--
hadoop-ozone/ozonefs-common/pom.xml | 41 +-
hadoop-ozone/ozonefs-hadoop2/pom.xml | 15 +-
hadoop-ozone/ozonefs/pom.xml | 29 +-
hadoop-ozone/pom.xml | 7 -
hadoop-ozone/recon-codegen/pom.xml | 10 -
hadoop-ozone/recon/pom.xml | 76 +-
hadoop-ozone/s3-secret-store/pom.xml | 15 +-
hadoop-ozone/s3gateway/pom.xml | 29 +-
hadoop-ozone/tools/pom.xml | 26 +-
pom.xml | 93 +-
32 files changed, 797 insertions(+), 1179 deletions(-)
diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index 9eb214fd2a..f500faa7a7 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -36,41 +36,28 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependencies>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <artifactId>hdds-erasurecode</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-erasurecode</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index b1dc93d31f..b3cf683ec8 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -37,11 +37,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
@@ -86,11 +81,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -142,16 +132,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
@@ -165,31 +145,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
@@ -210,11 +165,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
@@ -224,10 +174,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-interface-admin</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <version>${io.grpc.version}</version>
+ <scope>compile</scope>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
@@ -235,10 +188,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<!-- Needed for mocking RaftServerImpl -->
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <version>${io.grpc.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index b3dc1e2415..e372c4b355 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/pom.xml
@@ -37,14 +37,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -52,18 +49,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/hadoop-hdds/container-service/pom.xml
b/hadoop-hdds/container-service/pom.xml
index 079847f7c4..058274e566 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -35,11 +35,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -48,12 +43,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
@@ -71,12 +60,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>metrics-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -88,26 +71,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>provided</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>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
@@ -132,17 +95,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/utils/TestStorageVolumeUtil.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/utils/TestStorageVolumeUtil.java
index 7b88ba3a31..0aa9267b06 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/utils/TestStorageVolumeUtil.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/utils/TestStorageVolumeUtil.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
/**
* Test for {@link StorageVolumeUtil}.
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestDbVolume.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestDbVolume.java
index aaa8632b8b..eb48e16c4b 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestDbVolume.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestDbVolume.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
/**
* Unit tests for {@link DbVolume}.
diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml
index b6ed54e221..a632c65254 100644
--- a/hadoop-hdds/erasurecode/pom.xml
+++ b/hadoop-hdds/erasurecode/pom.xml
@@ -34,11 +34,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 8697100440..c77684f877 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -42,11 +42,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -144,16 +139,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
@@ -164,6 +149,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
+ <version>${hdds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -171,19 +168,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
- <version>${hdds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml
b/hadoop-hdds/hadoop-dependency-test/pom.xml
index a2847c5d65..171ee878be 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -62,10 +62,38 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index d35392982a..a308158c40 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -208,16 +208,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
@@ -225,13 +215,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index c9480ccbb2..d3a015a18f 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -15,484 +15,477 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>hdds</artifactId>
- <groupId>org.apache.ozone</groupId>
- <version>1.5.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache Ozone HDDS RocksDB Tools</name>
- <artifactId>hdds-rocks-native</artifactId>
+ <parent>
+ <artifactId>hdds</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <name>Apache Ozone HDDS RocksDB Tools</name>
+ <artifactId>hdds-rocks-native</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-managed-rocksdb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <allow.junit4>false</allow.junit4>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-managed-rocksdb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <allow.junit4>false</allow.junit4>
- <build>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <configuration>
+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>cpu-count</id>
+ <activation>
+ <property>
+ <name>!system.numCores</name>
+ </property>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>get-cpu-count</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cpu-count</goal>
+ </goals>
<configuration>
-
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+ <cpuCount>system.numCores</cpuCount>
</configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- <profiles>
- <profile>
- <id>cpu-count</id>
- <activation>
- <property>
- <name>!system.numCores</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>get-cpu-count</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>cpu-count</goal>
- </goals>
- <configuration>
- <cpuCount>system.numCores</cpuCount>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>rocks_tools_native</id>
- <activation>
- <property>
- <name>rocks_tools_native</name>
- </property>
- </activation>
- <properties>
- <cmake.standards>20</cmake.standards>
- <sstDump.include>true</sstDump.include>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>rocksdb source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://github.com/facebook/rocksdb/archive/refs/tags/v${rocksdb.version}.tar.gz</url>
-
<outputFileName>rocksdb-v${rocksdb.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/rocksdb</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>zlib source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://zlib.net/fossils/zlib-${zlib.version}.tar.gz</url>
-
<outputFileName>zlib-${zlib.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/zlib</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>bzip2 source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://sourceware.org/pub/bzip2/bzip2-${bzip2.version}.tar.gz</url>
-
<outputFileName>bzip2-v${bzip2.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/bzip2</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>lz4 source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://github.com/lz4/lz4/archive/refs/tags/v${lz4.version}.tar.gz</url>
-
<outputFileName>lz4-v${lz4.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/lz4</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>snappy source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://github.com/google/snappy/archive/refs/tags/${snappy.version}.tar.gz</url>
-
<outputFileName>snappy-v${snappy.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/snappy</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>zstd source download</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://github.com/facebook/zstd/archive/refs/tags/v${zstd.version}.tar.gz</url>
-
<outputFileName>zstd-v${zstd.version}.tar.gz</outputFileName>
-
<outputDirectory>${project.build.directory}/zstd</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <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>
-
<targetDirectory>${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}</targetDirectory>
- </configuration>
- <executions>
- <execution>
- <id>patch</id>
- <phase>process-sources</phase>
- <goals>
- <goal>apply</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
- <executions>
- <execution>
- <id>unzip-artifact</id>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <untar
src="${project.build.directory}/rocksdb/rocksdb-v${rocksdb.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/rocksdb/" />
- <untar
src="${project.build.directory}/zlib/zlib-${zlib.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/zlib/" />
- <untar
src="${project.build.directory}/bzip2/bzip2-v${bzip2.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/bzip2/" />
- <untar
src="${project.build.directory}/lz4/lz4-v${lz4.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/lz4/" />
- <untar
src="${project.build.directory}/snappy/snappy-v${snappy.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/snappy/" />
- <untar
src="${project.build.directory}/zstd/zstd-v${zstd.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/zstd/" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-zlib</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <chmod
file="${project.build.directory}/zlib/zlib-${zlib.version}/configure"
perm="775" />
- <exec executable="./configure"
dir="${project.build.directory}/zlib/zlib-${zlib.version}" failonerror="true">
- <arg line="--static"/>
- <env key="CFLAGS" value="-fPIC"/>
- </exec>
- <exec executable="make"
dir="${project.build.directory}/zlib/zlib-${zlib.version}" failonerror="true"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-bzip2</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <exec executable="make"
dir="${project.build.directory}/bzip2/bzip2-${bzip2.version}"
failonerror="true">
- <arg line="CFLAGS='-fPIC'"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-lz4</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <exec executable="make"
dir="${project.build.directory}/lz4/lz4-${lz4.version}" failonerror="true">
- <arg line="CFLAGS='-fPIC'"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-zstd</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <exec executable="make"
dir="${project.build.directory}/zstd/zstd-${zstd.version}" failonerror="true">
- <arg line="CFLAGS='-fPIC'"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-snappy</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <mkdir
dir="${project.build.directory}/snappy/lib"/>
- <exec executable="cmake"
failonerror="true" dir="${project.build.directory}/snappy/lib">
- <arg
line="${project.build.directory}/snappy/snappy-${snappy.version}"/>
- <env key="CFLAGS" value="-fPIC"/>
- <env key="CXXFLAGS" value="-fPIC"/>
- </exec>
- <exec executable="make"
dir="${project.build.directory}/snappy/lib" failonerror="true"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-rocksjava</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <exec executable="chmod"
failonerror="true">
- <arg line="-R"/>
- <arg line="775"/>
- <arg
line="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
- </exec>
- <exec executable="make"
dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
failonerror="true">
- <arg line="DEBUG_LEVEL=0"/>
- <arg line="EXTRA_CXXFLAGS='-fPIC
-I${project.build.directory}/snappy/lib
-I${project.build.directory}/snappy/snappy-${snappy.version}
-I${project.build.directory}/lz4/lz4-${lz4.version}/lib
-I${project.build.directory}/zstd/zstd-${zstd.version}/lib
-I${project.build.directory}/zstd/zstd-${zstd.version}/lib/dictBuilder
-I${project.build.directory}/bzip2/bzip2-${bzip2.version}
-I${project.build.directory}/zlib/zlib-${zlib.version}'"/>
- <arg
line="EXTRA_LDFLAGS='-L${project.build.directory}/snappy/lib
-L${project.build.directory}/lz4/lz4-${lz4.version}/lib
-L${project.build.directory}/zstd/zstd-${zstd.version}/lib
-L${project.build.directory}/bzip2/bzip2-${bzip2.version}
-L${project.build.directory}/zlib/zlib-${zlib.version}'"/>
- <arg line="-j${system.numCores}"/>
- <arg line="tools"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>build-rocks-tools</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <mkdir
dir="${project.build.directory}/native/rocksdb"/>
- <exec executable="cmake"
failonerror="true" dir="${project.build.directory}/native/rocksdb">
- <env key="CFLAGS" value="-fPIC"/>
- <env key="CXXFLAGS" value="-fPIC"/>
- <arg line="${basedir}/src"/>
- <arg
line="-DGENERATED_JAVAH=${project.build.directory}/native/javah"/>
- <arg
line="-DNATIVE_DIR=${basedir}/src/main/native"/>
- <arg
line="-DSST_DUMP_INCLUDE=${sstDump.include}"/>
- <arg
line="-DCMAKE_STANDARDS=${cmake.standards}"/>
- <arg
line="-DROCKSDB_HEADERS=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}/include"/>
- <arg
line="-DROCKSDB_LIB=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
- <arg
line="-DZLIB_LIB=${project.build.directory}/zlib/zlib-${zlib.version}"/>
- <arg
line="-DBZIP2_LIB=${project.build.directory}/bzip2/bzip2-${bzip2.version}"/>
- <arg
line="-DLZ4_LIB=${project.build.directory}/lz4/lz4-${lz4.version}/lib"/>
- <arg
line="-DSNAPPY_LIB=${project.build.directory}/snappy/lib"/>
- <arg
line="-DZSTD_LIB=${project.build.directory}/zstd/zstd-${zstd.version}/lib"/>
- </exec>
- <exec executable="make"
dir="${project.build.directory}/native/rocksdb" failonerror="true"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>copy-lib-file</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <copy
toDir="${project.build.outputDirectory}">
- <fileset
dir="${project.build.directory}/native/rocksdb" includes="**/lib*.*" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- <configuration>
- <includes>
- <include>**/*.class</include>
- <include>**/lib*.dylib</include>
- <include>**/lib*.so</include>
- <include>**/lib*.jnilib</include>
- <include>**/lib*.dll</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <groups>native</groups>
- <argLine>${maven-surefire-plugin.argLine}
@{argLine}
-Djava.library.path=${project.build.directory}/native/rocksdb</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>java-8</id>
- <activation>
- <jdk>1.8</jdk>
- <property>
- <name>rocks_tools_native</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>native-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>javah</goal>
- </goals>
- <configuration>
-
<javahPath>${env.JAVA_HOME}/bin/javah</javahPath>
- <javahClassNames>
-
<javahClassName>org.apache.hadoop.hdds.utils.db.managed.ManagedSSTDumpTool</javahClassName>
-
<javahClassName>org.apache.hadoop.hdds.utils.db.managed.PipeInputStream</javahClassName>
- </javahClassNames>
-
<javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>java-11</id>
- <activation>
- <jdk>[11,]</jdk>
- <property>
- <name>rocks_tools_native</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-jars</id>
- <phase>process-sources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/dependency</outputDirectory>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </build>
+ </profile>
+ <profile>
+ <id>rocks_tools_native</id>
+ <activation>
+ <property>
+ <name>rocks_tools_native</name>
+ </property>
+ </activation>
+ <properties>
+ <cmake.standards>20</cmake.standards>
+ <sstDump.include>true</sstDump.include>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rocksdb source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/facebook/rocksdb/archive/refs/tags/v${rocksdb.version}.tar.gz</url>
+
<outputFileName>rocksdb-v${rocksdb.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/rocksdb</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>zlib source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://zlib.net/fossils/zlib-${zlib.version}.tar.gz</url>
+ <outputFileName>zlib-${zlib.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/zlib</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bzip2 source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://sourceware.org/pub/bzip2/bzip2-${bzip2.version}.tar.gz</url>
+
<outputFileName>bzip2-v${bzip2.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/bzip2</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>lz4 source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/lz4/lz4/archive/refs/tags/v${lz4.version}.tar.gz</url>
+ <outputFileName>lz4-v${lz4.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/lz4</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>snappy source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/google/snappy/archive/refs/tags/${snappy.version}.tar.gz</url>
+
<outputFileName>snappy-v${snappy.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/snappy</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>zstd source download</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/facebook/zstd/archive/refs/tags/v${zstd.version}.tar.gz</url>
+ <outputFileName>zstd-v${zstd.version}.tar.gz</outputFileName>
+
<outputDirectory>${project.build.directory}/zstd</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <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>
+
<targetDirectory>${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}</targetDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>patch</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>apply</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven-antrun-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>unzip-artifact</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <untar
src="${project.build.directory}/rocksdb/rocksdb-v${rocksdb.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/rocksdb/" />
+ <untar
src="${project.build.directory}/zlib/zlib-${zlib.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/zlib/" />
+ <untar
src="${project.build.directory}/bzip2/bzip2-v${bzip2.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/bzip2/" />
+ <untar
src="${project.build.directory}/lz4/lz4-v${lz4.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/lz4/" />
+ <untar
src="${project.build.directory}/snappy/snappy-v${snappy.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/snappy/" />
+ <untar
src="${project.build.directory}/zstd/zstd-v${zstd.version}.tar.gz"
compression="gzip" dest="${project.build.directory}/zstd/" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-zlib</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <chmod
file="${project.build.directory}/zlib/zlib-${zlib.version}/configure"
perm="775" />
+ <exec executable="./configure"
dir="${project.build.directory}/zlib/zlib-${zlib.version}" failonerror="true">
+ <arg line="--static"/>
+ <env key="CFLAGS" value="-fPIC"/>
+ </exec>
+ <exec executable="make"
dir="${project.build.directory}/zlib/zlib-${zlib.version}" failonerror="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-bzip2</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <exec executable="make"
dir="${project.build.directory}/bzip2/bzip2-${bzip2.version}"
failonerror="true">
+ <arg line="CFLAGS='-fPIC'"/>
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-lz4</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <exec executable="make"
dir="${project.build.directory}/lz4/lz4-${lz4.version}" failonerror="true">
+ <arg line="CFLAGS='-fPIC'"/>
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-zstd</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <exec executable="make"
dir="${project.build.directory}/zstd/zstd-${zstd.version}" failonerror="true">
+ <arg line="CFLAGS='-fPIC'"/>
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-snappy</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${project.build.directory}/snappy/lib"/>
+ <exec executable="cmake" failonerror="true"
dir="${project.build.directory}/snappy/lib">
+ <arg
line="${project.build.directory}/snappy/snappy-${snappy.version}"/>
+ <env key="CFLAGS" value="-fPIC"/>
+ <env key="CXXFLAGS" value="-fPIC"/>
+ </exec>
+ <exec executable="make"
dir="${project.build.directory}/snappy/lib" failonerror="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-rocksjava</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <exec executable="chmod" failonerror="true">
+ <arg line="-R"/>
+ <arg line="775"/>
+ <arg
line="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
+ </exec>
+ <exec executable="make"
dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
failonerror="true">
+ <arg line="DEBUG_LEVEL=0"/>
+ <arg line="EXTRA_CXXFLAGS='-fPIC
-I${project.build.directory}/snappy/lib
-I${project.build.directory}/snappy/snappy-${snappy.version}
-I${project.build.directory}/lz4/lz4-${lz4.version}/lib
-I${project.build.directory}/zstd/zstd-${zstd.version}/lib
-I${project.build.directory}/zstd/zstd-${zstd.version}/lib/dictBuilder
-I${project.build.directory}/bzip2/bzip2-${bzip2.version}
-I${project.build.directory}/zlib/zlib-${zlib.version}'"/>
+ <arg
line="EXTRA_LDFLAGS='-L${project.build.directory}/snappy/lib
-L${project.build.directory}/lz4/lz4-${lz4.version}/lib
-L${project.build.directory}/zstd/zstd-${zstd.version}/lib
-L${project.build.directory}/bzip2/bzip2-${bzip2.version}
-L${project.build.directory}/zlib/zlib-${zlib.version}'"/>
+ <arg line="-j${system.numCores}"/>
+ <arg line="tools"/>
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-rocks-tools</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${project.build.directory}/native/rocksdb"/>
+ <exec executable="cmake" failonerror="true"
dir="${project.build.directory}/native/rocksdb">
+ <env key="CFLAGS" value="-fPIC"/>
+ <env key="CXXFLAGS" value="-fPIC"/>
+ <arg line="${basedir}/src"/>
+ <arg
line="-DGENERATED_JAVAH=${project.build.directory}/native/javah"/>
+ <arg line="-DNATIVE_DIR=${basedir}/src/main/native"/>
+ <arg line="-DSST_DUMP_INCLUDE=${sstDump.include}"/>
+ <arg line="-DCMAKE_STANDARDS=${cmake.standards}"/>
+ <arg
line="-DROCKSDB_HEADERS=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}/include"/>
+ <arg
line="-DROCKSDB_LIB=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
+ <arg
line="-DZLIB_LIB=${project.build.directory}/zlib/zlib-${zlib.version}"/>
+ <arg
line="-DBZIP2_LIB=${project.build.directory}/bzip2/bzip2-${bzip2.version}"/>
+ <arg
line="-DLZ4_LIB=${project.build.directory}/lz4/lz4-${lz4.version}/lib"/>
+ <arg
line="-DSNAPPY_LIB=${project.build.directory}/snappy/lib"/>
+ <arg
line="-DZSTD_LIB=${project.build.directory}/zstd/zstd-${zstd.version}/lib"/>
+ </exec>
+ <exec executable="make"
dir="${project.build.directory}/native/rocksdb" failonerror="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-lib-file</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
+ <copy toDir="${project.build.outputDirectory}">
+ <fileset dir="${project.build.directory}/native/rocksdb"
includes="**/lib*.*" />
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ <configuration>
+ <includes>
+ <include>**/*.class</include>
+ <include>**/lib*.dylib</include>
+ <include>**/lib*.so</include>
+ <include>**/lib*.jnilib</include>
+ <include>**/lib*.dll</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <groups>native</groups>
+ <argLine>${maven-surefire-plugin.argLine} @{argLine}
-Djava.library.path=${project.build.directory}/native/rocksdb</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>java-8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ <property>
+ <name>rocks_tools_native</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>javah</goal>
+ </goals>
+ <configuration>
+ <javahPath>${env.JAVA_HOME}/bin/javah</javahPath>
+ <javahClassNames>
+
<javahClassName>org.apache.hadoop.hdds.utils.db.managed.ManagedSSTDumpTool</javahClassName>
+
<javahClassName>org.apache.hadoop.hdds.utils.db.managed.PipeInputStream</javahClassName>
+ </javahClassNames>
+
<javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>java-11</id>
+ <activation>
+ <jdk>[11,]</jdk>
+ <property>
+ <name>rocks_tools_native</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-jars</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/dependency</outputDirectory>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>javach</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
-
<executable>${env.JAVA_HOME}/bin/javac</executable>
- <arguments>
- <argument>-cp</argument>
-
<argument>${project.build.outputDirectory}:${project.build.directory}/dependency/*</argument>
- <argument>-h</argument>
-
<argument>${project.build.directory}/native/javah</argument>
-
<argument>${project.basedir}/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedSSTDumpTool.java</argument>
-
<argument>${project.basedir}/src/main/java/org/apache/hadoop/hdds/utils/db/managed/PipeInputStream.java</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javach</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>${env.JAVA_HOME}/bin/javac</executable>
+ <arguments>
+ <argument>-cp</argument>
+
<argument>${project.build.outputDirectory}:${project.build.directory}/dependency/*</argument>
+ <argument>-h</argument>
+
<argument>${project.build.directory}/native/javah</argument>
+
<argument>${project.basedir}/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedSSTDumpTool.java</argument>
+
<argument>${project.basedir}/src/main/java/org/apache/hadoop/hdds/utils/db/managed/PipeInputStream.java</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index 6da6933830..3d5967e9c0 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -46,6 +46,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-managed-rocksdb</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-rocks-native</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -55,31 +59,28 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
+ <groupId>org.jgrapht</groupId>
+ <artifactId>jgrapht-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <groupId>org.jgrapht</groupId>
+ <artifactId>jgrapht-ext</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -88,14 +89,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.jgrapht</groupId>
- <artifactId>jgrapht-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jgrapht</groupId>
- <artifactId>jgrapht-ext</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 03c62c34c1..b42262fbab 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -34,9 +34,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependencies>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -66,16 +66,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-docs</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -92,11 +91,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusions>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -104,63 +103,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 62e82751c8..665b56d3ab 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -34,21 +34,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- </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>
@@ -58,12 +46,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
<dependency>
<artifactId>ratis-tools</artifactId>
<groupId>org.apache.ratis</groupId>
@@ -91,11 +73,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -105,9 +82,33 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-scm</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index cc13893bc6..a5598311c4 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -32,52 +32,36 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-erasurecode</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <type>test-jar</type>
+ <artifactId>ozone-common</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-client</artifactId>
<type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index a5050a7ad7..813edcb7d7 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -33,16 +33,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</properties>
<dependencies>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-testing</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
@@ -50,41 +44,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>test</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -98,8 +67,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>ozone-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -108,13 +83,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index 95e417128e..fa6e0ae575 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -29,18 +29,14 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>mini-chaos-tests</artifactId>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -63,10 +59,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-integration-test</artifactId>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 4be02577e0..dcd03c04fa 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -40,11 +40,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-scm</artifactId>
@@ -81,11 +76,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/hadoop-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index e0211e95d8..1dd3e08258 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -124,21 +124,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
@@ -154,11 +139,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-kms</artifactId>
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index c055aaf106..3a94f3410d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -33,7 +33,6 @@ import
org.apache.hadoop.ozone.container.common.ContainerTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
import java.io.File;
import java.util.HashMap;
@@ -55,7 +54,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests ozone containers.
*/
-@EnableRuleMigrationSupport
@Timeout(300)
public class TestOzoneContainer {
diff --git a/hadoop-ozone/interface-storage/pom.xml
b/hadoop-ozone/interface-storage/pom.xml
index e3271730c2..3ab535852c 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -52,6 +52,7 @@
<artifactId>hdds-server-framework</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -66,12 +67,12 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index e6654c9986..8438dbbf2c 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -73,11 +73,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>ozone-interface-storage</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
@@ -95,55 +90,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <scope>runtime</scope>
- </dependency>
-
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.testing.compile</groupId>
- <artifactId>compile-testing</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -250,17 +200,42 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusions>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-rocks-native</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>com.google.testing.compile</groupId>
+ <artifactId>compile-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-scm</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
- </dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
diff --git a/hadoop-ozone/ozonefs-common/pom.xml
b/hadoop-ozone/ozonefs-common/pom.xml
index 7da0a9d2be..df52a3d29d 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/pom.xml
@@ -54,61 +54,36 @@
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>hdds-container-service</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <artifactId>hdds-server-framework</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock1.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>ozone-manager</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml
b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index 59c4fb71d1..ce56734811 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -97,21 +97,16 @@
<scope>provided</scope>
</dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- <type>test-jar</type>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index 528d096ae4..f5cda0414c 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/pom.xml
@@ -66,40 +66,19 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-common</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
+ <artifactId>ozone-filesystem-common</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito1-powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock1.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 654a46a57e..4b61b37bc4 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -26,8 +26,6 @@
<properties>
<docker.image>apache/ozone:${project.version}</docker.image>
- <spring.version>5.3.27</spring.version>
- <jooq.version>3.11.10</jooq.version>
</properties>
<modules>
<module>interface-client</module>
@@ -275,11 +273,6 @@
<type>test-jar</type>
<version>${hdds.version}</version>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
diff --git a/hadoop-ozone/recon-codegen/pom.xml
b/hadoop-ozone/recon-codegen/pom.xml
index 7fa96dc027..50c81ae657 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -39,28 +39,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jcl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen</artifactId>
- <version>${jooq.version}</version>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq-meta</artifactId>
- <version>${jooq.version}</version>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
- <version>${jooq.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 4985bb9937..f6226a44f3 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -235,11 +235,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<!-- visible only for ContainerOperationClient -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -295,65 +290,17 @@
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>jersey-server</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-core</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-servlet</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jersey-json</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
- <version>${jooq.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq-meta</artifactId>
- <version>${jooq.version}</version>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen</artifactId>
- <version>${jooq.version}</version>
</dependency>
<dependency>
<groupId>com.jolbox</groupId>
@@ -370,13 +317,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jcl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
@@ -386,14 +326,22 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/s3-secret-store/pom.xml
b/hadoop-ozone/s3-secret-store/pom.xml
index daec29702b..150937f220 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -49,19 +49,10 @@
<artifactId>vault-java-driver</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index a8e72a362f..9ad6fbab47 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -41,11 +41,6 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
@@ -140,11 +135,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-client</artifactId>
@@ -155,24 +145,21 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index c413d69118..839d01f0fa 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -37,11 +37,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-tools</artifactId>
@@ -101,29 +96,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 27d49fe9ee..d72832bc5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,11 +217,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<objenesis.version>1.0</objenesis.version>
<okhttp.version>2.7.5</okhttp.version>
<okio.version>3.6.0</okio.version>
- <mockito1-powermock.version>1.10.19</mockito1-powermock.version>
<mockito2.version>3.5.9</mockito2.version>
<hamcrest.version>1.3</hamcrest.version>
- <powermock1.version>1.6.5</powermock1.version>
- <powermock2.version>2.0.4</powermock2.version>
<jmockit.version>1.24</jmockit.version>
<junit4.version>4.13.1</junit4.version>
<junit5.version>5.10.1</junit5.version>
@@ -309,6 +306,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<zstd.version>1.4.9</zstd.version>
<jgrapht.version>1.0.1</jgrapht.version>
+ <spring.version>5.3.27</spring.version>
+ <jooq.version>3.11.10</jooq.version>
+
<vault.driver.version>5.1.0</vault.driver.version>
<native.lib.tmp.dir></native.lib.tmp.dir>
</properties>
@@ -1140,7 +1140,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${codahale-metrics.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
@@ -1161,6 +1160,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
@@ -1173,6 +1178,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jooq</groupId>
+ <artifactId>jooq</artifactId>
+ <version>${jooq.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jooq</groupId>
+ <artifactId>jooq-codegen</artifactId>
+ <version>${jooq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jooq</groupId>
+ <artifactId>jooq-meta</artifactId>
+ <version>${jooq.version}</version>
+ </dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
@@ -1231,6 +1257,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
@@ -1247,43 +1284,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<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>${jmockit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito1-powermock.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito2.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito2.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<version>${compile-testing.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
@@ -1422,11 +1442,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>${bouncycastle.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -1444,31 +1473,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-shaded</artifactId>
<version>${weld-servlet.version}</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.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -1558,7 +1568,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito2.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
