Skip to content

Commit 9a56804

Browse files
liudezhi2098liudezhi2098
authored
Merge pull request #8 from ascentstream/feat/change-groupid-to-ascentstream-4.17
feat: as-4.17 change Maven groupId from org.apache to com.ascentstream
2 parents 88e8cf5 + ca30804 commit 9a56804

96 files changed

Lines changed: 318 additions & 324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ CLI_GC_OPTS=${CLI_GC_OPTS:-"${DEFAULT_CLI_GC_OPTS}"}
133133
CLI_GC_LOGGING_OPTS=${CLI_GC_LOGGING_OPTS:-"${DEFAULT_CLI_GC_LOGGING_OPTS}"}
134134

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

139139
is_released_binary() {
140140
if [ -d ${BK_HOME}/lib ]; then

‎bookkeeper-benchmark/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<artifactId>bookkeeper</artifactId>
23-
<groupId>org.apache.bookkeeper</groupId>
23+
<groupId>com.ascentstream.bookkeeper</groupId>
2424
<version>4.17.4-SNAPSHOT</version>
2525
</parent>
26-
<groupId>org.apache.bookkeeper</groupId>
26+
<groupId>com.ascentstream.bookkeeper</groupId>
2727
<artifactId>bookkeeper-benchmark</artifactId>
2828
<name>Apache BookKeeper :: Benchmark</name>
2929
<properties>
@@ -44,12 +44,12 @@
4444
</build>
4545
<dependencies>
4646
<dependency>
47-
<groupId>org.apache.bookkeeper</groupId>
47+
<groupId>com.ascentstream.bookkeeper</groupId>
4848
<artifactId>bookkeeper-server</artifactId>
4949
<version>${project.version}</version>
5050
</dependency>
5151
<dependency>
52-
<groupId>org.apache.bookkeeper</groupId>
52+
<groupId>com.ascentstream.bookkeeper</groupId>
5353
<artifactId>testtools</artifactId>
5454
<version>${project.parent.version}</version>
5555
<scope>test</scope>
@@ -73,14 +73,14 @@
7373
<scope>test</scope>
7474
</dependency>
7575
<dependency>
76-
<groupId>org.apache.bookkeeper</groupId>
76+
<groupId>com.ascentstream.bookkeeper</groupId>
7777
<artifactId>bookkeeper-common</artifactId>
7878
<version>${project.version}</version>
7979
<type>test-jar</type>
8080
<scope>test</scope>
8181
</dependency>
8282
<dependency>
83-
<groupId>org.apache.bookkeeper</groupId>
83+
<groupId>com.ascentstream.bookkeeper</groupId>
8484
<artifactId>bookkeeper-server</artifactId>
8585
<version>${project.version}</version>
8686
<type>test-jar</type>

‎bookkeeper-common-allocator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>org.apache.bookkeeper</groupId>
21+
<groupId>com.ascentstream.bookkeeper</groupId>
2222
<artifactId>bookkeeper</artifactId>
2323
<version>4.17.4-SNAPSHOT</version>
2424
</parent>

‎bookkeeper-common/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>org.apache.bookkeeper</groupId>
21+
<groupId>com.ascentstream.bookkeeper</groupId>
2222
<artifactId>bookkeeper</artifactId>
2323
<version>4.17.4-SNAPSHOT</version>
2424
</parent>
2525
<artifactId>bookkeeper-common</artifactId>
2626
<name>Apache BookKeeper :: Common</name>
2727
<dependencies>
2828
<dependency>
29-
<groupId>org.apache.bookkeeper.stats</groupId>
29+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
3030
<artifactId>bookkeeper-stats-api</artifactId>
3131
<version>${project.parent.version}</version>
3232
</dependency>
3333
<dependency>
34-
<groupId>org.apache.bookkeeper</groupId>
34+
<groupId>com.ascentstream.bookkeeper</groupId>
3535
<artifactId>cpu-affinity</artifactId>
3636
<version>${project.parent.version}</version>
3737
</dependency>
@@ -98,7 +98,7 @@
9898
<artifactId>rxjava</artifactId>
9999
</dependency>
100100
<dependency>
101-
<groupId>org.apache.bookkeeper</groupId>
101+
<groupId>com.ascentstream.bookkeeper</groupId>
102102
<artifactId>testtools</artifactId>
103103
<version>${project.parent.version}</version>
104104
<scope>test</scope>

‎bookkeeper-dist/all/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
2424
<artifactId>bookkeeper-dist</artifactId>
25-
<groupId>org.apache.bookkeeper</groupId>
25+
<groupId>com.ascentstream.bookkeeper</groupId>
2626
<version>4.17.4-SNAPSHOT</version>
2727
<relativePath>..</relativePath>
2828
</parent>
@@ -33,20 +33,20 @@
3333

3434
<dependencies>
3535
<dependency>
36-
<groupId>org.apache.bookkeeper</groupId>
36+
<groupId>com.ascentstream.bookkeeper</groupId>
3737
<artifactId>bookkeeper-server</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
4040

4141
<!-- bookkeeper.stats -->
4242
<dependency>
43-
<groupId>org.apache.bookkeeper.stats</groupId>
43+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
4444
<artifactId>bookkeeper-stats-api</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747

4848
<dependency>
49-
<groupId>org.apache.bookkeeper.stats</groupId>
49+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
5050
<artifactId>codahale-metrics-provider</artifactId>
5151
<version>${project.version}</version>
5252
<exclusions>
@@ -57,31 +57,31 @@
5757
</exclusions>
5858
</dependency>
5959
<dependency>
60-
<groupId>org.apache.bookkeeper.stats</groupId>
60+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
6161
<artifactId>prometheus-metrics-provider</artifactId>
6262
<version>${project.version}</version>
6363
</dependency>
6464
<dependency>
65-
<groupId>org.apache.bookkeeper.stats</groupId>
65+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
6666
<artifactId>otel-metrics-provider</artifactId>
6767
<version>${project.version}</version>
6868
</dependency>
6969

7070
<!-- bookkeeper.http -->
7171
<dependency>
72-
<groupId>org.apache.bookkeeper.http</groupId>
72+
<groupId>com.ascentstream.bookkeeper.http</groupId>
7373
<artifactId>http-server</artifactId>
7474
<version>${project.version}</version>
7575
</dependency>
7676
<dependency>
77-
<groupId>org.apache.bookkeeper.http</groupId>
77+
<groupId>com.ascentstream.bookkeeper.http</groupId>
7878
<artifactId>vertx-http-server</artifactId>
7979
<version>${project.version}</version>
8080
</dependency>
8181

8282
<!-- bookkeeper.tools (new CLI) -->
8383
<dependency>
84-
<groupId>org.apache.bookkeeper</groupId>
84+
<groupId>com.ascentstream.bookkeeper</groupId>
8585
<artifactId>bookkeeper-tools</artifactId>
8686
<version>${project.version}</version>
8787
</dependency>
@@ -96,20 +96,20 @@
9696

9797
<!-- stream.storage -->
9898
<dependency>
99-
<groupId>org.apache.bookkeeper</groupId>
99+
<groupId>com.ascentstream.bookkeeper</groupId>
100100
<artifactId>stream-storage-server</artifactId>
101101
<version>${project.version}</version>
102102
</dependency>
103103

104104
<!-- bookkeeper benchmark -->
105105
<dependency>
106-
<groupId>org.apache.bookkeeper</groupId>
106+
<groupId>com.ascentstream.bookkeeper</groupId>
107107
<artifactId>bookkeeper-benchmark</artifactId>
108108
<version>${project.version}</version>
109109
</dependency>
110110

111111
<dependency>
112-
<groupId>org.apache.bookkeeper</groupId>
112+
<groupId>com.ascentstream.bookkeeper</groupId>
113113
<artifactId>bookkeeper-perf</artifactId>
114114
<version>${project.version}</version>
115115
</dependency>

‎bookkeeper-dist/bkctl/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
2424
<artifactId>bookkeeper-dist</artifactId>
25-
<groupId>org.apache.bookkeeper</groupId>
25+
<groupId>com.ascentstream.bookkeeper</groupId>
2626
<version>4.17.4-SNAPSHOT</version>
2727
<relativePath>..</relativePath>
2828
</parent>
@@ -34,7 +34,7 @@
3434
<dependencies>
3535
<!-- bookkeeper.tools (new CLI) -->
3636
<dependency>
37-
<groupId>org.apache.bookkeeper</groupId>
37+
<groupId>com.ascentstream.bookkeeper</groupId>
3838
<artifactId>bookkeeper-tools</artifactId>
3939
<version>${project.version}</version>
4040
<exclusions>

‎bookkeeper-dist/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<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">
1919
<parent>
2020
<artifactId>bookkeeper</artifactId>
21-
<groupId>org.apache.bookkeeper</groupId>
21+
<groupId>com.ascentstream.bookkeeper</groupId>
2222
<version>4.17.4-SNAPSHOT</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>

‎bookkeeper-dist/server/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<modelVersion>4.0.0</modelVersion>
2323
<parent>
2424
<artifactId>bookkeeper-dist</artifactId>
25-
<groupId>org.apache.bookkeeper</groupId>
25+
<groupId>com.ascentstream.bookkeeper</groupId>
2626
<version>4.17.4-SNAPSHOT</version>
2727
<relativePath>..</relativePath>
2828
</parent>
@@ -33,50 +33,50 @@
3333

3434
<dependencies>
3535
<dependency>
36-
<groupId>org.apache.bookkeeper</groupId>
36+
<groupId>com.ascentstream.bookkeeper</groupId>
3737
<artifactId>bookkeeper-server</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
4040

4141
<!-- bookkeeper.stats -->
4242
<dependency>
43-
<groupId>org.apache.bookkeeper.stats</groupId>
43+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
4444
<artifactId>bookkeeper-stats-api</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747
<dependency>
48-
<groupId>org.apache.bookkeeper.stats</groupId>
48+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
4949
<artifactId>prometheus-metrics-provider</artifactId>
5050
<version>${project.version}</version>
5151
</dependency>
5252
<dependency>
53-
<groupId>org.apache.bookkeeper.stats</groupId>
53+
<groupId>com.ascentstream.bookkeeper.stats</groupId>
5454
<artifactId>otel-metrics-provider</artifactId>
5555
<version>${project.version}</version>
5656
</dependency>
5757

5858
<!-- bookkeeper.http -->
5959
<dependency>
60-
<groupId>org.apache.bookkeeper.http</groupId>
60+
<groupId>com.ascentstream.bookkeeper.http</groupId>
6161
<artifactId>http-server</artifactId>
6262
<version>${project.version}</version>
6363
</dependency>
6464
<dependency>
65-
<groupId>org.apache.bookkeeper.http</groupId>
65+
<groupId>com.ascentstream.bookkeeper.http</groupId>
6666
<artifactId>vertx-http-server</artifactId>
6767
<version>${project.version}</version>
6868
</dependency>
6969

7070
<!-- stream.storage -->
7171
<dependency>
72-
<groupId>org.apache.bookkeeper</groupId>
72+
<groupId>com.ascentstream.bookkeeper</groupId>
7373
<artifactId>stream-storage-server</artifactId>
7474
<version>${project.version}</version>
7575
</dependency>
7676

7777
<!-- bookkeeper.tools (new CLI) -->
7878
<dependency>
79-
<groupId>org.apache.bookkeeper</groupId>
79+
<groupId>com.ascentstream.bookkeeper</groupId>
8080
<artifactId>bookkeeper-tools</artifactId>
8181
<version>${project.version}</version>
8282
</dependency>

‎bookkeeper-dist/src/assemble/bin-all.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
107107
<excludes>
108108
<!-- All these dependencies are already included in stream-storage-java-client -->
109-
<exclude>org.apache.bookkeeper:stream-storage-common</exclude>
110-
<exclude>org.apache.bookkeeper:stream-storage-proto</exclude>
111-
<exclude>org.apache.bookkeeper:stream-storage-api</exclude>
112-
<exclude>org.apache.bookkeeper:stream-storage-java-client-base</exclude>
113-
<exclude>org.apache.bookkeeper:stream-storage-java-kv-client</exclude>
109+
<exclude>com.ascentstream.bookkeeper:stream-storage-common</exclude>
110+
<exclude>com.ascentstream.bookkeeper:stream-storage-proto</exclude>
111+
<exclude>com.ascentstream.bookkeeper:stream-storage-api</exclude>
112+
<exclude>com.ascentstream.bookkeeper:stream-storage-java-client-base</exclude>
113+
<exclude>com.ascentstream.bookkeeper:stream-storage-java-kv-client</exclude>
114114
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
115115
</excludes>
116116
</dependencySet>

‎bookkeeper-dist/src/assemble/bin-server.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
<excludes>
9393
<exclude>com.google.code.findbugs:jsr305</exclude>
9494
<!-- All these dependencies are already included in stream-storage-java-client -->
95-
<exclude>org.apache.bookkeeper:stream-storage-common</exclude>
96-
<exclude>org.apache.bookkeeper:stream-storage-proto</exclude>
97-
<exclude>org.apache.bookkeeper:stream-storage-api</exclude>
98-
<exclude>org.apache.bookkeeper:stream-storage-java-client-base</exclude>
99-
<exclude>org.apache.bookkeeper:stream-storage-java-kv-client</exclude>
95+
<exclude>com.ascentstream.bookkeeper:stream-storage-common</exclude>
96+
<exclude>com.ascentstream.bookkeeper:stream-storage-proto</exclude>
97+
<exclude>com.ascentstream.bookkeeper:stream-storage-api</exclude>
98+
<exclude>com.ascentstream.bookkeeper:stream-storage-java-client-base</exclude>
99+
<exclude>com.ascentstream.bookkeeper:stream-storage-java-kv-client</exclude>
100100
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
101101
</excludes>
102102
</dependencySet>

0 commit comments

Comments
 (0)