Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 0c65345

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents f46c24a + 8cb6a02 commit 0c65345

18 files changed

Lines changed: 80 additions & 61 deletions

File tree

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.1
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.52.2
1818
with:
1919
bom-path: google-cloud-bigtable-bom/pom.xml

‎google-cloud-bigtable-bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigtable-bom</artifactId>
6-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.52.1</version>
11+
<version>3.52.2</version>
1212
<relativePath/>
1313
</parent>
1414

@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.cloud</groupId>
7070
<artifactId>google-cloud-bigtable-emulator</artifactId>
71-
<version>0.203.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.203.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7272
</dependency>
7373
<dependency>
7474
<groupId>com.google.cloud</groupId>
7575
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
76-
<version>0.203.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.203.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.api.grpc</groupId>
8080
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
81-
<version>2.66.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.api.grpc</groupId>
8585
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
86-
<version>2.66.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.api.grpc</groupId>
9090
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
91-
<version>2.66.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
9292
</dependency>
9393
<dependency>
9494
<groupId>com.google.api.grpc</groupId>
9595
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
96-
<version>2.66.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
9898
</dependencies>
9999
</dependencyManagement>

‎google-cloud-bigtable-deps-bom/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>com.google.cloud</groupId>
99
<artifactId>sdk-platform-java-config</artifactId>
10-
<version>3.52.1</version>
10+
<version>3.52.2</version>
1111
<relativePath/>
1212
</parent>
1313

1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
16-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
16+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1717

1818
<packaging>pom</packaging>
1919
<name>Google Cloud Bigtable Dependency BOM</name>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.google.cloud</groupId>
7070
<artifactId>gapic-libraries-bom</artifactId>
71-
<version>1.67.0</version>
71+
<version>1.69.0</version>
7272
<type>pom</type>
7373
<scope>import</scope>
7474
</dependency>

‎google-cloud-bigtable-emulator-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<artifactId>google-cloud-bigtable-parent</artifactId>
99
<groupId>com.google.cloud</groupId>
10-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212
<name>Google Cloud Java - Bigtable Emulator Core</name>
1313

1414
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
15-
<version>0.203.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
15+
<version>0.203.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
1616

1717
<description>
1818
A Java wrapper for the Cloud Bigtable emulator.

‎google-cloud-bigtable-emulator/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-bigtable-emulator</artifactId>
8-
<version>0.203.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.203.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
99
<name>Google Cloud Java - Bigtable Emulator</name>
1010
<url>https://github.com/googleapis/java-bigtable</url>
1111
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-bigtable-parent</artifactId>
17-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1818
</parent>
1919
<scm>
2020
<connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
8181
<dependency>
8282
<groupId>com.google.cloud</groupId>
8383
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
84-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.cloud</groupId>
9090
<artifactId>google-cloud-bigtable-bom</artifactId>
91-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
9292
<type>pom</type>
9393
<scope>import</scope>
9494
</dependency>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.google.cloud</groupId>
101101
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
102-
<version>0.203.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.203.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

‎google-cloud-bigtable/clirr-ignored-differences.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,26 @@
349349
<className>com/google/cloud/bigtable/data/v2/models/sql/SqlType</className>
350350
<method>*protoOf(*)</method>
351351
</difference>
352+
<difference>
353+
<differenceType>7004</differenceType>
354+
<className>com/google/cloud/bigtable/common/Type$SchemalessProto</className>
355+
<method>*</method>
356+
</difference>
357+
<difference>
358+
<differenceType>7004</differenceType>
359+
<className>com/google/cloud/bigtable/common/Type$SchemalessEnum</className>
360+
<method>*</method>
361+
</difference>
362+
<difference>
363+
<differenceType>7013</differenceType>
364+
<className>com/google/cloud/bigtable/common/Type$SchemalessProto</className>
365+
<method>*</method>
366+
</difference>
367+
<difference>
368+
<differenceType>7013</differenceType>
369+
<className>com/google/cloud/bigtable/common/Type$SchemalessEnum</className>
370+
<method>*</method>
371+
</difference>
352372
<difference>
353373
<!-- BetaApi was added -->
354374
<differenceType>7012</differenceType>

‎google-cloud-bigtable/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-bigtable</artifactId>
5-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Bigtable</name>
88
<url>https://github.com/googleapis/java-bigtable</url>
@@ -12,11 +12,11 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-bigtable-parent</artifactId>
15-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
15+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1616
</parent>
1717
<properties>
1818
<!-- The version that will be embedded in the published jar via maven-resources-plugin -->
19-
<java-bigtable.version>2.66.0</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
19+
<java-bigtable.version>2.66.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
2020

2121
<site.installationModule>google-cloud-bigtable</site.installationModule>
2222

@@ -54,14 +54,14 @@
5454
<dependency>
5555
<groupId>com.google.cloud</groupId>
5656
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
57-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
57+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-bigtable-bom</artifactId>
64-
<version>2.66.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
64+
<version>2.66.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
@InternalApi("For internal use only")
2121
public final class Version {
2222
// {x-version-update-start:google-cloud-bigtable:current}
23-
public static String VERSION = "2.66.0";
23+
public static String VERSION = "2.66.1-SNAPSHOT";
2424
// {x-version-update-end}
2525
}

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ private static ByteString wrapKey(String key) {
366366
* A Query Paginator that will split a query into small chunks. See {@link
367367
* Query#createPaginator(int)} for example usage.
368368
*/
369-
@BetaApi("This surface is stable yet it might be removed in the future.")
370369
public static class QueryPaginator {
371370

372371
private final boolean hasOverallLimit;

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/TableId.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static TableId of(String tableId) {
3131
return new AutoValue_TableId(tableId);
3232
}
3333

34-
abstract String getTableId();
34+
public abstract String getTableId();
3535

3636
@Override
3737
@InternalApi

0 commit comments

Comments
 (0)