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 984027cc25 HDDS-12035. Enable sortpom in hdds-hadoop-dependency-server
and -test (#7659)
984027cc25 is described below
commit 984027cc250448418a253dc1f2ea3e8b596263de
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Wed Jan 8 02:05:10 2025 +0530
HDDS-12035. Enable sortpom in hdds-hadoop-dependency-server and -test
(#7659)
---
hadoop-hdds/erasurecode/pom.xml | 4 +-
hadoop-hdds/hadoop-dependency-client/pom.xml | 2 +-
hadoop-hdds/hadoop-dependency-server/pom.xml | 124 +++++++++++++--------------
hadoop-hdds/hadoop-dependency-test/pom.xml | 30 +++----
4 files changed, 76 insertions(+), 84 deletions(-)
diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml
index bb98efe189..b84b6e087c 100644
--- a/hadoop-hdds/erasurecode/pom.xml
+++ b/hadoop-hdds/erasurecode/pom.xml
@@ -38,13 +38,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml
b/hadoop-hdds/hadoop-dependency-client/pom.xml
index 276f693558..c05614456e 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -100,6 +100,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
+ <!-- commons-cli is required by OzoneFsShell -->
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -152,7 +153,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
- <!-- commons-cli is required by OzoneFsShell -->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml
b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 05923dab2c..324b21ef66 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/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,65 +21,68 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-hadoop-dependency-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Hadoop server dependencies
- </description>
- <name>Apache Ozone HDDS Hadoop Server dependencies</name>
<packaging>jar</packaging>
+ <name>Apache Ozone HDDS Hadoop Server dependencies</name>
+ <description>Apache Ozone Distributed Data Store Hadoop server
dependencies</description>
<properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module -->
- <sort.skip>true</sort.skip>
+ <!-- no tests in this module -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ </dependency>
+ <dependency>
+ <!-- commons-cli is required by DFSUtil.addPBProtocol -->
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>kerb-simplekdc</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.commons</groupId>
+ <groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
<exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.pjfanning</groupId>
@@ -93,32 +93,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>*</artifactId>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
+ <groupId>org.apache.commons</groupId>
<artifactId>*</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>*</artifactId>
@@ -132,34 +125,41 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- </dependency>
- <dependency>
- <!-- commons-cli is required by DFSUtil.addPBProtocol -->
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
<exclusions>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>*</artifactId>
@@ -168,17 +168,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.fusesource.leveldbjni</groupId>
- <artifactId>leveldbjni-all</artifactId>
- </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.fusesource.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml
b/hadoop-hdds/hadoop-dependency-test/pom.xml
index 5df30c7dfd..48bdff714f 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/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,17 +21,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Hadoop test dependencies
- </description>
- <name>Apache Ozone HDDS Hadoop Test dependencies</name>
<packaging>jar</packaging>
+ <name>Apache Ozone HDDS Hadoop Test dependencies</name>
+ <description>Apache Ozone Distributed Data Store Hadoop test
dependencies</description>
<properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module -->
- <sort.skip>true</sort.skip>
+ <!-- no tests in this module -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -59,14 +63,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
<dependency>
<groupId>org.assertj</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
