diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index d8c26684505..aff0fa77017 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 bookkeeper - org.apache.bookkeeper - 4.14.8-SNAPSHOT + io.streamnative + 4.14.8.1 - org.apache.bookkeeper + io.streamnative bookkeeper-benchmark Apache BookKeeper :: Benchmark @@ -40,6 +39,30 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + @@ -50,32 +73,32 @@ test - - org.xerial.snappy - snappy-java - test + + org.xerial.snappy + snappy-java + test - - io.dropwizard.metrics - metrics-core - test + + io.dropwizard.metrics + metrics-core + test - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} compile - org.apache.bookkeeper + io.streamnative bookkeeper-common ${project.version} test-jar test - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} test-jar diff --git a/bookkeeper-common-allocator/pom.xml b/bookkeeper-common-allocator/pom.xml index 85430d6a304..e61397f807a 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.bookkeeper.stats + io.streamnative.stats bookkeeper-stats-api ${project.version} - - org.apache.bookkeeper.stats + io.streamnative.stats codahale-metrics-provider ${project.version} - org.apache.bookkeeper.stats + io.streamnative.stats prometheus-metrics-provider ${project.version} - - org.apache.bookkeeper.http + io.streamnative.http http-server ${project.version} - org.apache.bookkeeper.http + io.streamnative.http vertx-http-server ${project.version} - - org.apache.bookkeeper + io.streamnative bookkeeper-tools ${project.version} - - org.apache.distributedlog + io.streamnative distributedlog-core ${project.version} - - - org.apache.bookkeeper - stream-storage-server - ${project.version} + io.streamnative + stream-storage-server + ${project.version} - - org.apache.bookkeeper + io.streamnative bookkeeper-benchmark ${project.version} - org.slf4j slf4j-log4j12 - - org.apache.bookkeeper + io.streamnative bookkeeper-perf ${project.version} - - - org.xerial.snappy - snappy-java + + org.xerial.snappy + snappy-java - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - @@ -152,6 +139,30 @@ true + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/bookkeeper-dist/bkctl/pom.xml b/bookkeeper-dist/bkctl/pom.xml index c8367a66fe2..64f0a80e476 100644 --- a/bookkeeper-dist/bkctl/pom.xml +++ b/bookkeeper-dist/bkctl/pom.xml @@ -1,3 +1,4 @@ + - org.apache.bookkeeper + io.streamnative bookkeeper-tools ${project.version} @@ -44,14 +43,12 @@ - org.slf4j slf4j-log4j12 - @@ -83,6 +80,30 @@ true + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/bookkeeper-dist/pom.xml b/bookkeeper-dist/pom.xml index 4fc9744e1c9..fbd66081834 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -1,3 +1,4 @@ + - bookkeeper - org.apache.bookkeeper - 4.14.8-SNAPSHOT + io.streamnative + 4.14.8.1 4.0.0 bookkeeper-dist @@ -44,6 +44,16 @@ default-jar none + + javadoc-jar + package + + jar + + + javadoc + + diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 5cb5abe9df9..ec44bccf38a 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -1,3 +1,4 @@ + - org.apache.bookkeeper.stats + io.streamnative.stats bookkeeper-stats-api ${project.version} - org.apache.bookkeeper.stats + io.streamnative.stats prometheus-metrics-provider ${project.version} - - org.apache.bookkeeper.http + io.streamnative.http http-server ${project.version} - org.apache.bookkeeper.http + io.streamnative.http vertx-http-server ${project.version} - - org.apache.bookkeeper - stream-storage-server - ${project.version} + io.streamnative + stream-storage-server + ${project.version} - - org.apache.bookkeeper + io.streamnative bookkeeper-tools ${project.version} - - org.apache.distributedlog + io.streamnative distributedlog-core ${project.version} - org.slf4j slf4j-log4j12 - - - org.xerial.snappy - snappy-java + + org.xerial.snappy + snappy-java - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - @@ -132,7 +123,30 @@ true - + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml index 87846996aa8..e6d2358ead2 100644 --- a/bookkeeper-dist/src/assemble/bin-all.xml +++ b/bookkeeper-dist/src/assemble/bin-all.xml @@ -1,3 +1,4 @@ + - + bin tar.gz @@ -25,7 +24,7 @@ target - + ${project.artifactId}-${project.version}.jar @@ -74,18 +73,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-all.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-all.bin.txt - + NOTICE 644 @@ -100,11 +99,11 @@ ${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} - org.apache.bookkeeper:stream-storage-common - org.apache.bookkeeper:stream-storage-proto - org.apache.bookkeeper:stream-storage-api - org.apache.bookkeeper:stream-storage-java-client-base - org.apache.bookkeeper:stream-storage-java-kv-client + io.streamnative:stream-storage-common + io.streamnative:stream-storage-proto + io.streamnative:stream-storage-api + io.streamnative:stream-storage-java-client-base + io.streamnative:stream-storage-java-kv-client org.codehaus.mojo:animal-sniffer-annotations diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml index 6ba16d6fa9a..c984508b919 100644 --- a/bookkeeper-dist/src/assemble/bin-server.xml +++ b/bookkeeper-dist/src/assemble/bin-server.xml @@ -1,3 +1,4 @@ + - + bin tar.gz @@ -25,7 +24,7 @@ target - + ${project.artifactId}-${project.version}.jar @@ -64,18 +63,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-server.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-server.bin.txt - + NOTICE 644 @@ -91,11 +90,11 @@ com.google.code.findbugs:jsr305 - org.apache.bookkeeper:stream-storage-common - org.apache.bookkeeper:stream-storage-proto - org.apache.bookkeeper:stream-storage-api - org.apache.bookkeeper:stream-storage-java-client-base - org.apache.bookkeeper:stream-storage-java-kv-client + io.streamnative:stream-storage-common + io.streamnative:stream-storage-proto + io.streamnative:stream-storage-api + io.streamnative:stream-storage-java-client-base + io.streamnative:stream-storage-java-kv-client org.codehaus.mojo:animal-sniffer-annotations diff --git a/bookkeeper-dist/src/assemble/bkctl.xml b/bookkeeper-dist/src/assemble/bkctl.xml index 668787e15aa..8ac26362e47 100644 --- a/bookkeeper-dist/src/assemble/bkctl.xml +++ b/bookkeeper-dist/src/assemble/bkctl.xml @@ -1,3 +1,4 @@ + - + bin tar.gz @@ -25,7 +24,7 @@ target - + ${project.artifactId}-${project.version}.jar @@ -78,18 +77,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-bkctl.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-bkctl.bin.txt - + NOTICE 644 @@ -105,10 +104,10 @@ com.google.code.findbugs:jsr305 - org.apache.bookkeeper:stream-storage-common - org.apache.bookkeeper:stream-storage-proto - org.apache.bookkeeper:stream-storage-api - org.apache.bookkeeper:stream-storage-java-client-base + io.streamnative:stream-storage-common + io.streamnative:stream-storage-proto + io.streamnative:stream-storage-api + io.streamnative:stream-storage-java-client-base org.codehaus.mojo:animal-sniffer-annotations org.rocksdb:rocksdbjni diff --git a/bookkeeper-dist/src/assemble/src.xml b/bookkeeper-dist/src/assemble/src.xml index cb61be4c726..baf32c210b6 100644 --- a/bookkeeper-dist/src/assemble/src.xml +++ b/bookkeeper-dist/src/assemble/src.xml @@ -1,3 +1,4 @@ + - + src tar.gz diff --git a/bookkeeper-http/http-server/pom.xml b/bookkeeper-http/http-server/pom.xml index 477d5862723..b17780d15b5 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.14.8-SNAPSHOT - ../.. - - 4.0.0 - org.apache.bookkeeper.http - servlet-http-server - Apache BookKeeper :: Bookkeeper Http :: Servlet Http Server - http://maven.apache.org - - - - org.apache.bookkeeper.http - http-server - ${project.version} - - - javax.servlet - javax.servlet-api - - - commons-io - commons-io - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - - - + + bookkeeper + io.streamnative + 4.14.8.1 + ../.. + + 4.0.0 + io.streamnative.http + servlet-http-server + Apache BookKeeper :: Bookkeeper Http :: Servlet Http Server + http://maven.apache.org + + + io.streamnative.http + http-server + ${project.version} + + + javax.servlet + javax.servlet-api + + + commons-io + commons-io + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-webapp + test + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + + + diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index f9d8e98931f..e0f921360a5 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.bookkeeper + io.streamnative bookkeeper-common ${project.parent.version} test-jar test - org.apache.kerby - kerby-config - ${kerby.version} - test - - - org.slf4j - * - - + org.apache.kerby + kerby-config + ${kerby.version} + test + + + org.slf4j + * + + - org.apache.kerby - kerb-simplekdc - ${kerby.version} - test - - - org.slf4j - * - - + org.apache.kerby + kerb-simplekdc + ${kerby.version} + test + + + org.slf4j + * + + org.apache.zookeeper @@ -155,25 +155,25 @@ test - - org.xerial.snappy - snappy-java - test + + org.xerial.snappy + snappy-java + test - - io.dropwizard.metrics - metrics-core - test + + io.dropwizard.metrics + metrics-core + test - org.apache.bookkeeper.stats + io.streamnative.stats prometheus-metrics-provider ${project.parent.version} test - org.apache.bookkeeper.http + io.streamnative.http vertx-http-server ${project.parent.version} test @@ -196,6 +196,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + @@ -273,7 +283,7 @@ vertx-http-server - org.apache.bookkeeper.http + io.streamnative.http vertx-http-server ${project.parent.version} diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 63a2e169f94..6d3575f3286 100644 --- a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml +++ b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml @@ -1,4 +1,4 @@ - + - bookkeeper - org.apache.bookkeeper - 4.14.8-SNAPSHOT + io.streamnative + 4.14.8.1 4.0.0 bookkeeper-stats-providers @@ -29,5 +29,4 @@ codahale-metrics-provider prometheus-metrics-provider - diff --git a/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index bbe59505407..41c80999aab 100644 --- a/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml @@ -1,4 +1,4 @@ - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + IMPORT CHECKS - - - - + --> + + + + - - - - + + + + + + + - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - + + + + } else --> - else --> - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + diff --git a/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml index da6867c132d..0d1098550f1 100644 --- a/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml +++ b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml @@ -1,3 +1,4 @@ + - + - + - + - + - + - + @@ -51,270 +52,263 @@ - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - - + - + - + - + - + - - - + - - + - + - - + - - + - - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - - - + + + - + - - + + - - + + diff --git a/buildtools/src/main/resources/bookkeeper/suppressions.xml b/buildtools/src/main/resources/bookkeeper/suppressions.xml index a0be7b3e03d..ea39a6b2af4 100644 --- a/buildtools/src/main/resources/bookkeeper/suppressions.xml +++ b/buildtools/src/main/resources/bookkeeper/suppressions.xml @@ -1,4 +1,4 @@ - + - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/buildtools/src/main/resources/distributedlog/findbugsExclude.xml b/buildtools/src/main/resources/distributedlog/findbugsExclude.xml index f85686fcb75..c65a7a45b3a 100644 --- a/buildtools/src/main/resources/distributedlog/findbugsExclude.xml +++ b/buildtools/src/main/resources/distributedlog/findbugsExclude.xml @@ -1,3 +1,4 @@ + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - - - + + + - + - - + + - - + + diff --git a/buildtools/src/main/resources/distributedlog/suppressions.xml b/buildtools/src/main/resources/distributedlog/suppressions.xml index 6ee57b1b740..f756d7a3df1 100644 --- a/buildtools/src/main/resources/distributedlog/suppressions.xml +++ b/buildtools/src/main/resources/distributedlog/suppressions.xml @@ -1,4 +1,4 @@ - + - - + @@ -25,11 +22,9 @@ - - - - + + + - diff --git a/buildtools/src/main/resources/ide/eclipse/formatter.xml b/buildtools/src/main/resources/ide/eclipse/formatter.xml index 01b73dcd996..3112ecea7d1 100644 --- a/buildtools/src/main/resources/ide/eclipse/formatter.xml +++ b/buildtools/src/main/resources/ide/eclipse/formatter.xml @@ -1,286 +1,285 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index c3ddfb14a18..5235c60a09c 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -1,4 +1,4 @@ - + - com/scurrilous/circe/checksum/NarSystem* - + + + com/scurrilous/circe/checksum/NarSystem* + - + - jdk-without-javah - [10,) + [10,) @@ -129,36 +121,36 @@ ${nar-maven-plugin.version} true - - - default-nar-javah - none - - + default-nar-javah + none + + - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - - -h - ${project.build.directory}/nar/javah-include - - + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + -Xlint:deprecation + -Xlint:unchecked + + -Xpkginfo:always + + -h + ${project.build.directory}/nar/javah-include + + - - + + mac @@ -232,5 +224,4 @@ - diff --git a/circe-checksum/src/main/assembly/assembly.xml b/circe-checksum/src/main/assembly/assembly.xml index 432c1ac4282..c1cbed2d829 100644 --- a/circe-checksum/src/main/assembly/assembly.xml +++ b/circe-checksum/src/main/assembly/assembly.xml @@ -1,4 +1,4 @@ - + jdk-without-javah - [10,) + [10,) @@ -118,36 +114,36 @@ ${nar-maven-plugin.version} true - - - default-nar-javah - none - - + default-nar-javah + none + + - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - -Xlint:deprecation - -Xlint:unchecked - - -Xpkginfo:always - - -h - ${project.build.directory}/nar/javah-include - - + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + -Xlint:deprecation + -Xlint:unchecked + + -Xpkginfo:always + + -h + ${project.build.directory}/nar/javah-include + + - - + + mac @@ -183,7 +179,6 @@ - Linux @@ -222,5 +217,4 @@ - diff --git a/cpu-affinity/src/main/assembly/assembly.xml b/cpu-affinity/src/main/assembly/assembly.xml index 377b97ff54e..60b7e12b623 100644 --- a/cpu-affinity/src/main/assembly/assembly.xml +++ b/cpu-affinity/src/main/assembly/assembly.xml @@ -1,4 +1,4 @@ - + - all - - jar - - - false - - - ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-MacOSX-gpp-jni/lib/${os.arch}-MacOSX-gpp/jni + all + + jar + + false + + + ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-MacOSX-gpp-jni/lib/${os.arch}-MacOSX-gpp/jni - lib - - lib* - - - - ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-Linux-gpp-jni/lib/${os.arch}-Linux-gpp/jni + lib + + lib* + + + + ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-Linux-gpp-jni/lib/${os.arch}-Linux-gpp/jni - lib - - lib* - - - - ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-${os.name}-gpp-jni/lib/${os.arch}-${os.name}-gpp/jni + lib + + lib* + + + + ${project.build.directory}/nar/${project.artifactId}-${project.version}-${os.arch}-${os.name}-gpp-jni/lib/${os.arch}-${os.name}-gpp/jni - lib - - lib* - - - - ${project.build.directory}/classes - - - **/* - - - + lib + + lib* + + + + ${project.build.directory}/classes + + + **/* + + + diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml index ce500e59f00..e583799c6ad 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.bookkeeper.metadata.drivers + io.streamnative.metadata.drivers metadata-drivers-parent - 4.14.8-SNAPSHOT + 4.14.8.1 .. 4.0.0 - org.apache.bookkeeper.metadata.drivers + io.streamnative.metadata.drivers metadata-stores-etcd Apache BookKeeper :: Metadata Drivers:: Etcd - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} - io.etcd jetcd-core @@ -44,7 +43,6 @@ - io.grpc grpc-all @@ -68,7 +66,6 @@ - org.arquillian.cube arquillian-cube-docker @@ -99,21 +96,20 @@ test - org.apache.bookkeeper + io.streamnative bookkeeper-common ${project.version} test-jar test - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} test-jar test - @@ -128,9 +124,32 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + - integrationTests diff --git a/metadata-drivers/etcd/src/test/resources/log4j2.xml b/metadata-drivers/etcd/src/test/resources/log4j2.xml index 184f58487ea..9e12d754fe7 100644 --- a/metadata-drivers/etcd/src/test/resources/log4j2.xml +++ b/metadata-drivers/etcd/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/metadata-drivers/pom.xml b/metadata-drivers/pom.xml index 177a0786e98..b3831b1a318 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.14.8-SNAPSHOT - - 4.0.0 - org.apache.bookkeeper.metadata.drivers - metadata-drivers-parent - pom - Apache BookKeeper :: Metadata Drivers :: Parent - - etcd - + + bookkeeper + io.streamnative + 4.14.8.1 + + 4.0.0 + io.streamnative.metadata.drivers + metadata-drivers-parent + pom + Apache BookKeeper :: Metadata Drivers :: Parent + + etcd + diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index b3d9e9889dd..318b88e471a 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 + 4.0.0 - org.apache.bookkeeper + io.streamnative bookkeeper - 4.14.8-SNAPSHOT + 4.14.8.1 microbenchmarks Apache BookKeeper :: microbenchmarks @@ -47,19 +47,19 @@ log4j-over-slf4j - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.parent.version} compile jar - org.apache.bookkeeper.stats + io.streamnative.stats prometheus-metrics-provider ${project.version} - org.apache.bookkeeper.stats + io.streamnative.stats codahale-metrics-provider ${project.version} @@ -116,6 +116,30 @@ true + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/pom.xml b/pom.xml index ea7de1553d5..b8107eb6c4f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + - org.apache @@ -22,8 +22,8 @@ 19 4.0.0 - org.apache.bookkeeper - 4.14.8-SNAPSHOT + io.streamnative + 4.14.8.1 bookkeeper pom Apache BookKeeper :: Parent @@ -37,9 +37,9 @@ - scm:git:https://github.com/apache/bookkeeper.git - scm:git:https://github.com/apache/bookkeeper.git - https://github.com/apache/bookkeeper + scm:git:https://github.com/streamnative/bookkeeper.git + scm:git:ssh://git@github.com:streamnative/bookkeeper.git + https://github.com/streamnative/bookkeeper branch-4.14 @@ -111,7 +111,6 @@ true 2 src/main/java - 1.18.2 1.6.0.Final @@ -201,7 +200,6 @@ 4.0.0 4.0.3 - @@ -237,7 +235,6 @@ ${freebuilder.version} true - org.slf4j @@ -254,7 +251,6 @@ log4j-over-slf4j ${slf4j.version} - commons-cli @@ -313,28 +309,24 @@ reflections ${reflections.version} - net.jpountz.lz4 lz4 ${lz4.version} - net.java.dev.jna jna ${jna.version} - org.yaml snakeyaml ${snakeyaml.version} - com.fasterxml.jackson.core @@ -366,7 +358,6 @@ jackson-module-scala_2.11 ${jackson.version} - com.google.protobuf @@ -378,7 +369,6 @@ protobuf-java-util ${protobuf.version} - org.apache.thrift @@ -395,7 +385,6 @@ - io.netty @@ -468,7 +457,6 @@ netty-tcnative-boringssl-static ${netty-boringssl.version} - io.grpc @@ -477,14 +465,12 @@ pom import - org.rocksdb rocksdbjni ${rocksdb.version} - org.apache.zookeeper @@ -537,14 +523,12 @@ - - - org.xerial.snappy - snappy-java - ${snappy.version} + + org.xerial.snappy + snappy-java + ${snappy.version} - org.apache.curator @@ -557,7 +541,6 @@ - io.vertx @@ -598,21 +581,18 @@ jetty-servlet ${jetty.version} - org.jctools jctools-core ${jctools.version} - io.dropwizard.metrics metrics-core ${dropwizard.version} - io.dropwizard.metrics @@ -646,28 +626,24 @@ sketches-core ${datasketches.version} - org.apache.httpcomponents httpclient ${httpclient.version} - com.beust jcommander ${jcommander.version} - org.hdrhistogram HdrHistogram ${hdrhistogram.version} - junit @@ -753,7 +729,6 @@ testcontainers ${testcontainers.version} - org.openjdk.jmh @@ -767,7 +742,6 @@ - @@ -781,7 +755,6 @@ spotbugs-annotations provided - org.slf4j @@ -791,14 +764,14 @@ commons-configuration commons-configuration - junit junit test - + + org.hamcrest hamcrest-all test @@ -824,7 +797,6 @@ test - ${src.dir} @@ -866,6 +838,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + @@ -889,7 +871,7 @@ -Xlint:unchecked -Xpkginfo:always - + @@ -972,25 +954,20 @@ **/.idea/** - .git/**/* .github/**/* **/.gitignore - **/.svn/**/* - **/target/**/* - **/README.md **/README.rst **/apidocs/* **/src/main/resources/deps/** **/META-INF/** - **/.classpath **/.project @@ -999,26 +976,19 @@ **/*.iml **/*.iws **/*.ipr - .repository/** - site/** site2/** - **/org/apache/distributedlog/thrift/* - **/*.log - data/** - dev/.vagrant/** - **/proto/**.py @@ -1033,13 +1003,35 @@ **/__pycache__/** **/bookkeeper.egg-info/** **/pip-selfcheck.json - **/test_conf_2.conf + **/dependency-reduced-pom.xml true + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.0-M1 + + true + false + release + deploy + + @@ -1112,7 +1104,7 @@ ${project.basedir}/src/main/java ${project.build.directory}/generated-sources/delombok - + @@ -1121,7 +1113,6 @@ - dev @@ -1195,5 +1186,40 @@ + + release-sign-artifacts + + + performRelease + true + + + + + + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/shaded/bookkeeper-server-shaded/pom.xml b/shaded/bookkeeper-server-shaded/pom.xml index 024d7466bc1..8ff00954507 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -1,4 +1,4 @@ - + - org.xerial.snappy - snappy-java - test + + org.xerial.snappy + snappy-java + test - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} test-jar test + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + + + diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 8c9fd36ab7b..809b8a22129 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -1,4 +1,4 @@ - + - org.xerial.snappy - snappy-java - test + + org.xerial.snappy + snappy-java + test - - io.dropwizard.metrics - metrics-core - test + + io.dropwizard.metrics + metrics-core + test @@ -97,6 +97,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 6689e107d5d..ccd89723bc2 100644 --- a/stream/distributedlog/io/dlfs/pom.xml +++ b/stream/distributedlog/io/dlfs/pom.xml @@ -1,4 +1,4 @@ - + - org.xerial.snappy - snappy-java - test + + org.xerial.snappy + snappy-java + test - - io.dropwizard.metrics - metrics-core - test + + io.dropwizard.metrics + metrics-core + test @@ -98,6 +98,30 @@ com.github.spotbugs spotbugs-maven-plugin + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index bb9cd75ef3f..aa770188e95 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -1,3 +1,4 @@ + - - org.apache.distributedlog + io.streamnative distributedlog - 4.14.8-SNAPSHOT + 4.14.8.1 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index c655c80c403..2c5c3257e8f 100644 --- a/stream/distributedlog/pom.xml +++ b/stream/distributedlog/pom.xml @@ -1,4 +1,4 @@ - + - org.xerial.snappy - snappy-java - runtime + + + org.xerial.snappy + snappy-java + runtime - - io.dropwizard.metrics - metrics-core - runtime + + io.dropwizard.metrics + metrics-core + runtime - @@ -72,6 +70,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + diff --git a/stream/src/main/resources/distributedlog/findbugsExclude.xml b/stream/src/main/resources/distributedlog/findbugsExclude.xml index 00134767436..77a769b62ce 100644 --- a/stream/src/main/resources/distributedlog/findbugsExclude.xml +++ b/stream/src/main/resources/distributedlog/findbugsExclude.xml @@ -1,3 +1,4 @@ + - + - + - + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - - - + + + - + - - + + - - + + - - + + diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml index 7be04855c7e..4a73606c72a 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 - stream-storage-parent - org.apache.bookkeeper - 4.14.8-SNAPSHOT + io.streamnative + 4.14.8.1 .. - org.apache.bookkeeper + io.streamnative statelib Apache BookKeeper :: Stream Storage :: State Library - org.apache.distributedlog + io.streamnative distributedlog-core ${project.parent.version} - org.apache.bookkeeper + io.streamnative bookkeeper-common ${project.parent.version} - org.apache.bookkeeper + io.streamnative stream-storage-common ${project.parent.version} - org.apache.bookkeeper + io.streamnative stream-storage-api ${project.parent.version} - org.apache.bookkeeper + io.streamnative stream-storage-proto ${project.parent.version} @@ -66,12 +65,11 @@ protobuf-java - org.apache.distributedlog + io.streamnative distributedlog-core ${project.parent.version} tests - org.apache.zookeeper @@ -124,21 +122,18 @@ - org.xerial.snappy snappy-java ${snappy.version} - io.dropwizard.metrics metrics-core ${dropwizard.version} - @@ -164,6 +159,30 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index 46f8c523f2d..b1b85fb02be 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - net.java.dev.javacc - javacc - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - log4j - log4j - - - io.netty - * - - - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - test-jar - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - log4j - log4j - - - io.netty - * - - - - - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - - - io.dropwizard.metrics - metrics-core - ${dropwizard.version} - - + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + net.java.dev.javacc + javacc + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + + log4j + log4j + + + io.netty + * + + + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + test-jar + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + + log4j + log4j + + + io.netty + * + + + + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + + io.dropwizard.metrics + metrics-core + ${dropwizard.version} + @@ -153,6 +148,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 862e837881c..3ce8d9f31f4 100644 --- a/stream/storage/pom.xml +++ b/stream/storage/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml index d2ce50577a3..e65e3883c33 100644 --- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml +++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml index e48a14067f4..84f3e3d4590 100644 --- a/tests/backward-compat/hostname-bookieid/pom.xml +++ b/tests/backward-compat/hostname-bookieid/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml index 7442d8ab072..f3e66496c6c 100644 --- a/tests/backward-compat/old-cookie-new-cluster/pom.xml +++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml index dd4d94fe93c..167a283155d 100644 --- a/tests/backward-compat/pom.xml +++ b/tests/backward-compat/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml index bd609e2d4a3..0f4e64bc771 100644 --- a/tests/backward-compat/upgrade-direct/pom.xml +++ b/tests/backward-compat/upgrade-direct/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml index cc706c6f7e9..d57e88a051b 100644 --- a/tests/backward-compat/upgrade/pom.xml +++ b/tests/backward-compat/upgrade/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml index b113561608a..083d4359e1f 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/docker-images/all-released-versions-image/pom.xml b/tests/docker-images/all-released-versions-image/pom.xml index f565cef28a5..5173892669f 100644 --- a/tests/docker-images/all-released-versions-image/pom.xml +++ b/tests/docker-images/all-released-versions-image/pom.xml @@ -1,3 +1,4 @@ + - - org.apache.bookkeeper.tests + io.streamnative.tests docker-images - 4.14.8-SNAPSHOT + 4.14.8.1 4.0.0 - org.apache.bookkeeper.tests + io.streamnative.tests all-released-versions-image Apache BookKeeper :: Tests :: Docker Images :: All Released Versions pom diff --git a/tests/docker-images/all-versions-image/pom.xml b/tests/docker-images/all-versions-image/pom.xml index dd226471b91..9aa980c4a78 100644 --- a/tests/docker-images/all-versions-image/pom.xml +++ b/tests/docker-images/all-versions-image/pom.xml @@ -1,3 +1,4 @@ + - - org.apache.bookkeeper.tests + io.streamnative.tests docker-images - 4.14.8-SNAPSHOT + 4.14.8.1 4.0.0 - org.apache.bookkeeper.tests + io.streamnative.tests all-versions-image Apache BookKeeper :: Tests :: Docker Images :: All Versions pom - org.apache.bookkeeper.tests + io.streamnative.tests all-released-versions-image ${project.parent.version} pom - - org.apache.bookkeeper + io.streamnative bookkeeper-dist-server ${project.parent.version} bin diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml index 3723bd2f040..afd4a10f7b0 100644 --- a/tests/docker-images/current-version-image/pom.xml +++ b/tests/docker-images/current-version-image/pom.xml @@ -1,3 +1,4 @@ + - - org.apache.bookkeeper.tests + io.streamnative.tests docker-images - 4.14.8-SNAPSHOT + 4.14.8.1 4.0.0 - org.apache.bookkeeper.tests + io.streamnative.tests current-version-image Apache BookKeeper :: Tests :: Docker Images :: Current Version pom - org.apache.bookkeeper + io.streamnative bookkeeper-dist-server ${project.parent.version} bin @@ -79,11 +79,11 @@ copy python wheel file - - + + copying docker scripts - - + + diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml index d49da9f60e6..167d0ea0930 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -1,4 +1,4 @@ - + - - + CUBE cube-definitions/3-node-all-version-unstarted.yaml - diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml index 42b2e4b2421..6361e647c61 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.bookkeeper + io.streamnative bookkeeper-server - org.apache.bookkeeper.http + io.streamnative.http bookkeeper-http - org.apache.bookkeeper + io.streamnative circe-checksum - org.apache.distributedlog + io.streamnative distributedlog-core - org.apache.distributedlog + io.streamnative distributedlog-common - org.apache.distributedlog + io.streamnative distributedlog-protocol @@ -77,6 +77,30 @@ com.github.spotbugs spotbugs-maven-plugin + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index 7b23f9cf4ad..6841cdda405 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -1,4 +1,4 @@ - +