Skip to content

Commit

Permalink
chore: fix maven version to 2.13.0 (#4325)
Browse files Browse the repository at this point in the history
* chore: fix maven version to 2.13.0

This was accidentally released to maven as 2.12.1 because git & maven tagging went out of sync. Resetting the versions to force a release to maven manually

Change-Id: I378fb8a9fc902a50600ac64fac2aafbe25acbf1e

* update the mirroring/replication versions as well

Change-Id: I00a996e1fadd078de6f56bcea78c32d346319f05

* fix version txt

Change-Id: Iec3722bf74e712a3bc50464b9bb727808f51b8f5
  • Loading branch information
igorbernstein2 authored Mar 29, 2024
1 parent c7e7752 commit b304308
Show file tree
Hide file tree
Showing 51 changed files with 142 additions and 142 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-integration-tests-common</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-client-core-parent/bigtable-hbase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-core-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase</artifactId>
Expand Down Expand Up @@ -180,7 +180,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -252,7 +252,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<!-- TODO: Remove this once we can properly shade conscrypt:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class BigtableHBaseVersion {
private static final AtomicBoolean wasInitialized = new AtomicBoolean(false);

// {x-version-update-start:bigtable-client-parent:current}
public static final String VERSION = "2.12.2-SNAPSHOT";
public static final String VERSION = "2.13.0";
// {x-version-update-end}

/**
Expand Down
2 changes: 1 addition & 1 deletion bigtable-client-core-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-client-core-parent</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions bigtable-dataflow-parent/bigtable-beam-import/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -158,7 +158,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-beam</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand All @@ -170,7 +170,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- exclude hbase-shaded-client since we are using hbase-shaded-server -->
<exclusion>
Expand Down Expand Up @@ -289,7 +289,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -478,7 +478,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-dataflow-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-beam</artifactId>
Expand Down Expand Up @@ -83,7 +83,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- Let the beam pipeline choose the appropriate slf4j impl.
Since this is the beam universe, we don't have be a drop in replacement
Expand Down Expand Up @@ -306,7 +306,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-dataflow-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-dataflow-parent</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -39,7 +39,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- hbase-shaded-client will be replaced with hbase-client -->
<exclusion>
Expand Down Expand Up @@ -234,7 +234,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
Expand Down Expand Up @@ -184,7 +184,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -198,7 +198,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -212,7 +212,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-mapreduce</artifactId>
Expand Down Expand Up @@ -65,7 +65,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-hadoop</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- we need hbase-server instead of hbase-client -->
<exclusion>
Expand Down Expand Up @@ -125,7 +125,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -231,7 +231,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -68,7 +68,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
have a use of it so we're excluding it from the shaded jar. -->
Expand Down Expand Up @@ -435,7 +435,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
4 changes: 2 additions & 2 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- Workaround MNG-5899 & MSHADE-206. Maven >= 3.3.0 doesn't use the dependency reduced
pom.xml files when invoking the build from a parent project. So we have to manually exclude
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-1.x-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x</artifactId>
Expand Down Expand Up @@ -56,7 +56,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
Expand Down Expand Up @@ -175,7 +175,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-internal-test-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bigtable-hbase-1.x-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-client-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-parent</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
<parent>
<artifactId>bigtable-hbase-2.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -39,7 +39,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-2.x-shaded</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -235,7 +235,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase-2.x-parent</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-2.x-integration-tests</artifactId>
Expand Down Expand Up @@ -185,7 +185,7 @@ limitations under the License.
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
<artifactId>bigtable-hbase</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -203,7 +203,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-2.x</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<scope>test</scope>
<exclusions>
<!-- included in hbase-shaded-testing-util -->
Expand All @@ -217,7 +217,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
<version>2.12.2-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<type>test-jar</type>
<scope>test</scope>
<exclusions>
Expand Down
Loading

0 comments on commit b304308

Please sign in to comment.