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

Commit f4fd183

Browse files
mutianfmutianf
committed
Merge branch 'main' into emulator
2 parents e685462 + 717bc85 commit f4fd183

71 files changed

Lines changed: 19062 additions & 13671 deletions

File tree

Some content is hidden

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

‎.github/release-please.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,12 @@ branches:
7979
- >-
8080
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
8181
branch: 2.61.x
82+
- bumpMinorPreMajor: true
83+
handleGHRelease: true
84+
releaseType: java-backport
85+
extraFiles:
86+
- >-
87+
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
88+
branch: 2.60.x
8289
extraFiles:
8390
- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java

‎.github/scripts/update_generation_config.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -ex
33
# This script should be run at the root of the repository.
44
# This script is used to update googleapis_commitish, gapic_generator_version,
55
# and libraries_bom_version in generation configuration at the time of running
@@ -15,8 +15,10 @@ set -e
1515
function get_latest_released_version() {
1616
local group_id=$1
1717
local artifact_id=$2
18-
json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
19-
latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
18+
group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
19+
url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
20+
xml_content=$(curl -s --fail "${url}")
21+
latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
2022
if [[ -z "${latest}" ]]; then
2123
echo "The latest version of ${group_id}:${artifact_id} is empty."
2224
echo "The returned json from maven.org is invalid: ${json_content}"
@@ -172,4 +174,4 @@ if [ -z "${pr_num}" ]; then
172174
else
173175
git push
174176
gh pr edit "${pr_num}" --title "${title}" --body "${title}"
175-
fi
177+
fi

‎.github/sync-repo-settings.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,28 @@ branchProtectionRules:
197197
- conformance
198198
- library_generation
199199
- unmanaged_dependency_check
200+
- pattern: 2.60.x
201+
isAdminEnforced: true
202+
requiredApprovingReviewCount: 1
203+
requiresCodeOwnerReviews: true
204+
requiresStrictStatusChecks: false
205+
requiredStatusCheckContexts:
206+
- dependencies (17)
207+
- lint
208+
- clirr
209+
- units (11)
210+
- units (17)
211+
- units (21)
212+
- units (24)
213+
- 'Kokoro - Test: Integration'
214+
- cla/google
215+
- 'Kokoro - Test: Java GraalVM Native Image A'
216+
- 'Kokoro - Test: Java GraalVM Native Image B'
217+
- 'Kokoro - Test: Java GraalVM Native Image C'
218+
- javadoc
219+
- conformance
220+
- library_generation
221+
- unmanaged_dependency_check
200222
permissionRules:
201223
- team: yoshi-admins
202224
permission: admin

‎.github/workflows/update_generation_config.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ on:
1818
schedule:
1919
- cron: '0 2 * * *'
2020
workflow_dispatch:
21-
2221
jobs:
2322
update-generation-config:
2423
runs-on: ubuntu-24.04
@@ -30,6 +29,9 @@ jobs:
3029
with:
3130
fetch-depth: 0
3231
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
32+
- name: Install Dependencies
33+
shell: bash
34+
run: sudo apt-get update && sudo apt-get install -y libxml2-utils
3335
- name: Update params in generation config to latest
3436
shell: bash
3537
run: |
@@ -40,5 +42,4 @@ jobs:
4042
--base_branch "${base_branch}" \
4143
--repo ${{ github.repository }}
4244
env:
43-
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44-
45+
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

‎generation_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gapic_generator_version: 2.59.0
2-
googleapis_commitish: 63161c080e7eb3dd1d4fe76db1fad108b6ac9a27
2+
googleapis_commitish: 33d5137a234625ed94afd630031321c31bd16143
33
libraries_bom_version: 26.61.0
44
template_excludes:
55
- .gitignore

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigtable-bom</artifactId>
6-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.62.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.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.199.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.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.199.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.62.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.62.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.62.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.62.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.62.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.62.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.62.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.62.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

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

1818
<packaging>pom</packaging>
1919
<name>Google Cloud Bigtable Dependency BOM</name>

‎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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.62.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.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
15+
<version>0.199.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.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.199.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.62.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.62.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.62.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.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

‎google-cloud-bigtable/pom.xml‎

Lines changed: 49 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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5+
<version>2.62.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
15+
<version>2.62.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.62.0</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
19+
<java-bigtable.version>2.62.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
57+
<version>2.62.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.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
64+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -400,6 +400,50 @@
400400
</plugins>
401401
</build>
402402
</profile>
403+
<profile>
404+
<id>error-prone</id>
405+
<activation>
406+
<!-- errorprone requires >= jdk17 -->
407+
<jdk>[17,)</jdk>
408+
</activation>
409+
<build>
410+
<pluginManagement>
411+
<plugins>
412+
<plugin>
413+
<groupId>org.apache.maven.plugins</groupId>
414+
<artifactId>maven-compiler-plugin</artifactId>
415+
<configuration>
416+
<fork>true</fork>
417+
418+
<compilerArgs>
419+
<arg>-XDcompilePolicy=simple</arg>
420+
<arg>--should-stop=ifError=FLOW</arg>
421+
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
422+
423+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
424+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
425+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
426+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
427+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
428+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
429+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
430+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
431+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
432+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
433+
</compilerArgs>
434+
<annotationProcessorPaths combine.children="append">
435+
<path>
436+
<groupId>com.google.errorprone</groupId>
437+
<artifactId>error_prone_core</artifactId>
438+
<version>${error-prone.version}</version>
439+
</path>
440+
</annotationProcessorPaths>
441+
</configuration>
442+
</plugin>
443+
</plugins>
444+
</pluginManagement>
445+
</build>
446+
</profile>
403447
<profile>
404448
<id>enable-verbose-grpc-logs</id>
405449
<properties>

0 commit comments

Comments
 (0)