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 9bf597a2510 HDDS-12107. Enable sortpom in ozone-dist and
ozone-interface modules (#7721)
9bf597a2510 is described below
commit 9bf597a25109b89a6dc4220dbf67982325411730
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sun Jan 19 20:52:42 2025 +0100
HDDS-12107. Enable sortpom in ozone-dist and ozone-interface modules (#7721)
---
hadoop-hdds/common/pom.xml | 5 -
hadoop-hdds/hadoop-dependency-test/pom.xml | 4 -
hadoop-hdds/pom.xml | 23 ----
hadoop-ozone/client/pom.xml | 3 -
hadoop-ozone/common/pom.xml | 3 -
hadoop-ozone/csi/pom.xml | 1 -
hadoop-ozone/dist/pom.xml | 203 ++++++++++++++---------------
hadoop-ozone/interface-client/pom.xml | 91 +++++--------
hadoop-ozone/interface-storage/pom.xml | 60 ++++-----
hadoop-ozone/ozone-manager/pom.xml | 17 +--
10 files changed, 152 insertions(+), 258 deletions(-)
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index c1a2749fde5..35fe32713b1 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -77,7 +77,6 @@
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
-
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
@@ -118,7 +117,6 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
-
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -151,7 +149,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
@@ -178,7 +175,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server-api</artifactId>
@@ -187,7 +183,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml
b/hadoop-hdds/hadoop-dependency-test/pom.xml
index 48bdff714fb..6a2b8aa4e06 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -63,12 +63,10 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -82,7 +80,6 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -95,7 +92,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 7e4fbd32db3..a2cd95066a7 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -53,115 +53,96 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-annotation-processing</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-client</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-erasurecode</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-client</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-server</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-managed-rocksdb</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
<version>${hdds.rocks.native.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-scm</artifactId>
<version>${hdds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-tools</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-common</artifactId>
@@ -169,7 +150,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
@@ -177,14 +157,12 @@
<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-server-scm</artifactId>
@@ -192,7 +170,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index b935faae90d..d0cb463ad6f 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -26,7 +26,6 @@
<description>Apache Ozone Client</description>
<dependencies>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -39,7 +38,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -48,7 +46,6 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 0f8b0d9f0b1..1e040341d85 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -26,7 +26,6 @@
<description>Apache Ozone Common</description>
<dependencies>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -47,7 +46,6 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
@@ -90,7 +88,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 84b4dd62969..905ef0f4adb 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -65,7 +65,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 0a9079747c9..055169e7c4a 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/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>
@@ -22,20 +20,84 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-dist</artifactId>
- <name>Apache Ozone Distribution</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone Distribution</name>
<properties>
- <file.encoding>UTF-8</file.encoding>
- <downloadSources>true</downloadSources>
- <docker.ozone.image>apache/ozone</docker.ozone.image>
- <docker.ozone.image.flavor>-rocky</docker.ozone.image.flavor> <!-- suffix
appended to Ozone version to get Docker image version -->
+ <!-- suffix appended to Ozone version to get Docker image version -->
<docker.ozone-runner.version>20241216-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>
+ <docker.ozone.image>apache/ozone</docker.ozone.image>
+ <docker.ozone.image.flavor>-rocky</docker.ozone.image.flavor>
+ <downloadSources>true</downloadSources>
+ <file.encoding>UTF-8</file.encoding>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-docs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-rocks-native</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-scm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-csi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-datanode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-httpfsgateway</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-insight</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-recon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-s3-secret-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-s3gateway</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-tools</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -51,17 +113,15 @@
<executions>
<execution>
<id>dist</id>
- <phase>prepare-package</phase>
<goals>
<goal>exec</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
<arguments>
- <argument>
- ${basedir}/dev-support/bin/dist-layout-stitching
- </argument>
+
<argument>${basedir}/dev-support/bin/dist-layout-stitching</argument>
<argument>${project.build.directory}</argument>
<argument>${hdds.version}</argument>
</arguments>
@@ -75,10 +135,10 @@
<executions>
<execution>
<id>copy-omitted-jars</id>
- <phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<outputDirectory>target/ozone-${ozone.version}/share/ozone/lib</outputDirectory>
<includeScope>runtime</includeScope>
@@ -91,10 +151,10 @@
<executions>
<execution>
<id>copy-compose-files</id>
- <phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>compile</phase>
<configuration>
<outputDirectory>${basedir}/target/compose</outputDirectory>
<resources>
@@ -107,10 +167,10 @@
</execution>
<execution>
<id>copy-and-filter-dockerfile</id>
- <phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>compile</phase>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
@@ -123,10 +183,10 @@
</execution>
<execution>
<id>copy-k8s</id>
- <phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>compile</phase>
<configuration>
<outputDirectory>${basedir}/target/k8s</outputDirectory>
<resources>
@@ -147,75 +207,12 @@
<executions>
<execution>
<id>depcheck</id>
- <phase></phase>
+ <phase />
</execution>
</executions>
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-recon</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3gateway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-csi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-datanode</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-insight</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-httpfsgateway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-s3-secret-store</artifactId>
- </dependency>
- </dependencies>
<profiles>
<profile>
<id>build-with-ozonefs</id>
@@ -251,14 +248,12 @@
<executions>
<execution>
<id>copy-jacoco-files</id>
- <phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
- <outputDirectory>
- target/ozone-${ozone.version}/share/coverage
- </outputDirectory>
+
<outputDirectory>target/ozone-${ozone.version}/share/coverage</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.jacoco</groupId>
@@ -283,8 +278,8 @@
<artifactItem>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
- </artifactItem>
- </artifactItems>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -307,10 +302,10 @@
<executions>
<execution>
<id>src-dist</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<archiveBaseDirectory>../..</archiveBaseDirectory>
<appendAssemblyId>false</appendAssemblyId>
@@ -339,26 +334,24 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
<configuration>
<images>
<image>
<name>${docker.image}</name>
<build>
- <dockerFileDir>
- ${project.build.directory}/ozone-${project.version}
- </dockerFileDir>
+
<dockerFileDir>${project.build.directory}/ozone-${project.version}</dockerFileDir>
</build>
</image>
</images>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -392,17 +385,15 @@
<executions>
<execution>
<id>tar-ozone</id>
- <phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
+ <phase>package</phase>
<configuration>
<executable>${shell-executable}</executable>
- <workingDirectory>${project.build.directory}
- </workingDirectory>
+
<workingDirectory>${project.build.directory}</workingDirectory>
<arguments>
- <argument>${basedir}/dev-support/bin/dist-tar-stitching
- </argument>
+
<argument>${basedir}/dev-support/bin/dist-tar-stitching</argument>
<argument>${hdds.version}</argument>
<argument>${project.build.directory}</argument>
</arguments>
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index f7f53bda6a6..cc8a4e2fee2 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-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>
@@ -24,14 +21,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-interface-client</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Client interface</description>
- <name>Apache Ozone Client Interface</name>
<packaging>jar</packaging>
+ <name>Apache Ozone Client Interface</name>
+ <description>Apache Ozone Client interface</description>
<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>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
+ <!-- only generated code in this module -->
+ <spotbugs.skip>true</spotbugs.skip>
</properties>
<dependencies>
@@ -43,16 +41,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
- </dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
@@ -85,6 +73,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-client</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -114,16 +110,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<goal>test-compile-custom</goal>
</goals>
<configuration>
- <protocArtifact>
-
com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
- </protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<outputDirectory>target/generated-sources/protobuf/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
<pluginId>grpc-java</pluginId>
- <pluginArtifact>
-
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
- </pluginArtifact>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
</execution>
<execution>
@@ -134,9 +126,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</goals>
<configuration>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
- <protocArtifact>
-
com.google.protobuf:protoc:${proto3.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
- </protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${proto3.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<outputDirectory>target/generated-sources/protobuf/java/proto3</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
</configuration>
@@ -148,44 +138,23 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
<phase>generate-sources</phase>
<configuration>
<target>
- <replace token="com.google.protobuf"
- value="org.apache.hadoop.thirdparty.protobuf"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto">
- </replace>
- <replace token="com.google.protobuf"
- value="org.apache.hadoop.thirdparty.protobuf"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto">
- </replace>
- <replace token="org.apache.hadoop.ozone.protocol.proto"
- value="org.apache.hadoop.ozone.protocol.proto3"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto">
- </replace>
- <replace token="org.apache.hadoop.ozone.security.proto"
- value="org.apache.hadoop.ozone.security.proto3"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto">
- </replace>
- <replace token="org.apache.hadoop.hdds.protocol.proto"
- value="org.apache.hadoop.hdds.protocol.proto3"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto">
- </replace>
- <replace token="org.apache.hadoop.ozone.security.proto"
- value="org.apache.hadoop.ozone.security.proto3"
-
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto">
- </replace>
- <move
file="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
-
tofile="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto3"/>
- <move
file="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto"
-
tofile="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto3"/>
- <move file="target/generated-sources/protobuf/java/proto3"
- tofile="target/generated-sources/protobuf/java/"/>
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
token="com.google.protobuf" value="org.apache.hadoop.thirdparty.protobuf" />
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto"
token="com.google.protobuf" value="org.apache.hadoop.thirdparty.protobuf" />
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
token="org.apache.hadoop.ozone.protocol.proto"
value="org.apache.hadoop.ozone.protocol.proto3" />
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto"
token="org.apache.hadoop.ozone.security.proto"
value="org.apache.hadoop.ozone.security.proto3" />
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
token="org.apache.hadoop.hdds.protocol.proto"
value="org.apache.hadoop.hdds.protocol.proto3" />
+ <replace
dir="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
token="org.apache.hadoop.ozone.security.proto"
value="org.apache.hadoop.ozone.security.proto3" />
+ <move
file="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto"
tofile="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/protocol/proto3"
/>
+ <move
file="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto"
tofile="target/generated-sources/protobuf/java/proto3/org/apache/hadoop/ozone/security/proto3"
/>
+ <move file="target/generated-sources/protobuf/java/proto3"
tofile="target/generated-sources/protobuf/java/" />
</target>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
diff --git a/hadoop-ozone/interface-storage/pom.xml
b/hadoop-ozone/interface-storage/pom.xml
index 63ee02a0da1..3f97007520c 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/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,53 +21,45 @@
</parent>
<artifactId>ozone-interface-storage</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Storage Interface</description>
- <name>Apache Ozone Storage Interface</name>
<packaging>jar</packaging>
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone Storage Interface</name>
+ <description>Apache Ozone Storage Interface</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
+ <artifactId>hdds-interface-client</artifactId>
</dependency>
-
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -82,13 +71,13 @@
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- <type>test-jar</type>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,7 +109,8 @@
<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>
@@ -150,9 +140,7 @@
</goals>
<configuration>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
- <protocArtifact>
-
com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
- </protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
</execution>
</executions>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 64e0704bf0a..31ae740c7e2 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -30,7 +30,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -51,7 +50,6 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -106,7 +104,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -139,7 +136,6 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
</dependency>
-
<!-- hdds.proto and generated files are required from there -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -157,17 +153,14 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
@@ -176,7 +169,6 @@
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-storage</artifactId>
@@ -190,7 +182,6 @@
<artifactId>ranger-intg</artifactId>
<version>${ranger.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-common</artifactId>
@@ -285,25 +276,21 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
-
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${aspectj.version}</version>
</dependency>
-
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
</dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
-
- <!-- Overrider ranger-intg jackson version -->
+ <!-- Override ranger-intg jackson version -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
@@ -337,7 +324,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
-
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -350,7 +336,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
