Skip to content

Commit 6f57434

Browse files
dnaultdnault
committed
JVMCBC-1639 Migrate to mono-versioning
Modifications ------------- Use the same version for all components. The version is specified in `.mvn/maven.config`. Don't publish parent POM, since submodules flatten their POMs. Change fit-performer-core version from `1.0` to `1.0-SNAPSHOT`, since it's never published, and we don't want to publish it by mistake. Change-Id: Iaeacac6a5c1b8af208a4fe82ea7109083f81ee31 Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/228820 Reviewed-by: Michael Reiche <[email protected]> Tested-by: Build Bot <[email protected]>
1 parent 5798067 commit 6f57434

File tree

24 files changed

+79
-86
lines changed

24 files changed

+79
-86
lines changed

‎.mvn/maven.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
-Drevision=3.9.0-SNAPSHOT

‎columnar-fit-performer-shared/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.couchbase.client</groupId>
99
<artifactId>couchbase-jvm-clients</artifactId>
10-
<version>1.18.0-SNAPSHOT</version><!--REL-->
10+
<version>${revision}</version>
1111
</parent>
1212

1313
<artifactId>columnar-fit-performer-shared</artifactId>

‎columnar-java-client/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>com.couchbase.client</groupId>
88
<artifactId>couchbase-jvm-clients</artifactId>
9-
<version>1.18.0-SNAPSHOT</version><!--REL-->
9+
<version>${revision}</version>
1010
</parent>
1111

1212
<artifactId>couchbase-columnar-java-client</artifactId>
13-
<version>1.2.0-SNAPSHOT</version><!--REL-->
13+
<version>${revision}</version>
1414
<!-- Does not need packaging bundle as the felix plugin does this <packaging>bundle</packaging> -->
1515

1616
<name>Couchbase Columnar Java SDK</name>
@@ -31,7 +31,6 @@
3131
<dependency>
3232
<groupId>com.couchbase.client</groupId>
3333
<artifactId>core-io</artifactId>
34-
<version>${core-io.version}</version>
3534
</dependency>
3635

3736
<dependency>

‎columnar-java-fit-performer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.couchbase.client</groupId>
99
<artifactId>couchbase-jvm-clients</artifactId>
10-
<version>1.18.0-SNAPSHOT</version><!--REL-->
10+
<version>${revision}</version>
1111
</parent>
1212

1313
<artifactId>columnar-java-fit-performer</artifactId>

‎core-fit-performer/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>com.couchbase.client</groupId>
99
<artifactId>couchbase-jvm-clients</artifactId>
10-
<version>1.18.0-SNAPSHOT</version><!--REL-->
10+
<version>${revision}</version>
1111
</parent>
1212

1313
<artifactId>fit-performer-core</artifactId>
1414
<!-- This version never changes as this is not an externally published tool -->
15-
<version>1.0</version>
15+
<version>1.0-SNAPSHOT</version>
1616
<name>Couchbase Core FIT Performer</name>
1717

1818
<dependencies>

‎core-io-deps/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.couchbase.client</groupId>
88
<artifactId>core-io-deps</artifactId>
9-
<version>1.9.0-SNAPSHOT</version><!--REL--><!-- this cannot use variable ${core-io-deps.version} -->
9+
<version>${revision}</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Couchbase JVM Core IO Dependencies</name>

‎core-io/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>com.couchbase.client</groupId>
99
<artifactId>couchbase-jvm-clients</artifactId>
10-
<version>1.18.0-SNAPSHOT</version><!--REL-->
10+
<version>${revision}</version>
1111
</parent>
1212

1313
<artifactId>core-io</artifactId>
14-
<version>3.9.0-SNAPSHOT</version><!--REL-->
14+
<version>${revision}</version>
1515

1616
<!-- Ideally, this would be like java-client and not use packaging-bundle -->
1717
<!-- But I haven't figured out how to run the felix plugin *after* the shading has been done, then update the MANIFEST.MF -->
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.couchbase.client</groupId>
6464
<artifactId>core-io-deps</artifactId>
65-
<version>${core-io-deps.version}</version>
65+
<version>${revision}</version>
6666
<!-- adding scope-provided results in the MANIFEST/* files not being included in core-io.jar <scope>provided</scope> -->
6767
<!-- removing scope-provided results in osgi-feature bundling believing that core-io-deps is a required module -->
6868
<!-- and referencing it as a wrapped bundle: wrap:mvn:com.couchbase.client/core-io-deps/1.2.0 -->

‎java-client/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>com.couchbase.client</groupId>
88
<artifactId>couchbase-jvm-clients</artifactId>
9-
<version>1.18.0-SNAPSHOT</version><!--REL-->
9+
<version>${revision}</version>
1010
</parent>
1111

1212
<artifactId>java-client</artifactId>
13-
<version>3.9.0-SNAPSHOT</version><!--REL-->
13+
<version>${revision}</version>
1414
<!-- Does not need packaging bundle as the felix plugin does this <packaging>bundle</packaging> -->
1515

1616
<name>Couchbase Java SDK</name>
@@ -21,7 +21,6 @@
2121
<dependency>
2222
<groupId>com.couchbase.client</groupId>
2323
<artifactId>core-io</artifactId>
24-
<version>${core-io.version}</version>
2524
</dependency>
2625

2726
<!-- External, Optional Dependencies -->

‎java-examples/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>com.couchbase.client</groupId>
88
<artifactId>couchbase-jvm-clients</artifactId>
9-
<version>1.18.0-SNAPSHOT</version><!--REL-->
9+
<version>${revision}</version>
1010
</parent>
1111

1212
<artifactId>java-examples</artifactId>
13-
<version>1.9.0-SNAPSHOT</version><!--REL-->
13+
<version>${revision}</version>
1414
<!-- Does not need packaging bundle as the felix plugin does this <packaging>bundle</packaging> -->
1515

1616
<name>Couchbase Java SDK Examples</name>
@@ -20,13 +20,11 @@
2020
<dependency>
2121
<groupId>com.couchbase.client</groupId>
2222
<artifactId>java-client</artifactId>
23-
<version>${java-client.version}</version>
2423
</dependency>
2524

2625
<dependency>
2726
<groupId>com.couchbase.client</groupId>
2827
<artifactId>core-io</artifactId>
29-
<version>${core-io.version}</version>
3028
</dependency>
3129

3230
<dependency>

‎java-fit-performer/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.couchbase.client</groupId>
99
<artifactId>couchbase-jvm-clients</artifactId>
10-
<version>1.18.0-SNAPSHOT</version><!--REL-->
10+
<version>${revision}</version>
1111
</parent>
1212

1313
<artifactId>fit-performer-java-sdk</artifactId>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>com.couchbase.client</groupId>
2828
<artifactId>fit-performer-core</artifactId>
29-
<version>1.0</version>
29+
<version>1.0-SNAPSHOT</version>
3030
</dependency>
3131

3232
<dependency>

0 commit comments

Comments
 (0)