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 6280c6643d HDDS-11952. Enable sortpom in hadoop-ozone. (#7646)
6280c6643d is described below
commit 6280c6643dd610579b261f695f50cf511b7f97c3
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Sun Jan 5 13:42:18 2025 +0530
HDDS-11952. Enable sortpom in hadoop-ozone. (#7646)
---
hadoop-ozone/client/pom.xml | 1 +
hadoop-ozone/common/pom.xml | 1 +
hadoop-ozone/csi/pom.xml | 1 +
hadoop-ozone/datanode/pom.xml | 1 +
hadoop-ozone/dist/pom.xml | 1 +
hadoop-ozone/fault-injection-test/pom.xml | 4 +
hadoop-ozone/httpfsgateway/pom.xml | 1 +
hadoop-ozone/insight/pom.xml | 1 +
hadoop-ozone/integration-test/pom.xml | 4 +
hadoop-ozone/interface-client/pom.xml | 1 +
hadoop-ozone/interface-storage/pom.xml | 1 +
hadoop-ozone/ozone-manager/pom.xml | 1 +
hadoop-ozone/ozonefs-common/pom.xml | 1 +
hadoop-ozone/ozonefs-hadoop2/pom.xml | 1 +
hadoop-ozone/ozonefs-hadoop3-client/pom.xml | 1 +
hadoop-ozone/ozonefs-hadoop3/pom.xml | 1 +
hadoop-ozone/ozonefs-shaded/pom.xml | 1 +
hadoop-ozone/ozonefs/pom.xml | 1 +
hadoop-ozone/pom.xml | 243 ++++++++++++++--------------
hadoop-ozone/recon-codegen/pom.xml | 1 +
hadoop-ozone/recon/pom.xml | 1 +
hadoop-ozone/s3-secret-store/pom.xml | 1 +
hadoop-ozone/s3gateway/pom.xml | 1 +
hadoop-ozone/tools/pom.xml | 1 +
24 files changed, 150 insertions(+), 122 deletions(-)
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 6b5a1ac0c8..427237eeae 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -28,6 +28,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<name>Apache Ozone Client</name>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index f7f60dcd1d..1084e41806 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -29,6 +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-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index ba66c5d527..2c5bb5d7f9 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -31,6 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<properties>
<classpath.skip>false</classpath.skip>
<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-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 733f0837fd..2c98b3b850 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -30,6 +30,7 @@
<classpath.skip>false</classpath.skip>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
<spotbugs.skip>true</spotbugs.skip>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 9540a5195b..82126325f2 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -33,6 +33,7 @@
<docker.ozone-runner.version>20241212-1-jdk21</docker.ozone-runner.version>
<docker.ozone-testkr5b.image>ghcr.io/apache/ozone-testkrb5:20241129-1</docker.ozone-testkr5b.image>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
+ <sort.skip>true</sort.skip>
</properties>
<build>
diff --git a/hadoop-ozone/fault-injection-test/pom.xml
b/hadoop-ozone/fault-injection-test/pom.xml
index e62f7e47dc..1306013726 100644
--- a/hadoop-ozone/fault-injection-test/pom.xml
+++ b/hadoop-ozone/fault-injection-test/pom.xml
@@ -28,6 +28,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<name>Apache Ozone Fault Injection Tests</name>
<packaging>pom</packaging>
+ <properties>
+ <sort.skip>true</sort.skip>
+ </properties>
+
<modules>
<module>network-tests</module>
<module>mini-chaos-tests</module>
diff --git a/hadoop-ozone/httpfsgateway/pom.xml
b/hadoop-ozone/httpfsgateway/pom.xml
index bacc730a00..e21bc16681 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -38,6 +38,7 @@
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<httpfs.build.timestamp>${maven.build.timestamp}</httpfs.build.timestamp>
<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-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index fa3862a7f7..97cdf78650 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/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-ozone/integration-test/pom.xml
b/hadoop-ozone/integration-test/pom.xml
index f4a2f71318..f4e6b73cc6 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -28,6 +28,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<name>Apache Ozone Integration Tests</name>
<packaging>jar</packaging>
+ <properties>
+ <sort.skip>true</sort.skip>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index 2e68deeeb3..f7f53bda6a 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-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 so
far -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this
module -->
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/interface-storage/pom.xml
b/hadoop-ozone/interface-storage/pom.xml
index cd2e1e3478..63ee02a0da 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -28,6 +28,7 @@
<name>Apache Ozone Storage Interface</name>
<packaging>jar</packaging>
<properties>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 8e78814eb6..0547ec4c2c 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/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-ozone/ozonefs-common/pom.xml
b/hadoop-ozone/ozonefs-common/pom.xml
index 18839deaee..faad52a8f0 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/pom.xml
@@ -28,6 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
+ <sort.skip>true</sort.skip>
</properties>
<build>
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml
b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index 8585a9dd54..48a64745da 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -27,6 +27,7 @@
<version>2.0.0-SNAPSHOT</version>
<properties>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
<dependency>
diff --git a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
index 2f23a5d318..445c4a3fe5 100644
--- a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -40,6 +40,7 @@
</dependencies>
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
+ <sort.skip>true</sort.skip>
</properties>
<build>
<plugins>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml
b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 6ec67b522f..baf68142c3 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -28,6 +28,7 @@
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
<dependency>
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml
b/hadoop-ozone/ozonefs-shaded/pom.xml
index 9e77ffd7c3..0aacb602cb 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -29,6 +29,7 @@
<properties>
<maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index aa554c422e..90514ae5b2 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/pom.xml
@@ -28,6 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
+ <sort.skip>true</sort.skip>
</properties>
<build>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index fdd9b2734c..3f73ca9646 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -11,7 +11,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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>
@@ -20,284 +21,282 @@
</parent>
<artifactId>ozone</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Project</description>
- <name>Apache Ozone</name>
<packaging>pom</packaging>
-
- <properties>
- <docker.image>apache/ozone:${project.version}</docker.image>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone</name>
+ <description>Apache Ozone Project</description>
<modules>
+ <module>client</module>
+ <module>common</module>
+ <module>csi</module>
+ <module>datanode</module>
+ <module>dist</module>
+ <module>fault-injection-test</module>
+ <module>httpfsgateway</module>
+ <module>insight</module>
+ <module>integration-test</module>
<module>interface-client</module>
<module>interface-storage</module>
- <module>common</module>
- <module>client</module>
<module>ozone-manager</module>
- <module>tools</module>
- <module>integration-test</module>
- <module>ozonefs-common</module>
<module>ozonefs</module>
- <module>datanode</module>
+ <module>ozonefs-common</module>
<module>recon</module>
<module>recon-codegen</module>
- <module>s3gateway</module>
- <module>dist</module>
- <module>csi</module>
- <module>fault-injection-test</module>
- <module>insight</module>
- <module>httpfsgateway</module>
<module>s3-secret-store</module>
+ <module>s3gateway</module>
+ <module>tools</module>
</modules>
- <dependencyManagement>
+ <properties>
+ <docker.image>apache/ozone:${project.version}</docker.image>
+ </properties>
+ <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- <version>${ozone.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- <version>${ozone.version}</version>
- <type>test-jar</type>
+ <artifactId>hdds-annotation-processing</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-client</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-client</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-common</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-storage</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-config</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-container-service</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3gateway</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-container-service</artifactId>
+ <version>${hdds.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-csi</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-docs</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-datanode</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-erasurecode</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-tools</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-hadoop-dependency-client</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-hadoop-dependency-server</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-shaded</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-interface-admin</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-common</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-interface-client</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-hadoop3</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-interface-server</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-hadoop3-client</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-managed-rocksdb</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-hadoop2</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>hdds-rocks-native</artifactId>
+ <version>${hdds.rocks.native.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-annotation-processing</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-erasurecode</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
<version>${hdds.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-admin</artifactId>
+ <artifactId>hdds-tools</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-client</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-server</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-common</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-managed-rocksdb</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-common</artifactId>
+ <version>${ozone.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3-secret-store</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-csi</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-test-utils</artifactId>
- <version>${hdds.version}</version>
- <scope>test</scope>
+ <artifactId>ozone-datanode</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-client</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-filesystem</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-server</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-filesystem-common</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-filesystem-hadoop2</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <version>${hdds.version}</version>
- <scope>test</scope>
+ <artifactId>ozone-filesystem-hadoop3</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- <version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>ozone-filesystem-hadoop3-client</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-integration-test</artifactId>
+ <artifactId>ozone-filesystem-shaded</artifactId>
<version>${ozone.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
+ <artifactId>ozone-httpfsgateway</artifactId>
<version>${ozone.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <artifactId>ozone-insight</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-integration-test</artifactId>
+ <version>${ozone.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-interface-client</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-interface-storage</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-manager</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-manager</artifactId>
+ <version>${ozone.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
- <version>${hdds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>ozone-recon</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
+ <artifactId>ozone-s3-secret-store</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-insight</artifactId>
- <version>${hdds.version}</version>
+ <artifactId>ozone-s3gateway</artifactId>
+ <version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-httpfsgateway</artifactId>
+ <artifactId>ozone-tools</artifactId>
<version>${ozone.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-recon</artifactId>
- <version>${ozone.version}</version>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
+ <version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
+ <artifactId>hdds-client</artifactId>
<version>${hdds.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>hdds-common</artifactId>
+ <version>${hdds.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<version>${hdds.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
- <version>${hdds.rocks.native.version}</version>
+ <artifactId>hdds-test-utils</artifactId>
+ <version>${hdds.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- </dependencies>
+
+ <dependencies />
<build>
<plugins>
@@ -307,6 +306,10 @@
<executions>
<execution>
<id>depcheck</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
<configuration>
<rules>
<DependencyConvergence>
@@ -314,10 +317,6 @@
</DependencyConvergence>
</rules>
</configuration>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
</execution>
</executions>
</plugin>
@@ -379,17 +378,17 @@
</property>
</activation>
<modules>
- <module>ozonefs-shaded</module>
<module>ozonefs-hadoop2</module>
<module>ozonefs-hadoop3</module>
<module>ozonefs-hadoop3-client</module>
+ <module>ozonefs-shaded</module>
</modules>
</profile>
<profile>
<id>go-offline</id>
<modules>
- <module>ozonefs-shaded</module>
<module>ozonefs-hadoop2</module>
+ <module>ozonefs-shaded</module>
</modules>
</profile>
<profile>
diff --git a/hadoop-ozone/recon-codegen/pom.xml
b/hadoop-ozone/recon-codegen/pom.xml
index b8345c7d34..0a279c40ab 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -25,6 +25,7 @@
<name>Apache Ozone Recon CodeGen</name>
<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-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index f203689b66..85d2eac9d2 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -26,6 +26,7 @@
<properties>
<classpath.skip>false</classpath.skip>
<pnpm.version>8.15.7</pnpm.version>
+ <sort.skip>true</sort.skip>
</properties>
<build>
<resources>
diff --git a/hadoop-ozone/s3-secret-store/pom.xml
b/hadoop-ozone/s3-secret-store/pom.xml
index 210969e766..1dcaa17d56 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -28,6 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index f012d3f1aa..351db4b61f 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -29,6 +29,7 @@
<classpath.skip>false</classpath.skip>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
+ <sort.skip>true</sort.skip>
</properties>
<dependencies>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 8ea8ded01c..f3605d358e 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
