This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9b5cedd0f9 HDDS-11951. Enable sortpom in hadoop-hdds sub-modules :
annotations, client, common & config. (#7631)
9b5cedd0f9 is described below
commit 9b5cedd0f9141a653f95de9b9f381c819441ade5
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Thu Jan 2 22:40:50 2025 +0530
HDDS-11951. Enable sortpom in hadoop-hdds sub-modules : annotations,
client, common & config. (#7631)
---
hadoop-hdds/annotations/pom.xml | 15 +-
hadoop-hdds/client/pom.xml | 63 ++++----
hadoop-hdds/common/pom.xml | 214 +++++++++++++-------------
hadoop-hdds/config/pom.xml | 12 +-
hadoop-hdds/container-service/pom.xml | 1 +
hadoop-hdds/crypto-api/pom.xml | 1 +
hadoop-hdds/crypto-default/pom.xml | 1 +
hadoop-hdds/docs/pom.xml | 1 +
hadoop-hdds/erasurecode/pom.xml | 1 +
hadoop-hdds/framework/pom.xml | 1 +
hadoop-hdds/hadoop-dependency-client/pom.xml | 1 +
hadoop-hdds/hadoop-dependency-server/pom.xml | 1 +
hadoop-hdds/hadoop-dependency-test/pom.xml | 1 +
hadoop-hdds/interface-admin/pom.xml | 1 +
hadoop-hdds/interface-client/pom.xml | 1 +
hadoop-hdds/interface-server/pom.xml | 1 +
hadoop-hdds/managed-rocksdb/pom.xml | 1 +
hadoop-hdds/pom.xml | 98 ++++++------
hadoop-hdds/rocks-native/pom.xml | 4 +
hadoop-hdds/rocksdb-checkpoint-differ/pom.xml | 1 +
hadoop-hdds/server-scm/pom.xml | 1 +
hadoop-hdds/test-utils/pom.xml | 2 +-
hadoop-hdds/tools/pom.xml | 1 +
23 files changed, 208 insertions(+), 216 deletions(-)
diff --git a/hadoop-hdds/annotations/pom.xml b/hadoop-hdds/annotations/pom.xml
index 0a96108704..e9a628f9a7 100644
--- a/hadoop-hdds/annotations/pom.xml
+++ b/hadoop-hdds/annotations/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,14 +22,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-annotation-processing</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone annotation processing tools for validating custom
- annotations at compile time.
- </description>
- <name>Apache Ozone Annotation Processing</name>
<packaging>jar</packaging>
+ <name>Apache Ozone Annotation Processing</name>
+ <description>Apache Ozone annotation processing tools for validating custom
+ annotations at compile time.</description>
<properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
+ <maven.test.skip>true</maven.test.skip>
+ <!-- no tests in this module so far -->
</properties>
<build>
diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index 333b960fc2..e32457ec79 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/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,14 +22,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds-client</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Client Library</description>
- <name>Apache Ozone HDDS Client</name>
<packaging>jar</packaging>
-
- <properties>
- </properties>
+ <name>Apache Ozone HDDS Client</name>
+ <description>Apache Ozone Distributed Data Store Client Library</description>
<dependencies>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -49,11 +67,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
@@ -80,25 +93,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -148,7 +142,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>
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index f2576f7cf0..e1cf736f6d 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/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,45 +21,45 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-common</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Common</description>
- <name>Apache Ozone HDDS Common</name>
<packaging>jar</packaging>
-
- <properties>
- </properties>
+ <name>Apache Ozone HDDS Common</name>
+ <description>Apache Ozone Distributed Data Store Common</description>
<dependencies>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-client</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
+ <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.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <scope>compile</scope>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>compile</scope>
</dependency>
- <!-- for the annotations in OzoneConfiguration -->
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -73,33 +70,45 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
</dependency>
+
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <version>${io.grpc.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-annotation-processing</artifactId>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-core</artifactId>
</dependency>
-
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
@@ -111,17 +120,49 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-annotation-processing</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-admin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-client</artifactId>
</dependency>
<dependency>
- <artifactId>ratis-server-api</artifactId>
<groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<dependency>
- <artifactId>ratis-metrics-dropwizard3</artifactId>
<groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-grpc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-metrics-dropwizard3</artifactId>
<exclusions>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
@@ -129,37 +170,23 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
- </dependency>
- <dependency>
<artifactId>ratis-netty</artifactId>
- <groupId>org.apache.ratis</groupId>
- </dependency>
- <dependency>
- <artifactId>ratis-grpc</artifactId>
- <groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-client</artifactId>
+ <artifactId>ratis-server-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -174,34 +201,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
</dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>io.jaegertracing</groupId>
- <artifactId>jaeger-client</artifactId>
- </dependency>
- <dependency>
- <groupId>io.jaegertracing</groupId>
- <artifactId>jaeger-core</artifactId>
- </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -211,24 +214,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-admin</artifactId>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
</dependency>
+ <!-- for the annotations in OzoneConfiguration -->
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <version>${io.grpc.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
@@ -258,27 +251,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<build>
<resources>
<resource>
+ <filtering>false</filtering>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>hdds-version-info.properties</exclude>
</excludes>
- <filtering>false</filtering>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>hdds-version-info.properties</include>
</includes>
- <filtering>true</filtering>
</resource>
</resources>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.apache.hadoop</groupId>
@@ -286,10 +272,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<executions>
<execution>
<id>version-info</id>
- <phase>generate-resources</phase>
<goals>
<goal>version-info</goal>
</goals>
+ <phase>generate-resources</phase>
<configuration>
<source>
<directory>${basedir}/../</directory>
@@ -330,7 +316,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>
@@ -347,5 +334,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</executions>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>${os-maven-plugin.version}</version>
+ </extension>
+ </extensions>
</build>
</project>
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index 60c63475ae..5809828ecc 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/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,12 +21,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-config</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Config Tools</description>
- <name>Apache Ozone HDDS Config</name>
<packaging>jar</packaging>
-
- <properties>
- </properties>
+ <name>Apache Ozone HDDS Config</name>
+ <description>Apache Ozone Distributed Data Store Config Tools</description>
<dependencies>
<dependency>
diff --git a/hadoop-hdds/container-service/pom.xml
b/hadoop-hdds/container-service/pom.xml
index c21ca8203b..29a8f92fc8 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -28,6 +28,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<name>Apache Ozone HDDS Container Service</name>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
<dependency>
diff --git a/hadoop-hdds/crypto-api/pom.xml b/hadoop-hdds/crypto-api/pom.xml
index ca54b3de9f..3a28384278 100644
--- a/hadoop-hdds/crypto-api/pom.xml
+++ b/hadoop-hdds/crypto-api/pom.xml
@@ -29,6 +29,7 @@
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module
so far -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/crypto-default/pom.xml
b/hadoop-hdds/crypto-default/pom.xml
index 6024c3e2dd..f9653145e4 100644
--- a/hadoop-hdds/crypto-default/pom.xml
+++ b/hadoop-hdds/crypto-default/pom.xml
@@ -29,6 +29,7 @@
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module
so far -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml
index 7f4ffbb8a7..e8261c39cb 100644
--- a/hadoop-hdds/docs/pom.xml
+++ b/hadoop-hdds/docs/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this
module -->
<skipDocs>false</skipDocs>
+ <sort.skip>true</sort.skip>
</properties>
<build>
diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml
index b540d1c68e..5f34b7b729 100644
--- a/hadoop-hdds/erasurecode/pom.xml
+++ b/hadoop-hdds/erasurecode/pom.xml
@@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 37d41cde39..af233cbae9 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml
b/hadoop-hdds/hadoop-dependency-client/pom.xml
index 7676f1f45f..5bb9b13868 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml
b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 6be31002b0..05923dab2c 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml
b/hadoop-hdds/hadoop-dependency-test/pom.xml
index f04e45a034..5df30c7dfd 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/interface-admin/pom.xml
b/hadoop-hdds/interface-admin/pom.xml
index f3197dc896..9412242308 100644
--- a/hadoop-hdds/interface-admin/pom.xml
+++ b/hadoop-hdds/interface-admin/pom.xml
@@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this
module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this
module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/interface-client/pom.xml
b/hadoop-hdds/interface-client/pom.xml
index 1a61dfa930..b373d11d50 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this
module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this
module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/interface-server/pom.xml
b/hadoop-hdds/interface-server/pom.xml
index 47bde5a0bc..539a0a5430 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this
module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this
module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/managed-rocksdb/pom.xml
b/hadoop-hdds/managed-rocksdb/pom.xml
index 40ad920647..144d482be1 100644
--- a/hadoop-hdds/managed-rocksdb/pom.xml
+++ b/hadoop-hdds/managed-rocksdb/pom.xml
@@ -29,6 +29,7 @@
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index b3aa6ff695..7e4fbd32db 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/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,157 +22,144 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>hdds</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Project</description>
- <name>Apache Ozone HDDS</name>
<packaging>pom</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone HDDS</name>
+ <description>Apache Ozone Distributed Data Store Project</description>
<modules>
<module>annotations</module>
- <module>hadoop-dependency-client</module>
- <module>hadoop-dependency-test</module>
- <module>hadoop-dependency-server</module>
- <module>interface-client</module>
- <module>interface-admin</module>
- <module>interface-server</module>
<module>client</module>
<module>common</module>
+ <module>config</module>
+ <module>container-service</module>
<module>crypto-api</module>
<module>crypto-default</module>
+ <module>docs</module>
+ <module>erasurecode</module>
<module>framework</module>
+ <module>hadoop-dependency-client</module>
+ <module>hadoop-dependency-server</module>
+ <module>hadoop-dependency-test</module>
+ <module>interface-admin</module>
+ <module>interface-client</module>
+ <module>interface-server</module>
<module>managed-rocksdb</module>
+ <module>rocks-native</module>
<module>rocksdb-checkpoint-differ</module>
- <module>container-service</module>
<module>server-scm</module>
- <module>tools</module>
- <module>docs</module>
- <module>config</module>
<module>test-utils</module>
- <module>erasurecode</module>
- <module>rocks-native</module>
+ <module>tools</module>
</modules>
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <artifactId>hdds-annotation-processing</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-managed-rocksdb</artifactId>
+ <artifactId>hdds-client</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-client</artifactId>
+ <artifactId>hdds-common</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-server</artifactId>
+ <artifactId>hdds-config</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <artifactId>hdds-container-service</artifactId>
<version>${hdds.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-server</artifactId>
+ <artifactId>hdds-docs</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <artifactId>hdds-erasurecode</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-admin</artifactId>
+ <artifactId>hdds-hadoop-dependency-client</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-erasurecode</artifactId>
+ <artifactId>hdds-hadoop-dependency-server</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <artifactId>hdds-interface-admin</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>hdds-interface-client</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <artifactId>hdds-interface-server</artifactId>
<version>${hdds.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
- <version>${hdds.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>hdds-managed-rocksdb</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>hdds-rocks-native</artifactId>
+ <version>${hdds.rocks.native.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
+ <artifactId>hdds-server-framework</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-annotation-processing</artifactId>
+ <artifactId>hdds-tools</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
<version>${hdds.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -194,18 +178,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <version>${hdds.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-scm</artifactId>
- <type>test-jar</type>
<version>${hdds.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
- <version>${hdds.rocks.native.version}</version>
+ <artifactId>hdds-test-utils</artifactId>
+ <version>${hdds.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 4c751e0b10..c01a4f1665 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -24,6 +24,10 @@
<name>Apache Ozone HDDS RocksDB Tools</name>
<artifactId>hdds-rocks-native</artifactId>
+ <properties>
+ <sort.skip>true</sort.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index c4284a4e85..fc8cf91061 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 4c2e40c375..a1da1f4e68 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<classpath.skip>false</classpath.skip>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 6ff87083c0..903f01c826 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -29,7 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<packaging>jar</packaging>
<properties>
-
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 5b77f394c9..8af514f65b 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
