Skip to content

Commit

Permalink
chore: fix 2.13 versions (#4329)
Browse files Browse the repository at this point in the history
Release-As: 2.13.1-SNAPSHOT

primary: 2.13.0 (released version) -> 2.13.1-SNAPSHOT
mirroring: [0.7.2](https://mvnrepository.com/artifact/com.google.cloud.bigtable/bigtable-hbase-mirroring-client-core/0.7.2) -> 0.8.0-SNAPSHOT
replication: [1.11.2](https://mvnrepository.com/artifact/com.google.cloud.bigtable/bigtable-hbase-1.x-replication/1.11.2) -> 1.12.0-SNAPSHOT

BEGIN_COMMIT_OVERRIDE
chore: mark next release as 2.13.1-SNAPSHOT
Release-As: 2.13.1-SNAPSHOT
END_COMMIT_OVERRIDE
  • Loading branch information
mutianf authored Apr 3, 2024
1 parent b304308 commit f4cf4dd
Show file tree
Hide file tree
Showing 51 changed files with 171 additions and 208 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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0";
public static final String VERSION = "2.13.1-SNAPSHOT";
// {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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-dataflow-parent</artifactId>
Expand Down
12 changes: 5 additions & 7 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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<!-- hbase-shaded-client will be replaced with hbase-client -->
<exclusion>
Expand Down Expand Up @@ -204,10 +204,8 @@ limitations under the License.
</filter>
</filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<artifactSet>
Expand All @@ -234,7 +232,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<executions>
<execution>
<id>verify-mirror-deps</id>
Expand Down
12 changes: 5 additions & 7 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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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 @@ -253,10 +253,8 @@ limitations under the License.
</filter>
</filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<artifactSet>
Expand Down Expand Up @@ -435,7 +433,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
8 changes: 3 additions & 5 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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>bigtable-hbase-1.x-parent</artifactId>
<groupId>com.google.cloud.bigtable</groupId>
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,7 +21,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
</parent>

<artifactId>bigtable-hbase-1.x-parent</artifactId>
Expand Down
12 changes: 5 additions & 7 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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</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.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
Expand Down Expand Up @@ -195,10 +195,8 @@ limitations under the License.
false
</promoteTransitiveDependencies>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<filters>
Expand Down Expand Up @@ -235,7 +233,7 @@ limitations under the License.
<plugin>
<groupId>com.google.cloud.bigtable.test</groupId>
<artifactId>bigtable-build-helper</artifactId>
<version>2.13.0</version> <!-- {x-version-update:bigtable-client-parent:current} -->
<version>2.13.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->

<executions>
<execution>
Expand Down
Loading

0 comments on commit f4cf4dd

Please sign in to comment.