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 147318b049 HDDS-12074. Enable sortpom in ozone-insight,
s3-secret-store, s3gateway and tools (#7692)
147318b049 is described below
commit 147318b049953610984f72a375454e039d04d247
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 14 18:16:19 2025 +0100
HDDS-12074. Enable sortpom in ozone-insight, s3-secret-store, s3gateway and
tools (#7692)
---
hadoop-ozone/insight/pom.xml | 78 ++++++------
hadoop-ozone/s3-secret-store/pom.xml | 29 ++---
hadoop-ozone/s3gateway/pom.xml | 241 +++++++++++++++++------------------
hadoop-ozone/tools/pom.xml | 212 +++++++++++++++---------------
4 files changed, 269 insertions(+), 291 deletions(-)
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 97cdf78650..cdbef482ef 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/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,16 +21,39 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-insight</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Insight Tool</description>
- <name>Apache Ozone Insight Tool</name>
<packaging>jar</packaging>
+ <name>Apache Ozone Insight Tool</name>
+ <description>Apache Ozone Insight Tool</description>
<properties>
<classpath.skip>false</classpath.skip>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <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.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -56,15 +76,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
+ <artifactId>hdds-tools</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -72,48 +92,24 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem</artifactId>
+ <artifactId>ozone-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-client</artifactId>
+ <artifactId>ozone-filesystem</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <artifactId>ozone-interface-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
+ <artifactId>ozone-manager</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
@@ -133,8 +129,7 @@ https://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>
<fork>true</fork>
<maxHeap>2048</maxHeap>
</configuration>
@@ -160,7 +155,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/s3-secret-store/pom.xml
b/hadoop-ozone/s3-secret-store/pom.xml
index 1dcaa17d56..decc23ba8a 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/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,36 +20,33 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-s3-secret-store</artifactId>
- <name>Apache Ozone S3 Secret Store</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone S3 Secret Store</name>
<properties>
- <file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <sort.skip>true</sort.skip>
+ <file.encoding>UTF-8</file.encoding>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.bettercloud</groupId>
+ <artifactId>vault-java-driver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-common</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-manager</artifactId>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>com.bettercloud</groupId>
- <artifactId>vault-java-driver</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 351db4b61f..63e2135982 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/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,226 +20,224 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>ozone-s3gateway</artifactId>
- <name>Apache Ozone S3 Gateway</name>
- <packaging>jar</packaging>
<version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Ozone S3 Gateway</name>
<properties>
<classpath.skip>false</classpath.skip>
- <file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <sort.skip>true</sort.skip>
+ <file.encoding>UTF-8</file.encoding>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-client</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-common</artifactId>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</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>ozone-common</artifactId>
- <scope>compile</scope>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-client</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerby-util</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-noop</artifactId>
</dependency>
-
<dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet-shaded</artifactId>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-jaxb</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-api</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>kerby-util</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-server</artifactId>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-server</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-client</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet-core</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
+ <groupId>org.glassfish.jersey.ext.cdi</groupId>
+ <artifactId>jersey-cdi1x</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-noop</artifactId>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-jaxb</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-server</artifactId>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
@@ -278,7 +274,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>
@@ -300,25 +297,22 @@
<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>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
- <outputDirectory>
- ${project.build.outputDirectory}/webapps/static
- </outputDirectory>
+
<outputDirectory>${project.build.outputDirectory}/webapps/static</outputDirectory>
<includes>docs/**/*.*</includes>
</artifactItem>
</artifactItems>
@@ -331,8 +325,7 @@
<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>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index f3605d358e..b3ee3ff579 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/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,16 +21,95 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-tools</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Tools</description>
- <name>Apache Ozone Tools</name>
<packaging>jar</packaging>
+ <name>Apache Ozone Tools</name>
+ <description>Apache Ozone Tools</description>
<properties>
<classpath.skip>false</classpath.skip>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli-shell-jline3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-client</artifactId>
@@ -50,6 +126,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-server</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
@@ -68,15 +148,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-scm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-manager</artifactId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <artifactId>hdds-server-scm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -88,12 +164,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-common</artifactId>
+ <artifactId>ozone-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem-common</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-client</artifactId>
@@ -104,7 +184,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <artifactId>ozone-manager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -116,31 +196,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
@@ -159,84 +214,23 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-thirdparty-misc</artifactId>
+ <artifactId>ratis-shell</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-tools</artifactId>
+ <artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
- <artifactId>ratis-shell</artifactId>
- </dependency>
-
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- </dependency>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli-shell-jline3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
+ <artifactId>ratis-tools</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
@@ -273,8 +267,7 @@ https://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>
<fork>true</fork>
<maxHeap>2048</maxHeap>
</configuration>
@@ -309,7 +302,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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
