Merge branch 'main' into owl-bot-copy

googleapis · May 28, 2024 · 912d14e · 912d14e
2 parents a6db4b8 + 2609103
commit 912d14e
Show file tree

Hide file tree

Showing 32 changed files with 255 additions and 112 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
  image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:25b384ee1674eda3984ec41c15b514a63bbeb5eda4d57c73c7e6f5adef2fd2f1
-# created: 2024-04-05T19:12:34.133475268Z
+ digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e
+# created: 2024-05-09T16:31:37.168667071Z
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
@@ -21,7 +21,7 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
  steps:
- - uses: actions/github-script@v6
+ - uses: actions/github-script@v7
  with:
  github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
  script: |

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,8 +27,8 @@ jobs:
  matrix:
  java: [11, 17, 21]
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: ${{matrix.java}}
@@ -41,8 +41,8 @@ jobs:
  name: "units (8)"
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  java-version: 8
  distribution: temurin
@@ -51,7 +51,7 @@ jobs:
  # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
  run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
  shell: bash
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v4
  with:
  java-version: 17
  distribution: temurin
@@ -63,8 +63,8 @@ jobs:
  steps:
  - name: Support longpaths
  run: git config --system core.longpaths true
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: 8
@@ -78,8 +78,8 @@ jobs:
  matrix:
  java: [17]
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: ${{matrix.java}}
@@ -88,8 +88,8 @@ jobs:
  javadoc:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: 17
@@ -100,8 +100,8 @@ jobs:
  lint:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: 11
@@ -112,8 +112,8 @@ jobs:
  clirr:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: 8

diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml
@@ -14,7 +14,7 @@ jobs:
  uses: actions/checkout@v4
 
  - name: Set up Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  with:
  node-version: '20'
 

diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
@@ -20,8 +20,8 @@ jobs:
  checkstyle:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
  with:
  distribution: temurin
  java-version: 8

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
  shell: bash
  run: .kokoro/build.sh
  - name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.29.0
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.30.1
  with:
  bom-path: google-cloud-bigtable-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
  key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.29.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.30.1"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
  key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.29.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.30.1"
 }
 
 env_vars: {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [2.39.3](https://github.com/googleapis/java-bigtable/compare/v2.39.2...v2.39.3) (2024-05-21)
+
+
+### Bug Fixes
+
+* Retry INTERNAL retriable auth errors ([#2239](https://github.com/googleapis/java-bigtable/issues/2239)) ([4cdb6da](https://github.com/googleapis/java-bigtable/commit/4cdb6da8920cd3346a9d79d67432cef588d93bb0))
+
+## [2.39.2](https://github.com/googleapis/java-bigtable/compare/v2.39.1...v2.39.2) (2024-05-09)
+
+
+### Dependencies
+
+* Update shared dependencies ([#2221](https://github.com/googleapis/java-bigtable/issues/2221)) ([17f7a9a](https://github.com/googleapis/java-bigtable/commit/17f7a9af3991c4744256bbfb0533d9390cada23d))
+
+## [2.39.1](https://github.com/googleapis/java-bigtable/compare/v2.39.0...v2.39.1) (2024-05-08)
+
+
+### Bug Fixes
+
+* Batch time series data when exporting client-side metric ([#2222](https://github.com/googleapis/java-bigtable/issues/2222)) ([1f9f169](https://github.com/googleapis/java-bigtable/commit/1f9f1698339ae470d821963e1037e0132016d216))
+* Remove stale module from bom ([#2218](https://github.com/googleapis/java-bigtable/issues/2218)) ([7145864](https://github.com/googleapis/java-bigtable/commit/7145864868b3f7df69f9b2db7a822f9faf903f33))
+
 ## [2.39.0](https://github.com/googleapis/java-bigtable/compare/v2.38.0...v2.39.0) (2024-04-29)
 
 

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.39.0</version>
+ <version>2.39.3</version>
 </dependency>
 
 ```

diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
@@ -3,12 +3,12 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <packaging>pom</packaging>
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>sdk-platform-java-config</artifactId>
- <version>3.29.0</version>
+ <version>3.30.1</version>
  <relativePath/>
  </parent>
 
@@ -63,37 +63,37 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator</artifactId>
- <version>0.176.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.176.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.176.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.176.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigtable-v2</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
  </dependency>
  </dependencies>
  </dependencyManagement>

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,13 +7,13 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>sdk-platform-java-config</artifactId>
- <version>3.29.0</version>
+ <version>3.30.1</version>
  <relativePath/>
  </parent>
 
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
  <packaging>pom</packaging>
  <description>
@@ -66,7 +66,7 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>gapic-libraries-bom</artifactId>
- <version>1.36.0</version>
+ <version>1.38.0</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>

diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml
@@ -7,11 +7,11 @@
  <parent>
  <artifactId>google-cloud-bigtable-parent</artifactId>
  <groupId>com.google.cloud</groupId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
 
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.176.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.176.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
 
  <description>
  A Java wrapper for the Cloud Bigtable emulator.

diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>google-cloud-bigtable-emulator</artifactId>
- <version>0.176.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.176.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  <name>Google Cloud Java - Bigtable Emulator</name>
  <url>https://github.com/googleapis/java-bigtable</url>
  <description>
@@ -14,7 +14,7 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-parent</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
  <scm>
  <connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -99,7 +99,7 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.176.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.176.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
 
  <dependency>

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 <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">
  <modelVersion>4.0.0</modelVersion>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <packaging>jar</packaging>
  <name>Google Cloud Bigtable</name>
  <url>https://github.com/googleapis/java-bigtable</url>
@@ -12,11 +12,11 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-parent</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
  <properties>
  <!-- The version that will be embedded in the published jar via maven-resources-plugin -->
- <java-bigtable.version>2.39.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <java-bigtable.version>2.39.4-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
  <site.installationModule>google-cloud-bigtable</site.installationModule>
 
@@ -47,14 +47,14 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.39.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -638,7 +638,7 @@
  <plugin>
  <groupId>org.codehaus.mojo</groupId>
  <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
  <executions>
  <execution>
  <id>add-source</id>

diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
 @InternalApi("For internal use only")
 public final class Version {
  // {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.39.1-SNAPSHOT";
+ public static String VERSION = "2.39.4-SNAPSHOT";
  // {x-version-update-end}
 }