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 3a6b05efbc HDDS-12105. Enable sortpom in ozone-manager and
httpfsgateway. (#7720)
3a6b05efbc is described below
commit 3a6b05efbccfc205d44293796fb7ae48b8f68e81
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Sun Jan 19 13:18:37 2025 +0530
HDDS-12105. Enable sortpom in ozone-manager and httpfsgateway. (#7720)
---
hadoop-ozone/httpfsgateway/pom.xml | 175 ++++++++---------
hadoop-ozone/ozone-manager/pom.xml | 392 ++++++++++++++++++-------------------
2 files changed, 279 insertions(+), 288 deletions(-)
diff --git a/hadoop-ozone/httpfsgateway/pom.xml
b/hadoop-ozone/httpfsgateway/pom.xml
index e21bc16681..f7b5b455c2 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -14,10 +14,7 @@
-->
-<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>
@@ -33,39 +30,27 @@
<properties>
<classpath.skip>false</classpath.skip>
+ <httpfs.build.timestamp>${maven.build.timestamp}</httpfs.build.timestamp>
<httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
<httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
- <httpfs.build.timestamp>${maven.build.timestamp}</httpfs.build.timestamp>
- <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>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem-common</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-filesystem</artifactId>
- <scope>runtime</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -79,10 +64,42 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</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>hdds-server-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem-common</artifactId>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -92,18 +109,20 @@
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>runtime</scope>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>compile</scope>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -111,8 +130,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -122,22 +141,14 @@
<!-- These were excluded as non of them is used in the HttpFS module,
but all of them would be a new unnecessary
dependency to the Ozone project, we would also need to update the
jar-report.txt with that. -->
<exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.yetus</groupId>
- <artifactId>audience-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
<exclusion>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
@@ -147,57 +158,43 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
<includes>
<include>httpfs.properties</include>
</includes>
</resource>
<resource>
- <directory>src/main/resources</directory>
<filtering>false</filtering>
+ <directory>src/main/resources</directory>
<excludes>
<exclude>httpfs.properties</exclude>
</excludes>
@@ -205,12 +202,12 @@
</resources>
<testResources>
<testResource>
- <directory>${basedir}/src/test/resources</directory>
<filtering>false</filtering>
+ <directory>${basedir}/src/test/resources</directory>
</testResource>
<testResource>
- <directory>${basedir}/src/test/resources</directory>
<filtering>true</filtering>
+ <directory>${basedir}/src/test/resources</directory>
</testResource>
</testResources>
@@ -283,31 +280,29 @@
<executions>
<execution>
<id>create-web-xmls</id>
- <phase>generate-test-resources</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>generate-test-resources</phase>
<configuration>
<target>
- <mkdir dir="${project.build.directory}/test-classes/webapp"/>
+ <mkdir dir="${project.build.directory}/test-classes/webapp" />
<copy todir="${project.build.directory}/test-classes/webapp">
- <fileset dir="${basedir}/src/main/webapp"/>
+ <fileset dir="${basedir}/src/main/webapp" />
</copy>
</target>
</configuration>
</execution>
<execution>
<id>site</id>
- <phase>site</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>site</phase>
<configuration>
<target>
- <xslt in="${basedir}/src/main/resources/httpfs-default.xml"
- out="${project.build.directory}/site/httpfs-default.html"
- style="${basedir}/src/site/configuration.xsl"/>
+ <xslt in="${basedir}/src/main/resources/httpfs-default.xml"
out="${project.build.directory}/site/httpfs-default.html"
style="${basedir}/src/site/configuration.xsl" />
</target>
</configuration>
</execution>
@@ -344,10 +339,10 @@
<executions>
<execution>
<id>dist</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 0547ec4c2c..64e0704bf0 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/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,96 +21,90 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</parent>
<artifactId>ozone-manager</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <description>Apache Ozone Manager Server</description>
- <name>Apache Ozone Manager Server</name>
<packaging>jar</packaging>
+ <name>Apache Ozone Manager Server</name>
+ <description>Apache Ozone Manager Server</description>
<properties>
<classpath.skip>false</classpath.skip>
- <sort.skip>true</sort.skip>
</properties>
<dependencies>
+
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-annotation-processing</artifactId>
- <scope>test</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<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.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-config</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-server</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-managed-rocksdb</artifactId>
+ <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.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectj.version}</version>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
</dependency>
-
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj.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>org.apache.ozone</groupId>
- <artifactId>ozone-common</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-client</artifactId>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-docs</artifactId>
- <scope>provided</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
</dependency>
-
- <!-- hdds.proto and generated files are required from there -->
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-interface-client</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-interface-storage</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-server-framework</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-hadoop-dependency-server</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>rocksdb-checkpoint-differ</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
@@ -133,141 +124,71 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-grpc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-proto</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-server</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ratis</groupId>
- <artifactId>ratis-thirdparty-misc</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-hadoop-dependency-server</artifactId>
</dependency>
+ <!-- hdds.proto and generated files are required from there -->
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <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.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-interface-server</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <scope>runtime</scope>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-managed-rocksdb</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-rocks-native</artifactId>
</dependency>
<dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</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.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-common</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-interface-client</artifactId>
</dependency>
- <!-- Overrider ranger-intg jackson version -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${jackson1.version}</version>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-interface-storage</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson1.version}</version>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>rocksdb-checkpoint-differ</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson-jaxr.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.ranger</groupId>
+ <artifactId>ranger-intg</artifactId>
+ <version>${ranger.version}</version>
</dependency>
<dependency>
@@ -282,6 +203,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-bundle</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
@@ -295,55 +220,114 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>jersey-bundle</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>*</artifactId>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
</exclusion>
<exclusion>
- <groupId>org.elasticsearch</groupId>
- <artifactId>*</artifactId>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>*</artifactId>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
</exclusion>
<exclusion>
- <groupId>org.elasticsearch.plugin</groupId>
+ <groupId>org.apache.lucene</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-bundle</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-storage-api</artifactId>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-client</artifactId>
</exclusion>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ranger</groupId>
- <artifactId>ranger-intg</artifactId>
- <version>${ranger.version}</version>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>hdds-rocks-native</artifactId>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-grpc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-proto</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ratis</groupId>
+ <artifactId>ratis-server-api</artifactId>
+ </dependency>
+ <dependency>
+ <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 -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson-jaxr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson1.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -353,6 +337,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ </dependency>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
@@ -363,12 +352,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-docs</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-boringssl-static</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- Test dependencies -->
@@ -377,6 +368,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>compile-testing</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>hdds-annotation-processing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
@@ -391,8 +387,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-scm</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
@@ -401,6 +397,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/../../hdds/common/src/main/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -429,7 +433,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>
@@ -450,17 +455,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<executions>
<execution>
<id>copy-common-html</id>
- <phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>prepare-package</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
- <outputDirectory>${project.build.outputDirectory}
- </outputDirectory>
+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<includes>webapps/static/**/*.*</includes>
</artifactItem>
<artifactItem>
@@ -503,13 +507,5 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</configuration>
</plugin>
</plugins>
- <testResources>
- <testResource>
- <directory>${basedir}/../../hdds/common/src/main/resources</directory>
- </testResource>
- <testResource>
- <directory>${basedir}/src/test/resources</directory>
- </testResource>
- </testResources>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
