diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index fc7ed6f5d47..f147effc82f 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 bookkeeper - org.apache.bookkeeper + io.streamnative 4.15.0-SNAPSHOT - org.apache.bookkeeper + io.streamnative bookkeeper-benchmark Apache BookKeeper :: Benchmark @@ -50,32 +49,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 31315773665..092b0c68222 100644 --- a/bookkeeper-common-allocator/pom.xml +++ b/bookkeeper-common-allocator/pom.xml @@ -1,4 +1,4 @@ - + + test + org.apache.logging.log4j log4j-core ${log4j.version} - test + test + org.apache.logging.log4j log4j-slf4j-impl ${log4j.version} - test + test + diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml index 146dafa3271..f9a77cdfddb 100644 --- a/bookkeeper-dist/all/pom.xml +++ b/bookkeeper-dist/all/pom.xml @@ -1,3 +1,4 @@ + org.apache.bookkeeper.stats bookkeeper-stats-api ${project.version} - org.apache.bookkeeper.stats codahale-metrics-provider @@ -55,7 +52,6 @@ prometheus-metrics-provider ${project.version} - org.apache.bookkeeper.http @@ -67,36 +63,30 @@ vertx-http-server ${project.version} - - org.apache.bookkeeper + io.streamnative bookkeeper-tools ${project.version} - org.apache.distributedlog 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.apache.logging.log4j @@ -110,19 +100,17 @@ org.apache.logging.log4j log4j-slf4j-impl - - - org.xerial.snappy - snappy-java + + org.xerial.snappy + snappy-java - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - @@ -154,6 +142,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 8ac6545851e..0dc0279c70b 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,7 +43,6 @@ - org.apache.logging.log4j @@ -59,7 +57,6 @@ log4j-slf4j-impl - @@ -91,6 +88,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 5285131dbcb..1e1aac29af0 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -1,3 +1,4 @@ + - bookkeeper - org.apache.bookkeeper + io.streamnative 4.15.0-SNAPSHOT 4.0.0 @@ -65,6 +65,30 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml index 83777f5f342..f9002dec8d1 100644 --- a/bookkeeper-dist/server/pom.xml +++ b/bookkeeper-dist/server/pom.xml @@ -1,3 +1,4 @@ + org.apache.bookkeeper.stats @@ -49,7 +47,6 @@ prometheus-metrics-provider ${project.version} - org.apache.bookkeeper.http @@ -61,28 +58,24 @@ 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 distributedlog-core ${project.version} - org.apache.logging.log4j @@ -96,19 +89,17 @@ org.apache.logging.log4j log4j-slf4j-impl - - - org.xerial.snappy - snappy-java + + org.xerial.snappy + snappy-java - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - @@ -140,7 +131,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 9a7293588be..fe11d586753 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 fa734189cca..e13646f0871 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 e9cea875a4e..424e4817620 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 146061e28a4..7d9f73c16c8 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 044a5c02850..ba600fb4f6a 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.15.0-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.15.0-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 + + diff --git a/bookkeeper-http/vertx-http-server/pom.xml b/bookkeeper-http/vertx-http-server/pom.xml index c8914241361..4cb4acb6f7c 100644 --- a/bookkeeper-http/vertx-http-server/pom.xml +++ b/bookkeeper-http/vertx-http-server/pom.xml @@ -1,4 +1,4 @@ - + + test + org.apache.logging.log4j log4j-core ${log4j.version} - test + test + org.apache.logging.log4j log4j-slf4j-impl ${log4j.version} - test + test + org.apache.zookeeper @@ -76,10 +79,10 @@ netty-handler - io.netty - netty-transport-native-epoll - linux-x86_64 - + io.netty + netty-transport-native-epoll + linux-x86_64 + io.netty netty-tcnative-boringssl-static @@ -90,7 +93,7 @@ ${project.version} - org.apache.bookkeeper + io.streamnative circe-checksum ${project.version} @@ -132,35 +135,35 @@ - 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 @@ -169,16 +172,16 @@ 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 diff --git a/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml b/bookkeeper-stats-providers/codahale-metrics-provider/pom.xml index 7ba68aa96e2..b4f1198d130 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 + io.streamnative 4.15.0-SNAPSHOT 4.0.0 @@ -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 3dfe19c0b2a..c62f3a6b5ae 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 75fac546587..4e8e980e05b 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 20bfe459995..38bcafff1b3 100644 --- a/metadata-drivers/etcd/pom.xml +++ b/metadata-drivers/etcd/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.15.0-SNAPSHOT - - 4.0.0 - org.apache.bookkeeper.metadata.drivers - metadata-drivers-parent - pom - Apache BookKeeper :: Metadata Drivers :: Parent - - etcd - + + bookkeeper + io.streamnative + 4.15.0-SNAPSHOT + + 4.0.0 + org.apache.bookkeeper.metadata.drivers + metadata-drivers-parent + pom + Apache BookKeeper :: Metadata Drivers :: Parent + + etcd + diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml index dc0093954db..994094e2aef 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.15.0-SNAPSHOT @@ -55,7 +55,7 @@ log4j-slf4j-impl - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.parent.version} compile diff --git a/pom.xml b/pom.xml index cbcd017b950..c19fa1d3992 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + - org.apache @@ -22,7 +22,7 @@ 19 4.0.0 - org.apache.bookkeeper + io.streamnative 4.15.0-SNAPSHOT bookkeeper pom @@ -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.13 @@ -110,7 +110,6 @@ 1.8 true 2 - 1.18.2 1.6.0.Final @@ -199,7 +198,6 @@ 1 4.0.0 - @@ -235,7 +233,6 @@ ${freebuilder.version} true - org.slf4j @@ -257,7 +254,6 @@ log4j-slf4j-impl ${log4j.version} - commons-cli @@ -316,28 +312,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 @@ -369,14 +361,12 @@ jackson-module-scala_2.11 ${jackson.version} - com.google.protobuf protobuf-java ${protobuf.version} - org.apache.thrift @@ -393,7 +383,6 @@ - io.netty @@ -466,7 +455,6 @@ netty-tcnative-boringssl-static ${netty-boringssl.version} - io.grpc @@ -475,14 +463,12 @@ pom import - org.rocksdb rocksdbjni ${rocksdb.version} - org.apache.zookeeper @@ -535,14 +521,12 @@ - - - org.xerial.snappy - snappy-java - ${snappy.version} + + org.xerial.snappy + snappy-java + ${snappy.version} - org.apache.curator @@ -555,7 +539,6 @@ - io.vertx @@ -596,21 +579,18 @@ jetty-servlet ${jetty.version} - org.jctools jctools-core ${jctools.version} - io.dropwizard.metrics metrics-core ${dropwizard.version} - io.dropwizard.metrics @@ -644,28 +624,24 @@ sketches-core ${datasketches.version} - org.apache.httpcomponents httpclient ${httpclient.version} - com.beust jcommander ${jcommander.version} - org.hdrhistogram HdrHistogram ${hdrhistogram.version} - junit @@ -745,7 +721,6 @@ testcontainers ${testcontainers.version} - org.openjdk.jmh @@ -759,7 +734,6 @@ - @@ -773,7 +747,6 @@ spotbugs-annotations provided - org.slf4j @@ -783,14 +756,14 @@ commons-configuration commons-configuration - junit junit test - + + org.hamcrest hamcrest-all test @@ -821,7 +794,6 @@ test - @@ -862,6 +834,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + @@ -885,7 +867,7 @@ -Xlint:unchecked -Xpkginfo:always - + @@ -968,25 +950,20 @@ **/.idea/** - .git/**/* .github/**/* **/.gitignore - **/.svn/**/* - **/target/**/* - **/README.md **/README.rst **/apidocs/* **/src/main/resources/deps/** **/META-INF/** - **/.classpath **/.project @@ -995,26 +972,19 @@ **/*.iml **/*.iws **/*.ipr - .repository/** - site/** site2/** - **/org/apache/distributedlog/thrift/* - **/*.log - data/** - dev/.vagrant/** - **/proto/**.py @@ -1029,13 +999,75 @@ **/__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://oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + none + + + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.0-M1 + + true + false + release + deploy + + + + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + @@ -1079,7 +1111,6 @@ - dev @@ -1122,7 +1153,6 @@ - jdk11-no-spotbugs @@ -1130,17 +1160,16 @@ - - com.github.spotbugs - spotbugs-maven-plugin - - true - + + com.github.spotbugs + spotbugs-maven-plugin + + true + - apache-release @@ -1161,4 +1190,14 @@ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://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 0644f91bcf9..058adf20f33 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 diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml index 1aa66fd526a..832f9e94b4e 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 diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml index 31366ed9fc0..6e9c01cbfb2 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 diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml index 38572cb2e0b..ed7a751e6e4 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -1,3 +1,4 @@ + - org.apache.distributedlog diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index 2f77d0fc025..b9d64f01f74 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 - 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 d2466182dad..e82279e4415 100644 --- a/stream/statelib/pom.xml +++ b/stream/statelib/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 - stream-storage-parent - org.apache.bookkeeper + io.streamnative 4.15.0-SNAPSHOT .. - org.apache.bookkeeper + io.streamnative statelib Apache BookKeeper :: Stream Storage :: State Library @@ -34,22 +33,22 @@ ${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} @@ -71,7 +70,6 @@ ${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} - diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml index bc415e3e28b..a07ac13cd41 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} + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index 22e3eaf395d..68bf3fdceaf 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 a75736839c2..c97a0a68e17 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 28d64fce9c7..92d92e445ef 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 c7705c999cd..084e7c46be9 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 396840bb8f4..541edc457a4 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 c03d5686c38..2210b93b852 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 e8377df4e68..1d29eaf1064 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 6061316a0e7..561f78a048c 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 7abcbb03f75..6640b382201 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.15.0-SNAPSHOT 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 1eb92bb6d5c..388d243533f 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.15.0-SNAPSHOT 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 5e221904e3a..c8e251b7a35 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.15.0-SNAPSHOT 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 a337e91176a..efbb2d50f34 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 7a9cb5a4272..01a11240fbe 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.bookkeeper + io.streamnative bookkeeper-server @@ -45,7 +45,7 @@ bookkeeper-http - org.apache.bookkeeper + io.streamnative circe-checksum diff --git a/tests/shaded/pom.xml b/tests/shaded/pom.xml index f86a357115b..4f1e132cf8b 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -1,4 +1,4 @@ - +