Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/bkctl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ source ${BK_HOME}/bin/common.sh
source ${BK_HOME}/conf/bk_cli_env.sh

CLI_MODULE_PATH=tools/all
CLI_MODULE_NAME="(org.apache.bookkeeper-)?bookkeeper-tools"
CLI_MODULE_NAME="(com.ascentstream.bookkeeper-)?bookkeeper-tools"
CLI_MODULE_HOME=${BK_HOME}/${CLI_MODULE_PATH}

# find the module jar
Expand Down
2 changes: 1 addition & 1 deletion bin/bkperf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source ${BK_HOME}/bin/common.sh
source ${BK_HOME}/conf/bk_cli_env.sh

CLI_MODULE_PATH=tools/perf
CLI_MODULE_NAME="(org.apache.bookkeeper-)?bookkeeper-perf"
CLI_MODULE_NAME="(com.ascentstream.bookkeeper-)?bookkeeper-perf"
CLI_MODULE_HOME=${BK_HOME}/${CLI_MODULE_PATH}

# find the module jar
Expand Down
4 changes: 2 additions & 2 deletions bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ CLI_GC_OPTS=${CLI_GC_OPTS:-"${DEFAULT_CLI_GC_OPTS}"}
CLI_GC_LOGGING_OPTS=${CLI_GC_LOGGING_OPTS:-"${DEFAULT_CLI_GC_LOGGING_OPTS}"}

# module names
BOOKIE_SERVER_MODULE_NAME="(org.apache.bookkeeper-)?bookkeeper-server"
TABLE_SERVICE_MODULE_NAME="(org.apache.bookkeeper-)?stream-storage-server"
BOOKIE_SERVER_MODULE_NAME="(com.ascentstream.bookkeeper-)?bookkeeper-server"
TABLE_SERVICE_MODULE_NAME="(com.ascentstream.bookkeeper-)?stream-storage-server"

is_released_binary() {
if [ -d ${BK_HOME}/lib ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/dlog
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BK_HOME=`cd ${BINDIR}/..;pwd`

source ${BK_HOME}/bin/common.sh

DLOG_MODULE_NAME="(org.apache.distributedlog-)?distributedlog-core"
DLOG_MODULE_NAME="(com.ascentstream.distributedlog-)?distributedlog-core"
DLOG_MODULE_PATH=stream/distributedlog/core
DLOG_MODULE_HOME=${BK_HOME}/${DLOG_MODULE_PATH}

Expand Down
12 changes: 6 additions & 6 deletions bookkeeper-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-benchmark</artifactId>
<name>Apache BookKeeper :: Benchmark</name>
<properties>
Expand All @@ -44,12 +44,12 @@
</build>
<dependencies>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>testtools</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
Expand All @@ -73,14 +73,14 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-common-allocator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
<version>4.16.8-SNAPSHOT</version>
</parent>
Expand Down
8 changes: 4 additions & 4 deletions bookkeeper-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
<version>4.16.8-SNAPSHOT</version>
</parent>
<artifactId>bookkeeper-common</artifactId>
<name>Apache BookKeeper :: Common</name>
<dependencies>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>bookkeeper-stats-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>cpu-affinity</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down Expand Up @@ -85,7 +85,7 @@
<artifactId>rxjava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>testtools</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
Expand Down
24 changes: 12 additions & 12 deletions bookkeeper-dist/all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bookkeeper-dist</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -33,20 +33,20 @@

<dependencies>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.stats -->
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>bookkeeper-stats-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>codahale-metrics-provider</artifactId>
<version>${project.version}</version>
<exclusions>
Expand All @@ -57,54 +57,54 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>prometheus-metrics-provider</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.http -->
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>vertx-http-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.tools (new CLI) -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-tools</artifactId>
<version>${project.version}</version>
</dependency>

<!-- dlog -->
<dependency>
<groupId>org.apache.distributedlog</groupId>
<groupId>com.ascentstream.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.version}</version>
</dependency>


<!-- stream.storage -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>stream-storage-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper benchmark -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-benchmark</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-perf</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions bookkeeper-dist/bkctl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bookkeeper-dist</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -34,7 +34,7 @@
<dependencies>
<!-- bookkeeper.tools (new CLI) -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-tools</artifactId>
<version>${project.version}</version>
<exclusions>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
18 changes: 9 additions & 9 deletions bookkeeper-dist/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>bookkeeper-dist</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand All @@ -33,52 +33,52 @@

<dependencies>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.stats -->
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>bookkeeper-stats-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<groupId>com.ascentstream.bookkeeper.stats</groupId>
<artifactId>prometheus-metrics-provider</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.http -->
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>vertx-http-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- stream.storage -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>stream-storage-server</artifactId>
<version>${project.version}</version>
</dependency>

<!-- bookkeeper.tools (new CLI) -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<artifactId>bookkeeper-tools</artifactId>
<version>${project.version}</version>
</dependency>

<!-- dlog -->
<dependency>
<groupId>org.apache.distributedlog</groupId>
<groupId>com.ascentstream.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions bookkeeper-dist/src/assemble/bin-all.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<excludes>
<!-- All these dependencies are already included in stream-storage-java-client -->
<exclude>org.apache.bookkeeper:stream-storage-common</exclude>
<exclude>org.apache.bookkeeper:stream-storage-proto</exclude>
<exclude>org.apache.bookkeeper:stream-storage-api</exclude>
<exclude>org.apache.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>org.apache.bookkeeper:stream-storage-java-kv-client</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-common</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-proto</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-api</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-java-kv-client</exclude>
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
</excludes>
</dependencySet>
Expand Down
10 changes: 5 additions & 5 deletions bookkeeper-dist/src/assemble/bin-server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
<!-- All these dependencies are already included in stream-storage-java-client -->
<exclude>org.apache.bookkeeper:stream-storage-common</exclude>
<exclude>org.apache.bookkeeper:stream-storage-proto</exclude>
<exclude>org.apache.bookkeeper:stream-storage-api</exclude>
<exclude>org.apache.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>org.apache.bookkeeper:stream-storage-java-kv-client</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-common</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-proto</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-api</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-java-kv-client</exclude>
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
</excludes>
</dependencySet>
Expand Down
8 changes: 4 additions & 4 deletions bookkeeper-dist/src/assemble/bkctl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
<excludes>
<exclude>com.google.code.findbugs:jsr305</exclude>
<!-- All these dependencies are already included in stream-storage-java-client -->
<exclude>org.apache.bookkeeper:stream-storage-common</exclude>
<exclude>org.apache.bookkeeper:stream-storage-proto</exclude>
<exclude>org.apache.bookkeeper:stream-storage-api</exclude>
<exclude>org.apache.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-common</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-proto</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-api</exclude>
<exclude>com.ascentstream.bookkeeper:stream-storage-java-client-base</exclude>
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
<!-- exclude server-side dependencies -->
<exclude>org.rocksdb:rocksdbjni</exclude>
Expand Down
4 changes: 2 additions & 2 deletions bookkeeper-http/http-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>http-server</artifactId>
<name>Apache BookKeeper :: Http :: Http Server</name>
<url>http://maven.apache.org</url>
Expand Down
4 changes: 2 additions & 2 deletions bookkeeper-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<groupId>com.ascentstream.bookkeeper</groupId>
<version>4.16.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.bookkeeper.http</groupId>
<groupId>com.ascentstream.bookkeeper.http</groupId>
<artifactId>bookkeeper-http</artifactId>
<packaging>pom</packaging>
<name>Apache BookKeeper :: Http</name>
Expand Down
Loading
Loading