Skip to content

Commit c3a48ed

Browse files
mutianfmutianf
authored
chore: update main versions to 2.14.0-SNAPSHOT (#4327)
Release-As: 2.14.0-SNAPSHOT BEGIN_COMMIT_OVERRIDE chore: mark next release as 2.14.0-SNAPSHOT Release-As: 2.14.0-SNAPSHOT END_COMMIT_OVERRIDE
1 parent 73fff5a commit c3a48ed

File tree

52 files changed

+188
-220
lines changed

Some content is hidden

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

52 files changed

+188
-220
lines changed

‎bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
<parent>
2020
<groupId>com.google.cloud.bigtable</groupId>
2121
<artifactId>bigtable-client-core-parent</artifactId>
22-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
22+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2323
</parent>
2424

2525
<artifactId>bigtable-hbase-integration-tests-common</artifactId>

‎bigtable-client-core-parent/bigtable-hbase/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>com.google.cloud.bigtable</groupId>
2222
<artifactId>bigtable-client-core-parent</artifactId>
23-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
23+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2424
</parent>
2525

2626
<artifactId>bigtable-hbase</artifactId>
@@ -85,7 +85,7 @@ limitations under the License.
8585
<dependency>
8686
<groupId>com.google.cloud.bigtable</groupId>
8787
<artifactId>bigtable-internal-test-helper</artifactId>
88-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
88+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
@@ -149,7 +149,7 @@ limitations under the License.
149149
<plugin>
150150
<groupId>com.google.cloud.bigtable.test</groupId>
151151
<artifactId>bigtable-build-helper</artifactId>
152-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
152+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
153153

154154
<executions>
155155
<execution>

‎bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class BigtableHBaseVersion {
3434
private static final AtomicBoolean wasInitialized = new AtomicBoolean(false);
3535

3636
// {x-version-update-start:bigtable-client-parent:current}
37-
public static final String VERSION = "2.12.1-SNAPSHOT";
37+
public static final String VERSION = "2.14.0-SNAPSHOT";
3838
// {x-version-update-end}
3939

4040
/**

‎bigtable-client-core-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>com.google.cloud.bigtable</groupId>
2222
<artifactId>bigtable-client-parent</artifactId>
23-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
23+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2424
</parent>
2525

2626
<artifactId>bigtable-client-core-parent</artifactId>

‎bigtable-dataflow-parent/bigtable-beam-import/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
<parent>
1919
<groupId>com.google.cloud.bigtable</groupId>
2020
<artifactId>bigtable-dataflow-parent</artifactId>
21-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
21+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424

@@ -85,7 +85,7 @@ limitations under the License.
8585
<dependency>
8686
<groupId>${project.groupId}</groupId>
8787
<artifactId>bigtable-hbase-beam</artifactId>
88-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
88+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
8989
<exclusions>
9090
<exclusion>
9191
<groupId>org.apache.hbase</groupId>
@@ -141,7 +141,7 @@ limitations under the License.
141141
<dependency>
142142
<groupId>com.google.cloud.bigtable</groupId>
143143
<artifactId>bigtable-internal-test-helper</artifactId>
144-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
144+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
145145
<scope>test</scope>
146146
</dependency>
147147

@@ -325,7 +325,7 @@ limitations under the License.
325325
<plugin>
326326
<groupId>com.google.cloud.bigtable.test</groupId>
327327
<artifactId>bigtable-build-helper</artifactId>
328-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
328+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
329329
<executions>
330330
<!-- We are using beam's bom, so no need to check if the beam deps are mirrored -->
331331
<execution>

‎bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
<parent>
1717
<groupId>com.google.cloud.bigtable</groupId>
1818
<artifactId>bigtable-dataflow-parent</artifactId>
19-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
19+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2020
</parent>
2121

2222
<artifactId>bigtable-hbase-beam</artifactId>
@@ -58,7 +58,7 @@ limitations under the License.
5858
<dependency>
5959
<groupId>${project.groupId}</groupId>
6060
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
61-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
61+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
6262
<exclusions>
6363
<!-- Workaround MNG-5899 & MSHADE-206. Maven >= 3.3.0 doesn't use the dependency reduced
6464
pom.xml files when invoking the build from a parent project. So we have to manually exclude
@@ -227,7 +227,7 @@ limitations under the License.
227227
<plugin>
228228
<groupId>com.google.cloud.bigtable.test</groupId>
229229
<artifactId>bigtable-build-helper</artifactId>
230-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
230+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
231231
<executions>
232232
<execution>
233233
<id>verify-mirror-deps-beam</id>

‎bigtable-dataflow-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>com.google.cloud.bigtable</groupId>
2222
<artifactId>bigtable-client-parent</artifactId>
23-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
23+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2424
</parent>
2525

2626
<artifactId>bigtable-dataflow-parent</artifactId>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
<parent>
1919
<artifactId>bigtable-hbase-1.x-parent</artifactId>
2020
<groupId>com.google.cloud.bigtable</groupId>
21-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
21+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424

@@ -34,7 +34,7 @@ limitations under the License.
3434
<dependency>
3535
<groupId>${project.groupId}</groupId>
3636
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
37-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
37+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
3838
<exclusions>
3939
<!-- hbase-shaded-client will be replaced with hbase-client -->
4040
<exclusion>
@@ -142,8 +142,8 @@ limitations under the License.
142142
<!-- Need to manually promote to dependencies to keep the structure of hbase-shade-client -->
143143
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
144144
<transformers>
145-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
146-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
145+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
146+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
147147
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
148148
</transformers>
149149
<filters>
@@ -169,7 +169,7 @@ limitations under the License.
169169
<plugin>
170170
<groupId>com.google.cloud.bigtable.test</groupId>
171171
<artifactId>bigtable-build-helper</artifactId>
172-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
172+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
173173

174174
<executions>
175175
<execution>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>com.google.cloud.bigtable</groupId>
2222
<artifactId>bigtable-hbase-1.x-parent</artifactId>
23-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
23+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2424
</parent>
2525

2626
<artifactId>bigtable-hbase-1.x-integration-tests</artifactId>
@@ -79,7 +79,7 @@ limitations under the License.
7979
<dependency>
8080
<groupId>com.google.cloud.bigtable</groupId>
8181
<artifactId>bigtable-hbase-1.x</artifactId>
82-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
82+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
8383
<exclusions>
8484
<exclusion>
8585
<groupId>org.apache.hbase</groupId>
@@ -117,7 +117,7 @@ limitations under the License.
117117
<dependency>
118118
<groupId>com.google.cloud.bigtable</groupId>
119119
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
120-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
120+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
121121
<exclusions>
122122
<exclusion>
123123
<groupId>org.apache.hbase</groupId>
@@ -146,8 +146,7 @@ limitations under the License.
146146
missing deps until the integration tests pass.
147147
148148
The HBase & Hadoop have large set of transitive deps, so we explicitly exclude all of them
149-
add them manually. All hbase deps are pinned to hbase < 2.0. Everything else is using the
150-
latest available version.
149+
add them manually. All hbase deps are pinned to hbase < 2.0. Everything else is using the latest available version.
151150
-->
152151

153152
<dependencies>
@@ -286,7 +285,7 @@ limitations under the License.
286285
<dependency>
287286
<groupId>com.google.cloud.bigtable</groupId>
288287
<artifactId>bigtable-hbase-1.x-shaded</artifactId>
289-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
288+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
290289
<exclusions>
291290
<exclusion>
292291
<groupId>org.apache.hbase</groupId>
@@ -376,7 +375,7 @@ limitations under the License.
376375
<plugin>
377376
<groupId>com.google.cloud.bigtable</groupId>
378377
<artifactId>hbase-minicluster-maven-plugin</artifactId>
379-
<version>2.12.1-SNAPSHOT</version>
378+
<version>2.14.0-SNAPSHOT</version>
380379

381380
<executions>
382381
<execution>
@@ -467,7 +466,7 @@ limitations under the License.
467466
<dependency>
468467
<groupId>${project.groupId}</groupId>
469468
<artifactId>bigtable-hbase-integration-tests-common</artifactId>
470-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
469+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
471470
<type>test-jar</type>
472471
<scope>test</scope>
473472
<exclusions>
@@ -580,7 +579,7 @@ limitations under the License.
580579
<plugin>
581580
<groupId>com.google.cloud.bigtable</groupId>
582581
<artifactId>hbase-minicluster-maven-plugin</artifactId>
583-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
582+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
584583

585584
<dependencies>
586585
<dependency>

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>com.google.cloud.bigtable</groupId>
2222
<artifactId>bigtable-hbase-1.x-parent</artifactId>
23-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
23+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
2424
</parent>
2525

2626
<artifactId>bigtable-hbase-1.x-mapreduce</artifactId>
@@ -60,7 +60,7 @@ limitations under the License.
6060
<dependency>
6161
<groupId>${project.groupId}</groupId>
6262
<artifactId>bigtable-hbase-1.x-hadoop</artifactId>
63-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
63+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
6464
<exclusions>
6565
<!-- we need hbase-server instead of hbase-client -->
6666
<exclusion>
@@ -120,7 +120,7 @@ limitations under the License.
120120
<dependency>
121121
<groupId>com.google.cloud.bigtable</groupId>
122122
<artifactId>bigtable-internal-test-helper</artifactId>
123-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
123+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
124124
<scope>test</scope>
125125
</dependency>
126126
</dependencies>
@@ -186,7 +186,7 @@ limitations under the License.
186186
<plugin>
187187
<groupId>com.google.cloud.bigtable.test</groupId>
188188
<artifactId>bigtable-build-helper</artifactId>
189-
<version>2.12.1-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
189+
<version>2.14.0-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
190190
<executions>
191191
<execution>
192192
<id>verify-mirror-deps-hbase</id>

0 commit comments

Comments
 (0)