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 c9a530a9ad HDDS-12104. Enable sortpom in ozonefs modules (#7718)
c9a530a9ad is described below
commit c9a530a9ad228ba4a54470d0e7729966dd152c58
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sun Jan 19 06:52:57 2025 +0100
HDDS-12104. Enable sortpom in ozonefs modules (#7718)
---
hadoop-ozone/ozonefs-common/pom.xml | 101 +++++++++++-------------
hadoop-ozone/ozonefs-hadoop2/pom.xml | 69 ++++++++--------
hadoop-ozone/ozonefs-hadoop3-client/pom.xml | 45 +++++------
hadoop-ozone/ozonefs-hadoop3/pom.xml | 22 +++---
hadoop-ozone/ozonefs-shaded/pom.xml | 95 +++++++++-------------
hadoop-ozone/ozonefs/pom.xml | 118 +++++++++++++---------------
6 files changed, 200 insertions(+), 250 deletions(-)
diff --git a/hadoop-ozone/ozonefs-common/pom.xml
b/hadoop-ozone/ozonefs-common/pom.xml
index faad52a8f0..2bad40c885 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/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,94 +20,77 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-filesystem-common</artifactId>
- <name>Apache Ozone FileSystem Common</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FileSystem Common</name>
<properties>
<file.encoding>UTF-8</file.encoding>
- <downloadSources>true</downloadSources>
- <sort.skip>true</sort.skip>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <proc>none</proc>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-client</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-client</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</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-client</artifactId>
</dependency>
-
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -119,4 +100,16 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml
b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index 48a64745da..b9964f547e 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/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,12 +20,11 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-filesystem-hadoop2</artifactId>
- <name>Apache Ozone FS Hadoop 2.x compatibility</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FS Hadoop 2.x compatibility</name>
<properties>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
<dependency>
@@ -35,6 +32,10 @@
<artifactId>ozone-filesystem-shaded</artifactId>
<optional>true</optional>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -43,47 +44,24 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
<scope>provided</scope>
- <version>${hadoop2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
- <scope>provided</scope>
<version>${hadoop2.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
- <scope>provided</scope>
<version>${hadoop2.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -92,9 +70,28 @@
</exclusions>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop2.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -130,10 +127,10 @@
<executions>
<execution>
<id>include-dependencies</id>
- <phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<skip>${maven.shade.skip}</skip>
<excludes>META-INF/versions/**/*.*</excludes>
diff --git a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
index 445c4a3fe5..a6901eccae 100644
--- a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -12,25 +12,27 @@
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>
<artifactId>ozone</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
-<!--
- This is called "ozone-filesystem-hadoop3-client" to correspond with
- the shaded hadoop jar that it works with:
- "hadoop-client-api.jar", (as opposed to the unshaded hadoop jar:
- "hadoop-common.jar")
--->
+ <!--
+ This is called "ozone-filesystem-hadoop3-client" to correspond with
+ the shaded hadoop jar that it works with:
+ "hadoop-client-api.jar", (as opposed to the unshaded hadoop jar:
+ "hadoop-common.jar")
+ -->
<artifactId>ozone-filesystem-hadoop3-client</artifactId>
- <name>Apache Ozone FS Hadoop shaded 3.x compatibility</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FS Hadoop shaded 3.x compatibility</name>
+ <properties>
+ <!-- no tests in this module so far -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -38,10 +40,6 @@
<optional>true</optional>
</dependency>
</dependencies>
- <properties>
- <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so
far -->
- <sort.skip>true</sort.skip>
- </properties>
<build>
<plugins>
<plugin>
@@ -57,10 +55,10 @@
<executions>
<execution>
<id>include-dependencies</id>
- <phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<skip>${maven.shade.skip}</skip>
<excludes>META-INF/versions/**/*.*</excludes>
@@ -81,15 +79,14 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<skip>${maven.shade.skip}</skip>
<transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<resources>
<resource>META-INF/BC1024KE.DSA</resource>
<resource>META-INF/BC2048KE.DSA</resource>
@@ -97,19 +94,15 @@
<resource>META-INF/BC2048KE.SF</resource>
</resources>
</transformer>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>ozone-default-generated.xml</resource>
</transformer>
</transformers>
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
- <shadedPattern>
- org.apache.hadoop.shaded.com.google.protobuf
- </shadedPattern>
+
<shadedPattern>org.apache.hadoop.shaded.com.google.protobuf</shadedPattern>
<includes>
<include>com.google.protobuf.*</include>
</includes>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml
b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index baf68142c3..bcaee248d6 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/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,13 +20,13 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-filesystem-hadoop3</artifactId>
- <name>Apache Ozone FS Hadoop 3.x compatibility</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FS Hadoop 3.x compatibility</name>
<properties>
- <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>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
<dependency>
@@ -37,8 +35,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -52,8 +50,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -77,10 +75,10 @@
<executions>
<execution>
<id>include-dependencies</id>
- <phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<skip>${maven.shade.skip}</skip>
<excludes>META-INF/versions/**/*.*</excludes>
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml
b/hadoop-ozone/ozonefs-shaded/pom.xml
index 0aacb602cb..5db55f359d 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/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,51 +20,55 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-filesystem-shaded</artifactId>
- <name>Apache Ozone FileSystem Shaded</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FileSystem Shaded</name>
<properties>
- <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>
<shaded.prefix>org.apache.hadoop.ozone.shaded</shaded.prefix>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem-common</artifactId>
<exclusions>
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>*</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
@@ -74,17 +76,11 @@
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -100,15 +96,14 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<skip>${maven.shade.skip}</skip>
<transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<resources>
<resource>META-INF/BC1024KE.DSA</resource>
<resource>META-INF/BC2048KE.DSA</resource>
@@ -116,19 +111,15 @@
<resource>META-INF/BC2048KE.SF</resource>
</resources>
</transformer>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>ozone-default-generated.xml</resource>
</transformer>
</transformers>
<relocations>
<relocation>
<pattern>org</pattern>
- <shadedPattern>
- ${shaded.prefix}.org
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.org</shadedPattern>
<includes>
<include>org.yaml.**.*</include>
<include>org.sqlite.**.*</include>
@@ -151,9 +142,7 @@
</relocation>
<relocation>
<pattern>com</pattern>
- <shadedPattern>
- ${shaded.prefix}.com
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.com</shadedPattern>
<includes>
<include>com.google.common.**.*</include>
<include>com.google.gson.**.*</include>
@@ -166,27 +155,19 @@
</relocation>
<relocation>
<pattern>kotlin</pattern>
- <shadedPattern>
- ${shaded.prefix}.kotlin
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.kotlin</shadedPattern>
</relocation>
<relocation>
<pattern>picocli</pattern>
- <shadedPattern>
- ${shaded.prefix}.picocli
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.picocli</shadedPattern>
</relocation>
<relocation>
<pattern>info</pattern>
- <shadedPattern>
- ${shaded.prefix}.info
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.info</shadedPattern>
</relocation>
<relocation>
<pattern>io</pattern>
- <shadedPattern>
- ${shaded.prefix}.io
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.io</shadedPattern>
<excludes>
<exclude>io!netty!*</exclude>
</excludes>
@@ -195,15 +176,11 @@
<!-- handling some special packages with special names -->
<relocation>
<pattern>okio</pattern>
- <shadedPattern>
- ${shaded.prefix}.okio
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.okio</shadedPattern>
</relocation>
<relocation>
<pattern>okhttp3</pattern>
- <shadedPattern>
- ${shaded.prefix}.okhttp3
- </shadedPattern>
+ <shadedPattern>${shaded.prefix}.okhttp3</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/hadoop-ozone/ozonefs/pom.xml b/hadoop-ozone/ozonefs/pom.xml
index 90514ae5b2..6cb03099d7 100644
--- a/hadoop-ozone/ozonefs/pom.xml
+++ b/hadoop-ozone/ozonefs/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,15 +20,63 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-filesystem</artifactId>
- <name>Apache Ozone FileSystem</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone FileSystem</name>
<properties>
<file.encoding>UTF-8</file.encoding>
- <downloadSources>true</downloadSources>
- <sort.skip>true</sort.skip>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -57,71 +103,17 @@
<executions>
<execution>
<id>deplist</id>
- <phase>compile</phase>
<goals>
<goal>list</goal>
</goals>
+ <phase>compile</phase>
<configuration>
<!-- build a shellprofile -->
- <outputFile>
-
${project.basedir}/target/1hadoop-tools-deps/${project.artifactId}.tools-optional.txt
- </outputFile>
+
<outputFile>${project.basedir}/target/1hadoop-tools-deps/${project.artifactId}.tools-optional.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
