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 df6e119f4c HDDS-12006. Enable sortpom in hdds-container-service,
hdds-crypto-api, hdds-crypto-default, hdds-docs (#7638)
df6e119f4c is described below
commit df6e119f4c8b04ae3425ec291e7ddbbde360556b
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Sat Jan 4 15:28:57 2025 +0530
HDDS-12006. Enable sortpom in hdds-container-service, hdds-crypto-api,
hdds-crypto-default, hdds-docs (#7638)
---
hadoop-hdds/annotations/pom.xml | 2 +-
hadoop-hdds/container-service/pom.xml | 162 ++++++++++++++++------------------
hadoop-hdds/crypto-api/pom.xml | 36 ++++----
hadoop-hdds/crypto-default/pom.xml | 36 ++++----
hadoop-hdds/docs/pom.xml | 13 ++-
5 files changed, 118 insertions(+), 131 deletions(-)
diff --git a/hadoop-hdds/annotations/pom.xml b/hadoop-hdds/annotations/pom.xml
index e9a628f9a7..84696c6094 100644
--- a/hadoop-hdds/annotations/pom.xml
+++ b/hadoop-hdds/annotations/pom.xml
@@ -28,8 +28,8 @@
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>
</properties>
<build>
diff --git a/hadoop-hdds/container-service/pom.xml
b/hadoop-hdds/container-service/pom.xml
index 29a8f92fc8..0c1f0bbf4a 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/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,85 +21,78 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-container-service</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store Container
Service</description>
- <name>Apache Ozone HDDS Container Service</name>
<packaging>jar</packaging>
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone HDDS Container Service</name>
+ <description>Apache Ozone Distributed Data Store Container
Service</description>
<dependencies>
+
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <groupId>com.github.luben</groupId>
+ <artifactId>zstd-jni</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-server</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-managed-rocksdb</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.github.luben</groupId>
- <artifactId>zstd-jni</artifactId>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
</dependency>
-
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
- <scope>provided</scope>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
@@ -113,49 +103,50 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
+
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
</dependency>
<dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-managed-rocksdb</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
@@ -177,6 +168,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-server</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server-api</artifactId>
@@ -185,6 +181,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
<dependency>
<groupId>org.rocksdb</groupId>
@@ -196,20 +196,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
</dependency>
+
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-docs</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
@@ -261,7 +255,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>
@@ -283,17 +278,16 @@ 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>
diff --git a/hadoop-hdds/crypto-api/pom.xml b/hadoop-hdds/crypto-api/pom.xml
index 3a28384278..9524b2df2d 100644
--- a/hadoop-hdds/crypto-api/pom.xml
+++ b/hadoop-hdds/crypto-api/pom.xml
@@ -12,27 +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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>hdds-crypto-api</artifactId>
+<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>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Distributed Data Store cryptographic
functions</description>
- <name>Apache Ozone HDDS Crypto</name>
+ </parent>
+
+ <artifactId>hdds-crypto-api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>Apache Ozone HDDS Crypto</name>
+ <description>Apache Ozone Distributed Data Store cryptographic
functions</description>
- <properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module
so far -->
- <sort.skip>true</sort.skip>
- </properties>
+ <properties>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
- <dependencies>
+ <dependencies>
- </dependencies>
+ </dependencies>
</project>
diff --git a/hadoop-hdds/crypto-default/pom.xml
b/hadoop-hdds/crypto-default/pom.xml
index f9653145e4..5200521d24 100644
--- a/hadoop-hdds/crypto-default/pom.xml
+++ b/hadoop-hdds/crypto-default/pom.xml
@@ -12,27 +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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>hdds-crypto-default</artifactId>
+<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>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Default implementation of Apache Ozone Distributed Data
Store's cryptographic functions</description>
- <name>Apache Ozone HDDS Crypto - Default</name>
+ </parent>
+
+ <artifactId>hdds-crypto-default</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>Apache Ozone HDDS Crypto - Default</name>
+ <description>Default implementation of Apache Ozone Distributed Data Store's
cryptographic functions</description>
- <properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module
so far -->
- <sort.skip>true</sort.skip>
- </properties>
+ <properties>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
- <dependencies>
+ <dependencies>
- </dependencies>
+ </dependencies>
</project>
diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml
index e8261c39cb..a67c80e9f3 100644
--- a/hadoop-hdds/docs/pom.xml
+++ b/hadoop-hdds/docs/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,14 +21,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>hdds-docs</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone/HDDS Documentation</description>
- <name>Apache Ozone/HDDS Documentation</name>
<packaging>jar</packaging>
+ <name>Apache Ozone/HDDS Documentation</name>
+ <description>Apache Ozone/HDDS Documentation</description>
<properties>
- <maven.test.skip>true</maven.test.skip> <!-- no testable code in this
module -->
+ <!-- no testable code in this module -->
+ <maven.test.skip>true</maven.test.skip>
<skipDocs>false</skipDocs>
- <sort.skip>true</sort.skip>
</properties>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
