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 81d098255b HDDS-12021. Enable sortpom in hadoop-ozone client, common,
csi and datanode. (#7717)
81d098255b is described below
commit 81d098255ba67489d1928b8d6a979d9c51d1a7d5
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Sat Jan 18 20:49:45 2025 +0530
HDDS-12021. Enable sortpom in hadoop-ozone client, common, csi and
datanode. (#7717)
---
hadoop-ozone/client/pom.xml | 75 ++++++++--------
hadoop-ozone/common/pom.xml | 150 +++++++++++++++----------------
hadoop-ozone/csi/pom.xml | 200 ++++++++++++++++++++----------------------
hadoop-ozone/datanode/pom.xml | 38 ++++----
4 files changed, 221 insertions(+), 242 deletions(-)
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 427237eeae..b935faae90 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/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,25 +21,49 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-client</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Client</description>
- <name>Apache Ozone Client</name>
<packaging>jar</packaging>
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone Client</name>
+ <description>Apache Ozone Client</description>
<dependencies>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</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>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -60,11 +81,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-client</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
@@ -78,28 +94,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -155,7 +149,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-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 1084e41806..0f8b0d9f0b 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/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,55 +21,74 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-common</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Common</description>
- <name>Apache Ozone Common</name>
<packaging>jar</packaging>
-
- <properties>
- <sort.skip>true</sort.skip>
- </properties>
+ <name>Apache Ozone Common</name>
+ <description>Apache Ozone Common</description>
<dependencies>
+
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <scope>runtime</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-client</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
</dependency>
<dependency>
@@ -92,68 +108,45 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-proto</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-thirdparty-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
</dependency>
-
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
-
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-proto</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -181,18 +174,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<build>
<resources>
<resource>
+ <filtering>false</filtering>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>ozone-version-info.properties</exclude>
</excludes>
- <filtering>false</filtering>
</resource>
<resource>
+ <filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>ozone-version-info.properties</include>
</includes>
- <filtering>true</filtering>
</resource>
</resources>
<plugins>
@@ -202,10 +195,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>
@@ -246,7 +239,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-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 2c5bb5d7f9..84b4dd6296 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/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
-http://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
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
@@ -24,99 +21,94 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-csi</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone CSI service</description>
- <name>Apache Ozone CSI service</name>
<packaging>jar</packaging>
+ <name>Apache Ozone CSI service</name>
+ <description>Apache Ozone CSI service</description>
<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>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${grpc.protobuf-compile.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${grpc.protobuf-compile.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
- <exclusions>
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${grpc.protobuf-compile.version}</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-epoll</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <classifier>linux-x86_64</classifier>
+ <artifactId>netty-codec-http2</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -124,55 +116,42 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
+ <artifactId>netty-transport</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>linux-x86_64</classifier>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
<exclusions>
<exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- </dependency>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -188,25 +167,35 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>com.salesforce.servicelibs</groupId>
@@ -234,9 +223,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<version>${protobuf-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
- <protocArtifact>
-
com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
- </protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>csi.proto</include>
@@ -255,9 +242,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
</goals>
<configuration>
<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>
</executions>
@@ -267,10 +252,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<executions>
<execution>
<id>depcheck</id>
- <phase></phase>
+ <phase />
</execution>
<execution>
- <id>ban-annotations</id> <!-- override default restriction from
root POM -->
+ <id>ban-annotations</id>
+ <!-- override default restriction from root POM -->
<configuration>
<rules>
<restrictImports>
@@ -290,10 +276,16 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml
- </excludeFilterFile>
+
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
</configuration>
</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-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 2c98b3b850..1c6bef22fc 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/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,18 +20,30 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-datanode</artifactId>
- <name>Apache Ozone Datanode</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone Datanode</name>
<properties>
<classpath.skip>false</classpath.skip>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
<spotbugs.skip>true</spotbugs.skip>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-container-service</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-server</artifactId>
@@ -45,22 +55,10 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-container-service</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -77,10 +75,10 @@
<executions>
<execution>
<id>add-classpath-descriptor</id>
- <phase>prepare-package</phase>
<goals>
<goal>build-classpath</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<outputFile>${project.build.outputDirectory}/${project.artifactId}.classpath</outputFile>
<prefix>$HDDS_LIB_JARS_DIR</prefix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
