Skip to content

Commit

Permalink
Merge branch 'main' into renovate/opentelemetry-java-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
zhumin8 authored Mar 1, 2024
2 parents 43c755b + 2ebfccb commit a104fa9
Show file tree
Hide file tree
Showing 57 changed files with 292 additions and 184 deletions.
8 changes: 0 additions & 8 deletions .cloudbuild/google-cloud-sdk.repo

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.1'
_SHARED_DEPENDENCIES_VERSION: '3.27.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.4'

steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-a-build
waitFor: ["-"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}
Expand All @@ -30,4 +30,4 @@ steps:
waitFor: [ "graalvm-a-build" ]
env:
- 'MODULES_UNDER_TEST=java-kms'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.1'
_SHARED_DEPENDENCIES_VERSION: '3.27.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.4'

steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-b-build
waitFor: ["-"]
- name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}
Expand All @@ -30,4 +30,4 @@ steps:
waitFor: [ "graalvm-b-build" ]
env:
- 'MODULES_UNDER_TEST=java-kms'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@

timeout: 7200s # 2 hours
substitutions:
_SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.1'
_SHARED_DEPENDENCIES_VERSION: '3.27.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
_JAVA_SHARED_CONFIG_VERSION: '1.7.4'
steps:
# GraalVM A build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-a-build
waitFor: ["-"]

# GraalVM B build
- name: gcr.io/cloud-builders/docker
args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "." ]
dir: .cloudbuild
dir: .cloudbuild/graalvm
id: graalvm-b-build
waitFor: [ "-" ]

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
"build",
"-t", "${_SHA_IMAGE_ID}",
"-t", "${_LATEST_IMAGE_ID}",
"--file", ".cloudbuild/library_generation.Dockerfile", "."]
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

timeout: 7200s # 2 hours
substitutions:
_GAPIC_GENERATOR_JAVA_VERSION: '2.37.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
_IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}"
steps:
# Library generation build
- name: gcr.io/cloud-builders/docker
args: [
"build",
"-t", "${_IMAGE_ID}",
"--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]

images:
- ${_IMAGE_ID}

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ substitutions:
steps:
# Library generation build
- name: gcr.io/cloud-builders/docker
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation.Dockerfile", "."]
args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."]
id: library-generation-build
waitFor: ["-"]
- name: ${_TEST_IMAGE_ID}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ bumpMinorPreMajor: true
handleGHRelease: true
primaryBranch: main
manifest: true
extraFiles: ["WORKSPACE", ".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml" ]
extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml", ".cloudbuild/library_generation/cloudbuild-library-generation-release.yaml" ]
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "2.35.0"
".": "2.37.0"
}
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
# Changelog

## [2.37.0](https://github.com/googleapis/sdk-platform-java/compare/v2.36.0...v2.37.0) (2024-02-29)


### Features

* improve batching summary errors ([#2509](https://github.com/googleapis/sdk-platform-java/issues/2509)) ([d6964a4](https://github.com/googleapis/sdk-platform-java/commit/d6964a4cfda60ef7c5f1871b215a9cf222361e7e))


### Bug Fixes

* adjust release please config to reflect file location change. ([#2524](https://github.com/googleapis/sdk-platform-java/issues/2524)) ([1e5af1e](https://github.com/googleapis/sdk-platform-java/commit/1e5af1e651a079220b8a63952b7dbc68586d9b7d))

## [2.36.0](https://github.com/googleapis/sdk-platform-java/compare/v2.35.0...v2.36.0) (2024-02-29)


### Features

* check library_name is unique among libraries ([#2490](https://github.com/googleapis/sdk-platform-java/issues/2490)) ([8123f0b](https://github.com/googleapis/sdk-platform-java/commit/8123f0b15970c76b08086d8988de14e1ed58a77e))


### Bug Fixes

* cleanup @BetaApi from Resource Name Builder Methods ([#2450](https://github.com/googleapis/sdk-platform-java/issues/2450)) ([6e8d098](https://github.com/googleapis/sdk-platform-java/commit/6e8d09845610401665556118cd78c7229c46d426)), closes [#2099](https://github.com/googleapis/sdk-platform-java/issues/2099)
* Fix watchdog to start with WAITING state ([#2468](https://github.com/googleapis/sdk-platform-java/issues/2468)) ([dedc40f](https://github.com/googleapis/sdk-platform-java/commit/dedc40fb451633b11be10013b74a91053e155620))
* ignore comment in BUILD ([#2492](https://github.com/googleapis/sdk-platform-java/issues/2492)) ([6ca20e5](https://github.com/googleapis/sdk-platform-java/commit/6ca20e529a86561cdc935d0d44dd971de3b9e4b2))
* remove @BetaApi from ApiFutures and ApiService ([#2454](https://github.com/googleapis/sdk-platform-java/issues/2454)) ([f59e717](https://github.com/googleapis/sdk-platform-java/commit/f59e717402d00bc953648e1e780dd84dda7915b3)), closes [#2098](https://github.com/googleapis/sdk-platform-java/issues/2098)


### Dependencies

* grandfathering the dependencies for java-pubsublite and java-bigquery ([#2504](https://github.com/googleapis/sdk-platform-java/issues/2504)) ([9ceab23](https://github.com/googleapis/sdk-platform-java/commit/9ceab23144ba7a9ca9114d585376e09587fd1bee))
* update dependency gradle to v7.6.4 ([#2474](https://github.com/googleapis/sdk-platform-java/issues/2474)) ([607dc59](https://github.com/googleapis/sdk-platform-java/commit/607dc59f8eb5a70f8807c4d5f7d0745438842381))
* update dependency org.graalvm.sdk:graal-sdk to v22.3.5 ([#2475](https://github.com/googleapis/sdk-platform-java/issues/2475)) ([2de487b](https://github.com/googleapis/sdk-platform-java/commit/2de487b34c43fee3b81e4af7a2dfe4f2eb6418ac))
* update grpc dependencies to v1.62.2 ([#2506](https://github.com/googleapis/sdk-platform-java/issues/2506)) ([f438603](https://github.com/googleapis/sdk-platform-java/commit/f4386038766c2381e141d7073959cc6bde896efb))


### Documentation

* Add contribution guidelines. ([#2045](https://github.com/googleapis/sdk-platform-java/issues/2045)) ([9939b43](https://github.com/googleapis/sdk-platform-java/commit/9939b43dce041c75405cea66a0dde171d991d3eb))

## [2.35.0](https://github.com/googleapis/sdk-platform-java/compare/v2.34.0...v2.35.0) (2024-02-13)


Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ maven_install(
repositories = ["https://repo.maven.apache.org/maven2/"],
)

_gapic_generator_java_version = "2.35.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
_gapic_generator_java_version = "2.37.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current}

maven_install(
artifacts = [
Expand Down
4 changes: 2 additions & 2 deletions api-common-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<packaging>jar</packaging>
<version>2.26.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
<version>2.28.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
<name>API Common</name>
<description>Common utilities for Google APIs in Java</description>

<parent>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.35.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.37.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<relativePath>../gapic-generator-java-pom-parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ public static <V, X extends Throwable> ApiFuture<V> catching(
* callback}
* @see Futures#catchingAsync(ListenableFuture, Class, AsyncFunction, Executor)
*/
@BetaApi
public static <V, X extends Throwable> ApiFuture<V> catchingAsync(
ApiFuture<V> input,
Class<X> exceptionType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ public interface ApiService {
* {@code A.compareTo(B) < 0} then there is <b>not</b> guaranteed to be a valid state transition
* {@code A -> B}.
*/
@BetaApi
enum State {
/**
* A service in this state has encountered a problem and may not be operational. It cannot be
Expand Down Expand Up @@ -198,7 +197,6 @@ enum State {
*
* <p>All methods are no-ops by default, implementors should override the ones they care about.
*/
@BetaApi
abstract class Listener {
/**
* Called when the service transitions to the {@linkplain State#FAILED FAILED} state. The
Expand Down
8 changes: 4 additions & 4 deletions coverage-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>2.43.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
<version>2.45.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<version>2.43.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
<version>2.45.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
<version>2.43.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
<version>2.45.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>2.26.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
<version>2.28.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
</dependency>
</dependencies>

Expand Down
26 changes: 13 additions & 13 deletions gapic-generator-java-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-bom</artifactId>
<packaging>pom</packaging>
<version>2.35.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.37.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<name>GAPIC Generator Java BOM</name>
<description>
BOM for the libraries in gapic-generator-java repository. Users should not
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.35.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.37.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<relativePath>../gapic-generator-java-pom-parent</relativePath>
</parent>

Expand Down Expand Up @@ -75,61 +75,61 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>2.26.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
<version>2.28.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>2.43.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
<version>2.45.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java</artifactId>
<version>2.35.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.37.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
<version>2.36.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
<version>2.36.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v2</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v2beta</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
</dependency>

<!-- Following test deps are kept to keep them consistent with versions above -->
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v1</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v2</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v2beta</artifactId>
<version>1.29.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
<version>1.31.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api</groupId>
<artifactId>gapic-generator-java-pom-parent</artifactId>
<version>2.35.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<version>2.37.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
<packaging>pom</packaging>
<name>GAPIC Generator Java POM Parent</name>
<url>https://github.com/googleapis/sdk-platform-java</url>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.7.1</version>
<version>1.7.4</version>
<relativePath/>
</parent>

Expand All @@ -26,7 +26,7 @@
<!-- External dependencies, especially gRPC and Protobuf version, should be
consistent across modules in this repository -->
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<grpc.version>1.61.1</grpc.version>
<grpc.version>1.62.2</grpc.version>
<google.auth.version>1.23.0</google.auth.version>
<google.http-client.version>1.44.1</google.http-client.version>
<gson.version>2.10.1</gson.version>
Expand Down
Loading

0 comments on commit a104fa9

Please sign in to comment.