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 67fdb88b95 HDDS-12068. Enable sortpom in remaining hdds modules (#7686)
67fdb88b95 is described below
commit 67fdb88b95050feea654a00649c54d014331b691
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sun Jan 12 09:47:55 2025 +0100
HDDS-12068. Enable sortpom in remaining hdds modules (#7686)
---
hadoop-hdds/managed-rocksdb/pom.xml | 32 ++---
hadoop-hdds/rocks-native/pom.xml | 125 ++++++++--------
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 70 ++++-----
hadoop-hdds/server-scm/pom.xml | 196 ++++++++++++--------------
hadoop-hdds/test-utils/pom.xml | 47 +++---
hadoop-hdds/tools/pom.xml | 124 ++++++++--------
6 files changed, 267 insertions(+), 327 deletions(-)
diff --git a/hadoop-hdds/managed-rocksdb/pom.xml
b/hadoop-hdds/managed-rocksdb/pom.xml
index 144d482be1..82b58b5a4d 100644
--- a/hadoop-hdds/managed-rocksdb/pom.xml
+++ b/hadoop-hdds/managed-rocksdb/pom.xml
@@ -12,9 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -23,26 +21,32 @@
</parent>
<artifactId>hdds-managed-rocksdb</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Managed RocksDB library</description>
- <name>Apache Ozone HDDS Managed RocksDB</name>
<packaging>jar</packaging>
+ <name>Apache Ozone HDDS Managed RocksDB</name>
+ <description>Apache Ozone Managed RocksDB library</description>
<properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
- <sort.skip>true</sort.skip>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
@@ -51,16 +55,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index c01a4f1665..087dc8c023 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -12,23 +12,25 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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";>
+<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";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>hdds</artifactId>
<groupId>org.apache.ozone</groupId>
+ <artifactId>hdds</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache Ozone HDDS RocksDB Tools</name>
<artifactId>hdds-rocks-native</artifactId>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone HDDS RocksDB Tools</name>
<dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -37,12 +39,6 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-managed-rocksdb</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
@@ -56,11 +52,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -108,10 +99,10 @@
<executions>
<execution>
<id>get-cpu-count</id>
- <phase>generate-sources</phase>
<goals>
<goal>cpu-count</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
<cpuCount>system.numCores</cpuCount>
</configuration>
@@ -140,10 +131,10 @@
<executions>
<execution>
<id>set-property</id>
- <phase>initialize</phase>
<goals>
<goal>java</goal>
</goals>
+ <phase>initialize</phase>
<configuration>
<mainClass>org.apache.hadoop.hdds.utils.db.managed.JniLibNamePropertyWriter</mainClass>
<arguments>
@@ -159,10 +150,10 @@
<executions>
<execution>
<id>read-property-from-file</id>
- <phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
+ <phase>initialize</phase>
<configuration>
<files>
<file>${project.build.directory}/propertyFile.txt</file>
@@ -177,10 +168,10 @@
<executions>
<execution>
<id>unpack-dependency</id>
- <phase>initialize</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>initialize</phase>
<configuration>
<artifactItems>
<artifactItem>
@@ -201,10 +192,10 @@
<executions>
<execution>
<id>rocksdb source download</id>
- <phase>generate-sources</phase>
<goals>
<goal>wget</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
<url>https://github.com/facebook/rocksdb/archive/refs/tags/v${rocksdb.version}.tar.gz</url>
<outputFileName>rocksdb-v${rocksdb.version}.tar.gz</outputFileName>
@@ -225,10 +216,10 @@
<executions>
<execution>
<id>patch</id>
- <phase>process-sources</phase>
<goals>
<goal>apply</goal>
</goals>
+ <phase>process-sources</phase>
</execution>
</executions>
</plugin>
@@ -238,70 +229,71 @@
<executions>
<execution>
<id>unzip-artifact</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<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 compression="gzip"
dest="${project.build.directory}/rocksdb/"
src="${project.build.directory}/rocksdb/rocksdb-v${rocksdb.version}.tar.gz" />
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
<execution>
<id>build-rocksjava</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<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}"/>
+ <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="PORTABLE=1"/>
- <arg line="DEBUG_LEVEL=0"/>
- <arg line="EXTRA_CXXFLAGS='-fPIC
-D_GLIBCXX_USE_CXX11_ABI=0'"/>
- <arg line="-j${system.numCores}"/>
- <arg line="tools_lib"/>
+ <exec
dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
executable="make" failonerror="true">
+ <arg line="PORTABLE=1" />
+ <arg line="DEBUG_LEVEL=0" />
+ <arg line="EXTRA_CXXFLAGS='-fPIC
-D_GLIBCXX_USE_CXX11_ABI=0'" />
+ <arg line="-j${system.numCores}" />
+ <arg line="tools_lib" />
</exec>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
<execution>
<id>build-rocks-tools</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>process-classes</phase>
<configuration>
<target>
- <mkdir dir="${project.build.directory}/native/rocksdb"/>
- <copy
file="${project.build.directory}/rocksdbjni/${rocksdbLibName}"
-
tofile="${project.build.directory}/native/rocksdb/${rocksdbLibName}" />
- <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_TOOLS_LIB=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"/>
- <arg
line="-DROCKSDB_LIB=${project.build.directory}/native/rocksdb/${rocksdbLibName}"/>
+ <mkdir dir="${project.build.directory}/native/rocksdb" />
+ <copy
file="${project.build.directory}/rocksdbjni/${rocksdbLibName}"
tofile="${project.build.directory}/native/rocksdb/${rocksdbLibName}" />
+ <exec dir="${project.build.directory}/native/rocksdb"
executable="cmake" failonerror="true">
+ <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_TOOLS_LIB=${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
/>
+ <arg
line="-DROCKSDB_LIB=${project.build.directory}/native/rocksdb/${rocksdbLibName}"
/>
</exec>
- <exec executable="make"
dir="${project.build.directory}/native/rocksdb" failonerror="true"/>
- <delete
dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
- includeemptydirs="true"/>
+ <exec dir="${project.build.directory}/native/rocksdb"
executable="make" failonerror="true" />
+ <delete
dir="${project.build.directory}/rocksdb/rocksdb-${rocksdb.version}"
includeemptydirs="true" />
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
<execution>
<id>copy-lib-file</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>process-classes</phase>
<configuration>
<target>
@@ -310,9 +302,6 @@
</copy>
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
@@ -356,10 +345,10 @@
<artifactId>native-maven-plugin</artifactId>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>javah</goal>
</goals>
+ <phase>compile</phase>
<configuration>
<javahPath>${env.JAVA_HOME}/bin/javah</javahPath>
<javahClassNames>
@@ -390,10 +379,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>process-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>process-sources</phase>
<configuration>
<outputDirectory>${project.build.directory}/dependency</outputDirectory>
<includeScope>runtime</includeScope>
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index fc8cf91061..cb7ff3acd5 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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
-https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -25,18 +22,30 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>rocksdb-checkpoint-differ</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>RocksDB Checkpoint Differ</description>
- <name>RocksDB Checkpoint Differ</name>
<packaging>jar</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>RocksDB Checkpoint Differ</name>
+ <description>RocksDB Checkpoint Differ</description>
<dependencies>
<dependency>
- <groupId>org.rocksdb</groupId>
- <artifactId>rocksdbjni</artifactId>
+ <groupId>com.github.vlsi.mxgraph</groupId>
+ <artifactId>jgraphx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -58,15 +67,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
@@ -79,6 +79,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-ext</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -88,20 +92,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.vlsi.mxgraph</groupId>
- <artifactId>jgraphx</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -110,15 +100,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <artifactId>hdds-rocks-native</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
- <version>${project.version}</version>
+ <artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
</dependencies>
@@ -143,7 +133,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<executions>
<execution>
<id>depcheck</id>
- <phase></phase>
+ <phase />
</execution>
</executions>
</plugin>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index a1da1f4e68..4137f443c7 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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
-https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -24,38 +21,97 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-server-scm</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Storage Container Manager
Server</description>
- <name>Apache Ozone HDDS SCM Server</name>
<packaging>jar</packaging>
+ <name>Apache Ozone HDDS SCM Server</name>
+ <description>Apache Ozone Distributed Data Store Storage Container Manager
Server</description>
<properties>
<classpath.skip>false</classpath.skip>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <artifactId>hdds-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-config</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <artifactId>hdds-container-service</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -77,13 +133,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
@@ -106,17 +155,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server-api</artifactId>
+ <artifactId>ratis-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server</artifactId>
+ <artifactId>ratis-server-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
@@ -125,35 +173,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>okhttp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
@@ -162,44 +181,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
-
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-docs</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
@@ -216,14 +201,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <artifactId>hdds-container-service</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -232,6 +217,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/../../hdds/common/src/main/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +253,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>ban-annotations</id> <!-- override default restriction from
root POM -->
+ <id>ban-annotations</id>
+ <!-- override default restriction from root POM -->
<configuration>
<rules>
<restrictImports>
@@ -281,24 +275,22 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<executions>
<execution>
<id>copy-common-html</id>
- <phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
- <outputDirectory>${project.build.outputDirectory}
- </outputDirectory>
+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<includes>webapps/static/**/*.*</includes>
</artifactItem>
<artifactItem>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
- <outputDirectory>${project.build.outputDirectory}/webapps/scm
- </outputDirectory>
+
<outputDirectory>${project.build.outputDirectory}/webapps/scm</outputDirectory>
<includes>docs/**/*.*</includes>
</artifactItem>
</artifactItems>
@@ -315,13 +307,5 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</configuration>
</plugin>
</plugins>
- <testResources>
- <testResource>
- <directory>${basedir}/../../hdds/common/src/main/resources</directory>
- </testResource>
- <testResource>
- <directory>${basedir}/src/test/resources</directory>
- </testResource>
- </testResources>
</build>
</project>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 903f01c826..0c4d559819 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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
-https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -24,18 +21,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-test-utils</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Test Utils</description>
- <name>Apache Ozone HDDS Test Utils</name>
<packaging>jar</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone HDDS Test Utils</name>
+ <description>Apache Ozone Distributed Data Store Test Utils</description>
<dependencies>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -50,25 +43,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -85,10 +77,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -99,6 +87,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>org.jacoco.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 8af514f65b..6a7dd1e970 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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
-https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -25,15 +22,55 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-tools</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Tools</description>
- <name>Apache Ozone HDDS Tools</name>
<packaging>jar</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone HDDS Tools</name>
+ <description>Apache Ozone Distributed Data Store Tools</description>
<dependencies>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -60,20 +97,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
</dependency>
<dependency>
- <artifactId>ratis-tools</artifactId>
<groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-tools</artifactId>
<version>${ratis.version}</version>
<exclusions>
<exclusion>
@@ -82,22 +114,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </dependency>
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
</dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -108,39 +128,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Test dependencies -->
@@ -153,8 +147,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -166,11 +160,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -202,7 +191,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>ban-annotations</id> <!-- override default restriction from
root POM -->
+ <id>ban-annotations</id>
+ <!-- override default restriction from root POM -->
<configuration>
<rules>
<restrictImports>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
