diff --git a/bookkeeper-benchmark/conf/log4j2.xml b/bookkeeper-benchmark/conf/log4j2.xml index 21257d6dc3a..3f4f18768bd 100644 --- a/bookkeeper-benchmark/conf/log4j2.xml +++ b/bookkeeper-benchmark/conf/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index bdb82cb5647..faacfb9bcde 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 bookkeeper - org.apache.bookkeeper - 4.16.4-SNAPSHOT + io.streamnative + 4.16.4.1 - org.apache.bookkeeper + io.streamnative bookkeeper-benchmark Apache BookKeeper :: Benchmark @@ -40,16 +39,40 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + - org.apache.bookkeeper + io.streamnative bookkeeper-server ${project.version} - org.apache.bookkeeper + io.streamnative testtools ${project.parent.version} test @@ -61,26 +84,26 @@ 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-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 eac95eef2ec..9d402b7b6b0 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} @@ -57,70 +54,61 @@ - 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.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 +140,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 222a9192c67..a1988084b01 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} @@ -45,7 +44,6 @@ - @@ -77,6 +75,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 892b185044f..fbc0a103bfe 100644 --- a/bookkeeper-dist/pom.xml +++ b/bookkeeper-dist/pom.xml @@ -1,3 +1,4 @@ + - bookkeeper - org.apache.bookkeeper - 4.16.4-SNAPSHOT + io.streamnative + 4.16.4.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 52c40121ba3..818f62167cc 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.xerial.snappy - snappy-java + + org.xerial.snappy + snappy-java - - io.dropwizard.metrics - metrics-core + + io.dropwizard.metrics + metrics-core - @@ -126,7 +118,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 60bc2ca1536..77b94bddc4a 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 @@ -80,18 +79,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-all.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-all.bin.txt - + NOTICE 644 @@ -106,11 +105,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 0c951adbedb..7c49e950c05 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 @@ -65,18 +64,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-server.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-server.bin.txt - + NOTICE 644 @@ -92,11 +91,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 623b56e505e..72211a63fc3 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 @@ -82,18 +81,18 @@ ../../README.md - + 644 ../src/main/resources/LICENSE-bkctl.bin.txt - + LICENSE 644 ../src/main/resources/NOTICE-bkctl.bin.txt - + NOTICE 644 @@ -109,10 +108,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 94cf8dc347f..adc50e21bab 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 b8923105be2..605aa5cb681 100644 --- a/bookkeeper-http/http-server/pom.xml +++ b/bookkeeper-http/http-server/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.16.4-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.16.4.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 f2601e5a953..0336838feff 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 @@ -200,19 +200,19 @@ test - - org.junit.jupiter - junit-jupiter-api - test + + org.junit.jupiter + junit-jupiter-api + 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 @@ -235,6 +235,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + @@ -312,7 +322,7 @@ vertx-http-server - org.apache.bookkeeper.http + io.streamnative.http vertx-http-server ${project.parent.version} diff --git a/bookkeeper-server/src/main/resources/log4j2.xml b/bookkeeper-server/src/main/resources/log4j2.xml index 3e3e4bc8c8e..f83e046988e 100644 --- a/bookkeeper-server/src/main/resources/log4j2.xml +++ b/bookkeeper-server/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/bookkeeper-slogger/api/pom.xml b/bookkeeper-slogger/api/pom.xml index 8d936a5f844..fe1ed7809f2 100644 --- a/bookkeeper-slogger/api/pom.xml +++ b/bookkeeper-slogger/api/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - bookkeeper-slogger-parent - org.apache.bookkeeper - 4.16.4-SNAPSHOT - .. - - org.apache.bookkeeper - bookkeeper-slogger-api - Apache BookKeeper :: Structured Logger :: API + 4.0.0 + + bookkeeper-slogger-parent + io.streamnative + 4.16.4.1 + .. + + io.streamnative + bookkeeper-slogger-api + Apache BookKeeper :: Structured Logger :: API + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + + + diff --git a/bookkeeper-slogger/pom.xml b/bookkeeper-slogger/pom.xml index ddb67bf6d28..388f8ea8e40 100644 --- a/bookkeeper-slogger/pom.xml +++ b/bookkeeper-slogger/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - org.apache.bookkeeper - bookkeeper - 4.16.4-SNAPSHOT - .. - - pom - org.apache.bookkeeper - bookkeeper-slogger-parent - Apache BookKeeper :: Structured Logger :: Parent - - - api - slf4j - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - + 4.0.0 + + io.streamnative + bookkeeper + 4.16.4.1 + .. + + pom + io.streamnative + bookkeeper-slogger-parent + Apache BookKeeper :: Structured Logger :: Parent + + api + slf4j + + + + + com.github.spotbugs + spotbugs-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + + diff --git a/bookkeeper-slogger/slf4j/pom.xml b/bookkeeper-slogger/slf4j/pom.xml index 34d25cb1610..25a510d6a1b 100644 --- a/bookkeeper-slogger/slf4j/pom.xml +++ b/bookkeeper-slogger/slf4j/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - bookkeeper-slogger-parent - org.apache.bookkeeper - 4.16.4-SNAPSHOT - .. - - org.apache.bookkeeper - bookkeeper-slogger-slf4j - Apache BookKeeper :: Structured Logger :: SLF4J Implementation - - - org.apache.bookkeeper - bookkeeper-slogger-api - ${project.parent.version} - - + 4.0.0 + + bookkeeper-slogger-parent + io.streamnative + 4.16.4.1 + .. + + io.streamnative + bookkeeper-slogger-slf4j + Apache BookKeeper :: Structured Logger :: SLF4J Implementation + + + io.streamnative + bookkeeper-slogger-api + ${project.parent.version} + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + package + + jar + + + + javadoc-jar + package + + jar + + + javadoc + + + + + + diff --git a/buildtools/pom.xml b/buildtools/pom.xml index f29f77df900..3bfddbd2841 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -1,4 +1,4 @@ - + - - + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + } else --> - else --> - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - + + + + diff --git a/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml index dec4118b58a..619fe79c1a3 100644 --- a/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml +++ b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml @@ -1,3 +1,4 @@ + - + - + - + - + - + - + @@ -61,275 +62,268 @@ - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - - + - + - + - + - + - - - + - - + - + - - + - - + - - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - - - + + + - + - + - - + + - - + + diff --git a/buildtools/src/main/resources/bookkeeper/suppressions.xml b/buildtools/src/main/resources/bookkeeper/suppressions.xml index ecec0a1e788..66c1ac2a596 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 c4ba2cd1273..ea0f35899fb 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/buildtools/src/main/resources/log4j2.xml b/buildtools/src/main/resources/log4j2.xml index 050035d8002..eb3c276bd4f 100644 --- a/buildtools/src/main/resources/log4j2.xml +++ b/buildtools/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 54a46d99abb..fb88098071b 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,) @@ -141,27 +133,27 @@ nar-maven-plugin true - - - default-nar-javah - none - - + default-nar-javah + none + + - org.apache.maven.plugins - maven-compiler-plugin - - - - -h - ${project.build.directory}/nar/javah-include - - + org.apache.maven.plugins + maven-compiler-plugin + + + + -h + ${project.build.directory}/nar/javah-include + + - - + + mac @@ -230,5 +222,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 @@ - + - - . - bookkeeper-server.log - INFO - CONSOLE - - - - - - - - - - - - - - - - - - - - - - - - - + + . + bookkeeper-server.log + INFO + CONSOLE + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/log4j2.shell.xml b/conf/log4j2.shell.xml index 7c15d5d6cfa..7f52f6f7db4 100644 --- a/conf/log4j2.shell.xml +++ b/conf/log4j2.shell.xml @@ -1,4 +1,4 @@ - + - - INFO - CONSOLE - - - - - - - - - - - - - - - - - + + INFO + CONSOLE + + + + + + + + + + + + + + + + + diff --git a/conf/log4j2.xml b/conf/log4j2.xml index 08d5d5613c1..1fc8fe255bd 100644 --- a/conf/log4j2.xml +++ b/conf/log4j2.xml @@ -1,4 +1,4 @@ - + - - . - bookkeeper-server.log - INFO - CONSOLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + . + bookkeeper-server.log + INFO + CONSOLE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 1ff2c12b73e..db8b5e43038 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -1,3 +1,4 @@ + jdk-without-javah - [10,) + [10,) @@ -106,27 +102,27 @@ ${nar-maven-plugin.version} true - - - default-nar-javah - none - - + default-nar-javah + none + + - org.apache.maven.plugins - maven-compiler-plugin - - - - -h - ${project.build.directory}/nar/javah-include - - + org.apache.maven.plugins + maven-compiler-plugin + + + + -h + ${project.build.directory}/nar/javah-include + + - - + + mac @@ -162,7 +158,6 @@ - Linux @@ -238,5 +233,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 a85f033d7d9..6aff25d89ea 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.16.4-SNAPSHOT + 4.16.4.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,27 +96,26 @@ test - org.apache.bookkeeper + io.streamnative testtools ${project.parent.version} 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 - @@ -134,9 +130,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/pom.xml b/metadata-drivers/pom.xml index 5c2a0748225..d98c2ac59db 100644 --- a/metadata-drivers/pom.xml +++ b/metadata-drivers/pom.xml @@ -1,4 +1,4 @@ - + - - bookkeeper - org.apache.bookkeeper - 4.16.4-SNAPSHOT - - 4.0.0 - org.apache.bookkeeper.metadata.drivers - metadata-drivers-parent - pom - Apache BookKeeper :: Metadata Drivers :: Parent - - etcd - + + bookkeeper + io.streamnative + 4.16.4.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 5aebdd2ef3f..66b3281c9d9 100644 --- a/microbenchmarks/pom.xml +++ b/microbenchmarks/pom.xml @@ -1,4 +1,4 @@ - + jdk-without-javah - [10,) + [10,) @@ -97,27 +93,27 @@ ${nar-maven-plugin.version} true - - - default-nar-javah - none - - + default-nar-javah + none + + - org.apache.maven.plugins - maven-compiler-plugin - - - - -h - ${project.build.directory}/nar/javah-include - - + org.apache.maven.plugins + maven-compiler-plugin + + + + -h + ${project.build.directory}/nar/javah-include + + - - + + mac @@ -153,7 +149,6 @@ - Linux @@ -229,5 +224,4 @@ - diff --git a/native-io/src/main/assembly/assembly.xml b/native-io/src/main/assembly/assembly.xml index 377b97ff54e..60b7e12b623 100644 --- a/native-io/src/main/assembly/assembly.xml +++ b/native-io/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/pom.xml b/pom.xml index 25c40ef7153..f9f2c34473b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + - org.apache @@ -22,8 +22,8 @@ 26 4.0.0 - org.apache.bookkeeper - 4.16.4-SNAPSHOT + io.streamnative + 4.16.4.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.16 @@ -112,8 +112,7 @@ true 2 src/main/java - - + 1.18.2 1.8.0.Final @@ -214,7 +213,6 @@ http://archive.ubuntu.com/ubuntu/ http://security.ubuntu.com/ubuntu/ - @@ -249,7 +247,6 @@ freebuilder ${freebuilder.version} - org.slf4j @@ -266,7 +263,6 @@ log4j-slf4j-impl ${log4j.version} - commons-cli @@ -325,21 +321,18 @@ reflections ${reflections.version} - net.jpountz.lz4 lz4 ${lz4.version} - org.yaml snakeyaml ${snakeyaml.version} - com.fasterxml.jackson @@ -348,13 +341,11 @@ pom import - javax.servlet javax.servlet-api ${servlet-api.version} - com.google.protobuf @@ -366,7 +357,6 @@ protobuf-java-util ${protobuf.version} - org.apache.thrift @@ -383,7 +373,6 @@ - io.netty @@ -478,7 +467,6 @@ ${netty-iouring.version} linux-aarch_64 - io.grpc @@ -487,14 +475,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 @@ -649,7 +629,6 @@ sketches-core ${datasketches.version} - org.apache.httpcomponents @@ -661,21 +640,18 @@ httpcore ${httpcore.version} - com.beust jcommander ${jcommander.version} - org.hdrhistogram HdrHistogram ${hdrhistogram.version} - junit @@ -800,7 +776,6 @@ jsoup ${jsoup.version} - org.openjdk.jmh @@ -812,14 +787,12 @@ jmh-generator-annprocess ${jmh.version} - io.reactivex.rxjava3 rxjava ${rxjava.version} - com.carrotsearch hppc @@ -827,7 +800,6 @@ - @@ -841,7 +813,6 @@ spotbugs-annotations provided - org.slf4j @@ -882,7 +853,8 @@ assertj-core test - + + org.hamcrest hamcrest-all test @@ -903,7 +875,6 @@ test - ${src.dir} @@ -970,6 +941,16 @@ none + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + @@ -1088,28 +1069,22 @@ dependency-reduced-pom.xml - **/.idea/** - .git/**/* .github/**/* **/.gitignore - **/.svn/**/* - **/target/**/* - **/README.md **/README.rst **/apidocs/* **/src/main/resources/deps/** **/META-INF/** - **/.classpath **/.project @@ -1120,30 +1095,22 @@ **/*.ipr **/.sdkmanrc - .repository/** - site/** site2/** site3/** - **/org/apache/distributedlog/thrift/* - **/*.log - **/*.json - data/** - dev/.vagrant/** - **/proto/**.py @@ -1157,9 +1124,9 @@ **/.pytest_cache/** **/__pycache__/** **/bookkeeper.egg-info/** - **/test_conf_2.conf + **/dependency-reduced-pom.xml true @@ -1174,6 +1141,28 @@ exec-maven-plugin ${exec-maven-plugin.version} + + 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 + + @@ -1308,7 +1297,7 @@ ${project.basedir}/src/main/java ${project.build.directory}/generated-sources/delombok - + @@ -1478,5 +1467,40 @@ ${env.UBUNTU_SECURITY_MIRROR} + + 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 6f531b0605f..5c6b46792c6 100644 --- a/shaded/bookkeeper-server-shaded/pom.xml +++ b/shaded/bookkeeper-server-shaded/pom.xml @@ -1,4 +1,4 @@ - + - - - - - + + + file name: jetcd-core-0.5.11.jar - ]]> - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15106 - - - + c85851ca3ea8128d480d3f75c568a37e64e8a77b + CVE-2020-15106 + + + file name: jetcd-core-0.5.11.jar - ]]> - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15112 - - - + c85851ca3ea8128d480d3f75c568a37e64e8a77b + CVE-2020-15112 + + + file name: jetcd-core-0.5.11.jar - ]]> - c85851ca3ea8128d480d3f75c568a37e64e8a77b - CVE-2020-15113 - - - - + c85851ca3ea8128d480d3f75c568a37e64e8a77b + CVE-2020-15113 + + + file name: jetcd-common-0.5.11.jar - ]]> - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15106 - - - + 6dac6efe035a2be9ba299fbf31be5f903401869f + CVE-2020-15106 + + + file name: jetcd-common-0.5.11.jar - ]]> - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15112 - - - + 6dac6efe035a2be9ba299fbf31be5f903401869f + CVE-2020-15112 + + + file name: jetcd-common-0.5.11.jar - ]]> - 6dac6efe035a2be9ba299fbf31be5f903401869f - CVE-2020-15113 - - - - + 6dac6efe035a2be9ba299fbf31be5f903401869f + CVE-2020-15113 + + + + file name: org.apache.bookkeeper.http:http-server:4.15.0-SNAPSHOT - ]]> - ^pkg:maven/org\.apache\.bookkeeper\.http/http\-server@.*$ - cpe:/a:apache:http_server - - - + ^pkg:maven/org\.apache\.bookkeeper\.http/http\-server@.*$ + cpe:/a:apache:http_server + + + file name: org.apache.bookkeeper.http:vertx-http-server:4.15.0-SNAPSHOT - ]]> - ^pkg:maven/org\.apache\.bookkeeper\.http/vertx\-http\-server@.*$ - CVE-2009-1890 - - - CVE-2021-43045 affects only .NET distro, see https://github.com/apache/avro/pull/1357 - org\.apache\.avro:.* - CVE-2021-43045 - - - CVE-2011-1797 FP, see https://github.com/jeremylong/DependencyCheck/issues/4154 - .*netty-tcnative-boringssl-static.*\.jar - CVE-2011-1797 - - - + ^pkg:maven/org\.apache\.bookkeeper\.http/vertx\-http\-server@.*$ + CVE-2009-1890 + + + CVE-2021-43045 affects only .NET distro, see https://github.com/apache/avro/pull/1357 + org\.apache\.avro:.* + CVE-2021-43045 + + + CVE-2011-1797 FP, see https://github.com/jeremylong/DependencyCheck/issues/4154 + .*netty-tcnative-boringssl-static.*\.jar + CVE-2011-1797 + + + False positive - ]]> - ^pkg:maven/io\.netty/netty\-tcnative\-classes@.*$ - cpe:/a:netty:netty - - - - + ^pkg:maven/io\.netty/netty\-tcnative\-classes@.*$ + cpe:/a:netty:netty + + + + file name: arquillian-cube-docker-1.18.2.jar - ]]> - ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ - cpe:/a:docker:docker - - - + ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ + cpe:/a:docker:docker + + + file name: arquillian-cube-docker-1.18.2.jar - ]]> - ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ - cpe:/a:redhat:docker - - - - - + ^pkg:maven/org\.arquillian\.cube/arquillian\-cube\-docker@.*$ + cpe:/a:redhat:docker + + + + + file name: zookeeper-3.8.0.jar - ]]> + e395c1d8a71557b7569cc6a83487b2e30e2e58fe CVE-2021-28164 - - + file name: zookeeper-3.8.0.jar - ]]> - e395c1d8a71557b7569cc6a83487b2e30e2e58fe - CVE-2021-28165 - + + e395c1d8a71557b7569cc6a83487b2e30e2e58fe + CVE-2021-28165 + - file name: zookeeper-3.8.0.jar - ]]> + e395c1d8a71557b7569cc6a83487b2e30e2e58fe CVE-2021-29425 - file name: zookeeper-3.8.0.jar - ]]> + e395c1d8a71557b7569cc6a83487b2e30e2e58fe CVE-2021-34429 - file name: zookeeper-prometheus-metrics-3.8.0.jar - ]]> + 849e8ece2845cb0185d721233906d487a7f1e4cf CVE-2021-28164 - file name: zookeeper-prometheus-metrics-3.8.0.jar - ]]> + 849e8ece2845cb0185d721233906d487a7f1e4cf CVE-2021-29425 - file name: zookeeper-prometheus-metrics-3.8.0.jar - ]]> + 849e8ece2845cb0185d721233906d487a7f1e4cf CVE-2021-34429 - file name: zookeeper-jute-3.8.0.jar - ]]> + 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 CVE-2021-28164 - file name: zookeeper-jute-3.8.0.jar - ]]> + 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 CVE-2021-28165 - file name: zookeeper-jute-3.8.0.jar - ]]> + 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 CVE-2021-29425 - file name: zookeeper-jute-3.8.0.jar - ]]> + 6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5 CVE-2021-34429 - file name: zookeeper-3.8.0-tests.jar - ]]> - 9b78a289a3aa34eb47fac8c432f664fc140387df - CVE-2021-28165 + + 9b78a289a3aa34eb47fac8c432f664fc140387df + CVE-2021-28165 - - - + + file name: google-http-client-gson-1.41.0.jar - ]]> - 1a754a5dd672218a2ac667d7ff2b28df7a5a240e - CVE-2022-25647 - - - - + 1a754a5dd672218a2ac667d7ff2b28df7a5a240e + CVE-2022-25647 + + + + file name: maven-settings-3.3.9.jar - ]]> - 68d4180c51468ae8f45869f8f9c569092262fcca - CVE-2021-26291 - - + + 68d4180c51468ae8f45869f8f9c569092262fcca + CVE-2021-26291 + fredsmith utils library is not used at all. CVE-2021-4277 is a false positive. CVE-2021-4277 - yaml_project is not used at all. Any CVEs reported for yaml_project are false positives. cpe:/a:yaml_project:yaml - - snakeyaml is not "fixing" CVE-2022-1471. - see: https://bitbucket.org/snakeyaml/snakeyaml/wiki/CVE%20&%20NIST.md + see: https://bitbucket.org/snakeyaml/snakeyaml/wiki/CVE%20&%20NIST.md https://bitbucket.org/snakeyaml/snakeyaml/issues/561/cve-2022-1471-vulnerability-in - ]]> + ^pkg:maven/org\.yaml/snakeyaml@.*$ CVE-2022-1471 - - file name: testng-7.5.jar - ]]> + 1416a607fae667c14e390b484e8d02b5824c0674 CVE-2022-4065 - \ No newline at end of file + diff --git a/stats/bookkeeper-stats-api/pom.xml b/stats/bookkeeper-stats-api/pom.xml index 5448b115681..07e28633c87 100644 --- a/stats/bookkeeper-stats-api/pom.xml +++ b/stats/bookkeeper-stats-api/pom.xml @@ -1,4 +1,4 @@ - + - bookkeeper-stats-parent - org.apache.bookkeeper.stats - 4.16.4-SNAPSHOT + io.streamnative.stats + 4.16.4.1 4.0.0 bookkeeper-stats-providers diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml index 0edc2704dbf..bceecdcd672 100644 --- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/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 9ee0082b776..3b5f7ca6fb1 100644 --- a/stream/clients/java/all/pom.xml +++ b/stream/clients/java/all/pom.xml @@ -1,4 +1,4 @@ - + - - logs - stream-storage-cli.log - INFO - CONSOLE - - - - - - - - - - - - - - - - - - - - - + + logs + stream-storage-cli.log + INFO + CONSOLE + + + + + + + + + + + + + + + + + + + + + diff --git a/stream/conf/log4j2.xml b/stream/conf/log4j2.xml index 006e4bf6975..dacb089384f 100644 --- a/stream/conf/log4j2.xml +++ b/stream/conf/log4j2.xml @@ -1,4 +1,4 @@ - + - - logs - stream-storage.log - INFO - CONSOLE - - - - - - - - - - - - - - - - - - - - - + + logs + stream-storage.log + INFO + CONSOLE + + + + + + + + + + + + + + + + + + + + + diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml index 07c00f7a9e6..62a97f32c55 100644 --- a/stream/distributedlog/common/pom.xml +++ b/stream/distributedlog/common/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 @@ -103,6 +103,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 798889e2cd2..e63ac370b94 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 @@ -106,6 +106,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 7d58702f080..0cf99f3ff4e 100644 --- a/stream/distributedlog/io/pom.xml +++ b/stream/distributedlog/io/pom.xml @@ -1,3 +1,4 @@ + - - org.apache.distributedlog + io.streamnative distributedlog - 4.16.4-SNAPSHOT + 4.16.4.1 4.0.0 distributedlog-io diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml index cf3b91a3c30..bdf9d729061 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 - org.apache.bookkeeper + io.streamnative testtools ${project.parent.version} test - @@ -78,6 +76,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 b0bc7706509..1f988925371 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.16.4-SNAPSHOT + io.streamnative + 4.16.4.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 @@ -82,23 +80,20 @@ zookeeper test-jar - org.xerial.snappy snappy-java ${snappy.version} - io.dropwizard.metrics metrics-core ${dropwizard.version} - - org.apache.bookkeeper + io.streamnative testtools ${project.parent.version} test @@ -128,6 +123,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 0d6d352cea6..08cdabea048 100644 --- a/stream/storage/api/pom.xml +++ b/stream/storage/api/pom.xml @@ -1,4 +1,4 @@ - + - org.apache.zookeeper - zookeeper - - - org.apache.zookeeper - zookeeper - test-jar - - - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - - - io.dropwizard.metrics - metrics-core - ${dropwizard.version} - - + org.apache.zookeeper + zookeeper + + + org.apache.zookeeper + zookeeper + test-jar + + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + + io.dropwizard.metrics + metrics-core + ${dropwizard.version} + @@ -117,6 +112,16 @@ test-jar + + javadoc-jar + package + + jar + + + javadoc + + diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml index be326a996f6..2e18937945b 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 dde37c87246..ca8255e71ab 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 befc066d751..957aad45baa 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 1241fc732a2..5f4a39281e5 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 090496e3d0f..e7f5b69a752 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 2f54fc1a24d..2116883986d 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 43e601d51b3..9303f7a6e09 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 3eebc908f3b..30806e7dffb 100644 --- a/tests/backward-compat/yahoo-custom-version/pom.xml +++ b/tests/backward-compat/yahoo-custom-version/pom.xml @@ -1,4 +1,4 @@ - + - - org.apache.bookkeeper.tests + io.streamnative.tests docker-images - 4.16.4-SNAPSHOT + 4.16.4.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 b6412edb755..a36d9475844 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.16.4-SNAPSHOT + 4.16.4.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 44d3faadab7..0e558032fed 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.16.4-SNAPSHOT + 4.16.4.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 30bb223f8d9..7a378efa132 100644 --- a/tests/docker-images/pom.xml +++ b/tests/docker-images/pom.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/tests/docker-images/statestore-image/conf/log4j2.shell.xml b/tests/docker-images/statestore-image/conf/log4j2.shell.xml index d2617157692..2c4592bddd9 100644 --- a/tests/docker-images/statestore-image/conf/log4j2.shell.xml +++ b/tests/docker-images/statestore-image/conf/log4j2.shell.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/tests/docker-images/statestore-image/conf/log4j2.xml b/tests/docker-images/statestore-image/conf/log4j2.xml index d2617157692..2c4592bddd9 100644 --- a/tests/docker-images/statestore-image/conf/log4j2.xml +++ b/tests/docker-images/statestore-image/conf/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml index 5a00d23d5b1..f39f88e4e57 100644 --- a/tests/integration-tests-base-groovy/pom.xml +++ b/tests/integration-tests-base-groovy/pom.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml index e9247a62720..0439bdfa4a6 100644 --- a/tests/integration/cluster/pom.xml +++ b/tests/integration/cluster/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 ff317d13516..5d8ab39fc47 100644 --- a/tests/integration/standalone/pom.xml +++ b/tests/integration/standalone/pom.xml @@ -1,4 +1,4 @@ - + 3.2.14 1.19 - shaded docker-images diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index 0efb891691c..329243567f0 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/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 @@ -82,6 +82,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 d510eba453c..8aa3a8f7186 100644 --- a/tests/shaded/pom.xml +++ b/tests/shaded/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - org.apache.bookkeeper - bookkeeper - 4.16.4-SNAPSHOT - - testtools - Apache BookKeeper :: Test Tools - 4.16.4-SNAPSHOT - - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl - - + 4.0.0 + + io.streamnative + bookkeeper + 4.16.4.1 + + testtools + Apache BookKeeper :: Test Tools + 4.16.4.1 + + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-slf4j-impl + + diff --git a/testtools/src/main/resources/log4j2.xml b/testtools/src/main/resources/log4j2.xml index 12f713a7b59..bff0e4df70c 100644 --- a/testtools/src/main/resources/log4j2.xml +++ b/testtools/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/tools/all/pom.xml b/tools/all/pom.xml index 28190a5f479..c598a37c5d5 100644 --- a/tools/all/pom.xml +++ b/tools/all/pom.xml @@ -1,4 +1,4 @@ - +