diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index e21bc166817..f7b5b455c29 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -14,10 +14,7 @@ --> - + 4.0.0 org.apache.ozone @@ -33,39 +30,27 @@ false + ${maven.build.timestamp} REPO NOT AVAIL REVISION NOT AVAIL yyyy-MM-dd'T'HH:mm:ssZ - ${maven.build.timestamp} - true - true + + true - org.apache.ozone - hdds-common - - - org.apache.ozone - hdds-config - - - org.apache.ozone - hdds-server-framework - - - org.apache.ozone - ozone-filesystem-common + ch.qos.reload4j + reload4j + compile - org.apache.ozone - ozone-filesystem - runtime + com.fasterxml.jackson.core + jackson-databind - org.apache.hadoop - hadoop-hdfs-client + com.google.guava + guava com.googlecode.json-simple @@ -79,10 +64,42 @@ + + jakarta.ws.rs + jakarta.ws.rs-api + + + jakarta.xml.bind + jakarta.xml.bind-api + javax.servlet javax.servlet-api + + org.apache.commons + commons-lang3 + + + org.apache.hadoop + hadoop-hdfs-client + + + org.apache.ozone + hdds-common + + + org.apache.ozone + hdds-config + + + org.apache.ozone + hdds-server-framework + + + org.apache.ozone + ozone-filesystem-common + org.eclipse.jetty jetty-server @@ -92,18 +109,20 @@ jetty-webapp - commons-codec - commons-codec - runtime + org.glassfish.hk2 + hk2-api - org.apache.commons - commons-lang3 + org.glassfish.jaxb + jaxb-runtime - ch.qos.reload4j - reload4j - compile + org.glassfish.jersey.core + jersey-server + + + org.glassfish.jersey.inject + jersey-hk2 org.slf4j @@ -111,8 +130,8 @@ compile - org.slf4j - slf4j-reload4j + commons-codec + commons-codec runtime @@ -122,22 +141,14 @@ - - org.apache.commons - commons-math - - - org.apache.yetus - audience-annotations - - - org.slf4j - slf4j-log4j12 - com.sun.mail javax.mail + + io.netty + * + jline jline @@ -147,57 +158,43 @@ log4j - io.netty - * + org.apache.commons + commons-math + + + org.apache.yetus + audience-annotations + + + org.slf4j + slf4j-log4j12 - com.fasterxml.jackson.core - jackson-databind - - - com.google.guava - guava - - - jakarta.ws.rs - jakarta.ws.rs-api - - - jakarta.xml.bind - jakarta.xml.bind-api - - - org.glassfish.hk2 - hk2-api - - - org.glassfish.jersey.core - jersey-server - - - org.glassfish.jersey.inject - jersey-hk2 + org.apache.ozone + ozone-filesystem + runtime - org.glassfish.jaxb - jaxb-runtime + org.slf4j + slf4j-reload4j + runtime - src/main/resources true + src/main/resources httpfs.properties - src/main/resources false + src/main/resources httpfs.properties @@ -205,12 +202,12 @@ - ${basedir}/src/test/resources false + ${basedir}/src/test/resources - ${basedir}/src/test/resources true + ${basedir}/src/test/resources @@ -283,31 +280,29 @@ create-web-xmls - generate-test-resources run + generate-test-resources - + - + site - site run + site - + @@ -344,10 +339,10 @@ dist - package single + package ${project.artifactId}-${project.version} false diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 0547ec4c2cf..64e0704bf0a 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. --> - + 4.0.0 org.apache.ozone @@ -24,96 +21,90 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> ozone-manager 2.0.0-SNAPSHOT - Apache Ozone Manager Server - Apache Ozone Manager Server jar + Apache Ozone Manager Server + Apache Ozone Manager Server false - true + - org.apache.ozone - hdds-annotation-processing - test + com.fasterxml.jackson.core + jackson-annotations - org.apache.ozone - hdds-client + com.fasterxml.jackson.core + jackson-databind - org.apache.ozone - hdds-common + com.google.guava + guava - org.apache.ozone - hdds-config + com.google.protobuf + protobuf-java - org.apache.ozone - hdds-interface-server + com.sun.jersey + jersey-client + - org.apache.ozone - hdds-managed-rocksdb + commons-codec + commons-codec - org.apache.ozone - ozone-interface-client + commons-io + commons-io - - org.aspectj - aspectjrt - ${aspectj.version} + info.picocli + picocli - - org.aspectj - aspectjweaver - ${aspectj.version} + io.grpc + grpc-api + + + com.google.code.findbugs + jsr305 + + - - org.apache.ozone - ozone-common + io.grpc + grpc-netty - - org.apache.ozone - ozone-client + io.grpc + grpc-stub - - org.apache.ozone - hdds-docs - provided + io.netty + netty-common - - - org.apache.ozone - hdds-interface-client + io.netty + netty-handler - - org.apache.ozone - ozone-interface-storage + io.netty + netty-transport - - org.apache.ozone - hdds-server-framework + jakarta.annotation + jakarta.annotation-api - org.apache.ozone - hdds-hadoop-dependency-server + jakarta.xml.bind + jakarta.xml.bind-api - org.apache.ozone - rocksdb-checkpoint-differ + javax.servlet + javax.servlet-api @@ -133,141 +124,71 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> log4j-api - org.apache.ratis - ratis-common - - - org.apache.ratis - ratis-grpc - - - org.apache.ratis - ratis-netty - - - org.apache.ratis - ratis-proto + org.apache.ozone + hdds-client - org.apache.ratis - ratis-server-api + org.apache.ozone + hdds-common - org.apache.ratis - ratis-server + org.apache.ozone + hdds-config - org.apache.ratis - ratis-thirdparty-misc + org.apache.ozone + hdds-hadoop-dependency-server + - org.bouncycastle - bcprov-jdk18on - - - io.grpc - grpc-api - - - com.google.code.findbugs - jsr305 - - - - - io.grpc - grpc-netty - - - io.grpc - grpc-stub - - - io.netty - netty-common + org.apache.ozone + hdds-interface-client - io.netty - netty-handler + org.apache.ozone + hdds-interface-server - io.netty - netty-tcnative-boringssl-static - runtime + org.apache.ozone + hdds-managed-rocksdb - io.netty - netty-transport + org.apache.ozone + hdds-rocks-native - org.reflections - reflections + org.apache.ozone + hdds-server-framework - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - - - com.sun.jersey - jersey-client - - - info.picocli - picocli - - - jakarta.annotation - jakarta.annotation-api + org.apache.ozone + ozone-client + - jakarta.xml.bind - jakarta.xml.bind-api + org.apache.ozone + ozone-common - javax.servlet - javax.servlet-api + org.apache.ozone + ozone-interface-client - - org.codehaus.jackson - jackson-core-asl - ${jackson1.version} + org.apache.ozone + ozone-interface-storage - org.codehaus.jackson - jackson-mapper-asl - ${jackson1.version} + org.apache.ozone + rocksdb-checkpoint-differ - org.codehaus.jackson - jackson-jaxrs - ${jackson-jaxr.version} - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - + org.apache.ranger + ranger-intg + ${ranger.version} @@ -282,6 +203,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> ch.qos.logback logback-classic + + com.amazonaws + aws-java-sdk-bundle + com.google.cloud.bigdataoss gcs-connector @@ -295,55 +220,114 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jersey-bundle - org.apache.lucene - * + net.minidev + json-smart - org.elasticsearch - * + org.apache.hive + hive-storage-api - org.elasticsearch.client - * + org.apache.kafka + kafka-clients - org.elasticsearch.plugin + org.apache.lucene * - com.amazonaws - aws-java-sdk-bundle + org.apache.solr + solr-solrj - org.apache.hive - hive-storage-api + org.elasticsearch + * - org.apache.kafka - kafka-clients + org.elasticsearch.client + * - org.apache.solr - solr-solrj + org.elasticsearch.plugin + * org.opensearch.client opensearch-rest-client - - net.minidev - json-smart - - org.apache.ranger - ranger-intg - ${ranger.version} + org.apache.ratis + ratis-common - org.apache.ozone - hdds-rocks-native + org.apache.ratis + ratis-grpc + + + org.apache.ratis + ratis-netty + + + org.apache.ratis + ratis-proto + + + org.apache.ratis + ratis-server + + + org.apache.ratis + ratis-server-api + + + org.apache.ratis + ratis-thirdparty-misc + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + + org.bouncycastle + bcprov-jdk18on + + + + + org.codehaus.jackson + jackson-core-asl + ${jackson1.version} + + + org.codehaus.jackson + jackson-jaxrs + ${jackson-jaxr.version} + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + + + org.codehaus.jackson + jackson-mapper-asl + ${jackson1.version} org.eclipse.jetty @@ -353,6 +337,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.eclipse.jetty jetty-webapp + + + org.reflections + reflections + org.rocksdb rocksdbjni @@ -363,12 +352,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - commons-codec - commons-codec + org.apache.ozone + hdds-docs + provided - commons-io - commons-io + io.netty + netty-tcnative-boringssl-static + runtime @@ -377,6 +368,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile-testing test + + org.apache.ozone + hdds-annotation-processing + test + org.apache.ozone hdds-common @@ -391,8 +387,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone hdds-server-scm - test test-jar + test org.apache.ozone @@ -401,6 +397,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + ${basedir}/../../hdds/common/src/main/resources + + + ${basedir}/src/test/resources + + org.apache.maven.plugins @@ -429,7 +433,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> maven-enforcer-plugin - ban-annotations + ban-annotations + @@ -450,17 +455,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> copy-common-html - prepare-package unpack + prepare-package org.apache.ozone hdds-server-framework - ${project.build.outputDirectory} - + ${project.build.outputDirectory} webapps/static/**/*.* @@ -503,13 +507,5 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - - ${basedir}/../../hdds/common/src/main/resources - - - ${basedir}/src/test/resources - -