diff --git a/hadoop-hdds/annotations/pom.xml b/hadoop-hdds/annotations/pom.xml index 0a9610870406..e9a628f9a7e7 100644 --- a/hadoop-hdds/annotations/pom.xml +++ b/hadoop-hdds/annotations/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 @@ -25,14 +22,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hdds-annotation-processing 2.0.0-SNAPSHOT - Apache Ozone annotation processing tools for validating custom - annotations at compile time. - - Apache Ozone Annotation Processing jar + Apache Ozone Annotation Processing + Apache Ozone annotation processing tools for validating custom + annotations at compile time. - true + true + diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml index 333b960fc243..e32457ec799d 100644 --- a/hadoop-hdds/client/pom.xml +++ b/hadoop-hdds/client/pom.xml @@ -12,10 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.ozone @@ -25,14 +22,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hdds-client 2.0.0-SNAPSHOT - Apache Ozone Distributed Data Store Client Library - Apache Ozone HDDS Client jar - - - + Apache Ozone HDDS Client + Apache Ozone Distributed Data Store Client Library + + + com.google.guava + guava + + + + io.opentracing + opentracing-api + + + io.opentracing + opentracing-util + + + + jakarta.annotation + jakarta.annotation-api + + + + org.apache.commons + commons-lang3 + org.apache.ozone hdds-common @@ -49,11 +67,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone hdds-interface-client - - - org.apache.commons - commons-lang3 - org.apache.ratis ratis-client @@ -80,25 +93,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> slf4j-api - - com.google.guava - guava - - - - io.opentracing - opentracing-api - - - io.opentracing - opentracing-util - - - - jakarta.annotation - jakarta.annotation-api - - org.apache.ozone @@ -148,7 +142,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> maven-enforcer-plugin - ban-annotations + ban-annotations + diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index f2576f7cf08b..e1cf736f6d30 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -12,10 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> - + 4.0.0 org.apache.ozone @@ -24,45 +21,45 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hdds-common 2.0.0-SNAPSHOT - Apache Ozone Distributed Data Store Common - Apache Ozone HDDS Common jar - - - + Apache Ozone HDDS Common + Apache Ozone Distributed Data Store Common - org.apache.ozone - hdds-hadoop-dependency-client + com.fasterxml.jackson.core + jackson-annotations - info.picocli - picocli + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 com.github.stephenc.jcip jcip-annotations - com.google.protobuf - protobuf-java - compile + com.google.errorprone + error_prone_annotations + true com.google.guava guava compile - - - org.glassfish.jaxb - jaxb-runtime - provided - - org.apache.commons - commons-lang3 + com.google.protobuf + protobuf-java + compile commons-collections @@ -73,33 +70,45 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-io - com.fasterxml.jackson.core - jackson-annotations + commons-validator + commons-validator - com.fasterxml.jackson.core - jackson-core + info.picocli + picocli + - com.fasterxml.jackson.core - jackson-databind + io.dropwizard.metrics + metrics-core - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 + io.grpc + grpc-api + ${io.grpc.version} + compile + + + com.google.code.findbugs + jsr305 + + - org.apache.ozone - hdds-annotation-processing + io.jaegertracing + jaeger-client - org.apache.ozone - hdds-config + io.jaegertracing + jaeger-core - - javax.annotation - javax.annotation-api + io.opentracing + opentracing-api + + + io.opentracing + opentracing-util jakarta.annotation @@ -111,17 +120,49 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - io.dropwizard.metrics - metrics-core + javax.annotation + javax.annotation-api + + + org.apache.commons + commons-lang3 + + + org.apache.ozone + hdds-annotation-processing + + + org.apache.ozone + hdds-config + + + org.apache.ozone + hdds-hadoop-dependency-client + + + org.apache.ozone + hdds-interface-admin + + + org.apache.ozone + hdds-interface-client + + + org.apache.ratis + ratis-client - ratis-server-api org.apache.ratis + ratis-common - ratis-metrics-dropwizard3 org.apache.ratis + ratis-grpc + + + org.apache.ratis + ratis-metrics-dropwizard3 io.dropwizard.metrics @@ -129,37 +170,23 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.apache.ratis - ratis-common - - ratis-netty - org.apache.ratis - - - ratis-grpc - org.apache.ratis org.apache.ratis ratis-proto + org.apache.ratis - ratis-client + ratis-server-api org.apache.ratis ratis-thirdparty-misc - - com.google.errorprone - error_prone_annotations - true - - org.bouncycastle @@ -174,34 +201,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.bouncycastle bcutil-jdk18on - - commons-validator - commons-validator - - - io.jaegertracing - jaeger-client - - - io.jaegertracing - jaeger-core - org.jetbrains.kotlin kotlin-stdlib - - io.opentracing - opentracing-api - - - io.opentracing - opentracing-util - - - org.yaml - snakeyaml - org.reflections reflections @@ -211,24 +214,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> slf4j-api - org.apache.ozone - hdds-interface-client - - - org.apache.ozone - hdds-interface-admin + org.yaml + snakeyaml + - io.grpc - grpc-api - ${io.grpc.version} - compile - - - com.google.code.findbugs - jsr305 - - + org.glassfish.jaxb + jaxb-runtime + provided @@ -258,27 +251,20 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + false ${basedir}/src/main/resources hdds-version-info.properties - false + true ${basedir}/src/main/resources hdds-version-info.properties - true - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - org.apache.hadoop @@ -286,10 +272,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> version-info - generate-resources version-info + generate-resources ${basedir}/../ @@ -330,7 +316,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> maven-enforcer-plugin - ban-annotations + ban-annotations + @@ -347,5 +334,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index 60c63475ae34..5809828eccf0 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/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,12 +21,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hdds-config 2.0.0-SNAPSHOT - Apache Ozone Distributed Data Store Config Tools - Apache Ozone HDDS Config jar - - - + Apache Ozone HDDS Config + Apache Ozone Distributed Data Store Config Tools diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml index c21ca8203b56..29a8f92fc83d 100644 --- a/hadoop-hdds/container-service/pom.xml +++ b/hadoop-hdds/container-service/pom.xml @@ -28,6 +28,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> Apache Ozone HDDS Container Service jar + true diff --git a/hadoop-hdds/crypto-api/pom.xml b/hadoop-hdds/crypto-api/pom.xml index ca54b3de9f2d..3a2838427818 100644 --- a/hadoop-hdds/crypto-api/pom.xml +++ b/hadoop-hdds/crypto-api/pom.xml @@ -29,6 +29,7 @@ true + true diff --git a/hadoop-hdds/crypto-default/pom.xml b/hadoop-hdds/crypto-default/pom.xml index 6024c3e2ddf2..f9653145e44e 100644 --- a/hadoop-hdds/crypto-default/pom.xml +++ b/hadoop-hdds/crypto-default/pom.xml @@ -29,6 +29,7 @@ true + true diff --git a/hadoop-hdds/docs/pom.xml b/hadoop-hdds/docs/pom.xml index 7f4ffbb8a709..e8261c39cb11 100644 --- a/hadoop-hdds/docs/pom.xml +++ b/hadoop-hdds/docs/pom.xml @@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true false + true diff --git a/hadoop-hdds/erasurecode/pom.xml b/hadoop-hdds/erasurecode/pom.xml index b540d1c68ea6..5f34b7b72925 100644 --- a/hadoop-hdds/erasurecode/pom.xml +++ b/hadoop-hdds/erasurecode/pom.xml @@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + true diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 37d41cde390a..af233cbae9a1 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + true diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index 7676f1f45f1c..5bb9b138687f 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true + true diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 6be31002b094..05923dab2cde 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true + true diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml index f04e45a03404..5df30c7dfdd3 100644 --- a/hadoop-hdds/hadoop-dependency-test/pom.xml +++ b/hadoop-hdds/hadoop-dependency-test/pom.xml @@ -31,6 +31,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true + true diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index f3197dc89650..941224230854 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true true + true diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index 1a61dfa930e8..b373d11d507c 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true true + true diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index 47bde5a0bc77..539a0a5430e5 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -32,6 +32,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> true true + true diff --git a/hadoop-hdds/managed-rocksdb/pom.xml b/hadoop-hdds/managed-rocksdb/pom.xml index 40ad920647a0..144d482be129 100644 --- a/hadoop-hdds/managed-rocksdb/pom.xml +++ b/hadoop-hdds/managed-rocksdb/pom.xml @@ -29,6 +29,7 @@ true + true diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index b3aa6ff69522..7e4fbd32db3e 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/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 @@ -25,157 +22,144 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hdds 2.0.0-SNAPSHOT - Apache Ozone Distributed Data Store Project - Apache Ozone HDDS pom - - - true - + Apache Ozone HDDS + Apache Ozone Distributed Data Store Project annotations - hadoop-dependency-client - hadoop-dependency-test - hadoop-dependency-server - interface-client - interface-admin - interface-server client common + config + container-service crypto-api crypto-default + docs + erasurecode framework + hadoop-dependency-client + hadoop-dependency-server + hadoop-dependency-test + interface-admin + interface-client + interface-server managed-rocksdb + rocks-native rocksdb-checkpoint-differ - container-service server-scm - tools - docs - config test-utils - erasurecode - rocks-native + tools - org.apache.ozone - hdds-common + hdds-annotation-processing ${hdds.version} org.apache.ozone - hdds-managed-rocksdb + hdds-client ${hdds.version} org.apache.ozone - hdds-hadoop-dependency-client + hdds-common ${hdds.version} org.apache.ozone - hdds-hadoop-dependency-server + hdds-config ${hdds.version} org.apache.ozone - hdds-hadoop-dependency-test + hdds-container-service ${hdds.version} - test org.apache.ozone - hdds-interface-server + hdds-docs ${hdds.version} org.apache.ozone - hdds-interface-client + hdds-erasurecode ${hdds.version} org.apache.ozone - hdds-interface-admin + hdds-hadoop-dependency-client ${hdds.version} org.apache.ozone - hdds-erasurecode + hdds-hadoop-dependency-server ${hdds.version} org.apache.ozone - hdds-client + hdds-interface-admin ${hdds.version} org.apache.ozone - hdds-tools + hdds-interface-client ${hdds.version} org.apache.ozone - hdds-server-framework + hdds-interface-server ${hdds.version} - - org.apache.ozone - rocksdb-checkpoint-differ - ${hdds.version} - - org.apache.ozone - hdds-server-scm + hdds-managed-rocksdb ${hdds.version} org.apache.ozone - hdds-container-service - ${hdds.version} + hdds-rocks-native + ${hdds.rocks.native.version} org.apache.ozone - hdds-docs + hdds-server-framework ${hdds.version} org.apache.ozone - hdds-config + hdds-server-scm ${hdds.version} org.apache.ozone - hdds-annotation-processing + hdds-tools ${hdds.version} org.apache.ozone - hdds-test-utils + rocksdb-checkpoint-differ ${hdds.version} - test @@ -194,18 +178,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test + + org.apache.ozone + hdds-hadoop-dependency-test + ${hdds.version} + test + + org.apache.ozone hdds-server-scm - test-jar ${hdds.version} + test-jar test org.apache.ozone - hdds-rocks-native - ${hdds.rocks.native.version} + hdds-test-utils + ${hdds.version} + test diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml index 4c751e0b10a5..c01a4f166518 100644 --- a/hadoop-hdds/rocks-native/pom.xml +++ b/hadoop-hdds/rocks-native/pom.xml @@ -24,6 +24,10 @@ Apache Ozone HDDS RocksDB Tools hdds-rocks-native + + true + + org.apache.ozone diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml index c4284a4e85d1..fc8cf910613c 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml +++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml @@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + true diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 4c2e40c37592..a1da1f4e68ce 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> false + true diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 6ff87083c03d..903f01c8269e 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -29,7 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar - + true diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 5b77f394c96f..8af514f65b78 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -30,6 +30,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + true