diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml index 9b28b82764..536d96000b 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-a.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.54.1' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.54.2' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.17.0' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml index f9e7661f9c..975b9cde0c 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-b.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.54.1' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.54.2' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.17.0' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild-test-c.yaml b/.cloudbuild/graalvm/cloudbuild-test-c.yaml index dff3271816..c7a556efe7 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-c.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.54.1' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.54.2' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.17.0' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml index 79227fb313..a905c077dd 100644 --- a/.cloudbuild/graalvm/cloudbuild.yaml +++ b/.cloudbuild/graalvm/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.54.1' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.54.2' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.17.0' steps: # GraalVM A build diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml index cd69dc7384..ad93811499 100644 --- a/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml +++ b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _GAPIC_GENERATOR_JAVA_VERSION: '2.64.1' # {x-version-update:gapic-generator-java:current} + _GAPIC_GENERATOR_JAVA_VERSION: '2.64.2' # {x-version-update:gapic-generator-java:current} _PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation" _PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}" _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest" diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index e42c5cdae5..0a5c05cb4f 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852 WORKDIR /sdk-platform-java COPY . . # {x-version-update-start:gapic-generator-java:current} -ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.1" +ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2" # {x-version-update-end} # Download the java formatter @@ -38,7 +38,7 @@ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad31690 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 ARG PROTOC_VERSION=25.8 -ARG GRPC_VERSION=1.76.0 +ARG GRPC_VERSION=1.76.2 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile index 53f20939c2..d4aaed4744 100644 --- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile +++ b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile @@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0 WORKDIR /sdk-platform-java COPY . . # {x-version-update-start:gapic-generator-java:current} -ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.1" +ENV DOCKER_GAPIC_GENERATOR_VERSION="2.64.2" # {x-version-update-end} # Download the java formatter @@ -39,7 +39,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5 ARG PROTOC_VERSION=25.8 -ARG GRPC_VERSION=1.76.0 +ARG GRPC_VERSION=1.76.2 ENV HOME=/home ENV OS_ARCHITECTURE="linux-x86_64" diff --git a/.github/release-please.yml b/.github/release-please.yml index 80d149bc1d..9de4135d48 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -18,6 +18,11 @@ extraFiles: hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg - generation_config.yaml branches: + - branch: protobuf-4.x-rc + bumpMinorPreMajor: true + handleGHRelease: true + manifest: true + releaseType: java-yoshi - branch: 2.23.x releaseType: java-backport manifest: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 03ec3e3d0d..1f3cab433e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -402,7 +402,7 @@ jobs: working-directory: java-showcase run: | mvn versions:set -B -ntp -DnewVersion=local - mvn clirr:check -B -ntp -Dclirr.skip=false -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION + mvn clirr:check -B -ntp -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION gapic-generator-java-bom: runs-on: ubuntu-22.04 diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index c6b3f64856..3190f0c0fa 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -1,7 +1,4 @@ on: - push: - branches: - - main pull_request: # Changes to these directories do not directly affect the downstream libraries paths-ignore: diff --git a/.gitignore b/.gitignore index b1b8440011..1f5d6bd388 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,12 @@ target/ *.vim # Vscode Settings -.vscode/settings.json +.vscode # Python **/__pycache__/ .venv +.python-version # library generation **/googleapis diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3e8b70de96..0cf9aa6300 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.64.1" + ".": "2.64.2" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ff029d6e39..d9e98822fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [2.64.2](https://github.com/googleapis/sdk-platform-java/compare/v2.64.1...v2.64.2) (2025-12-10) + + +### Bug Fixes + +* add per-service api_version to gapic_metadata ([#3984](https://github.com/googleapis/sdk-platform-java/issues/3984)) ([d589306](https://github.com/googleapis/sdk-platform-java/commit/d589306c4ecc12a2a744cb9dfb914ccea8fb34fd)) + + +### Dependencies + +* Upgrade auth to 1.41.0. ([#4008](https://github.com/googleapis/sdk-platform-java/issues/4008)) ([833b3e5](https://github.com/googleapis/sdk-platform-java/commit/833b3e54c0f13ac8183a639c4464dcf58fd44096)) +* upgrade grpc to 1.76.1 ([#3993](https://github.com/googleapis/sdk-platform-java/issues/3993)) ([958611e](https://github.com/googleapis/sdk-platform-java/commit/958611e23460dba596160f3224d8588afdba6bc2)) +* Upgrade grpc to 1.76.2 ([#4006](https://github.com/googleapis/sdk-platform-java/issues/4006)) ([a8060a2](https://github.com/googleapis/sdk-platform-java/commit/a8060a263ba34556b8d4d347a57625849a6859bc)) + ## [2.64.1](https://github.com/googleapis/sdk-platform-java/compare/v2.64.0...v2.64.1) (2025-11-07) diff --git a/WORKSPACE b/WORKSPACE index 8d5cace83d..a5a4b9df5e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS") -_gapic_generator_java_version = "2.64.1" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.64.2" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 3100c35b88..9bbbd5ac48 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.55.1 + 2.55.2 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 1588a2cd43..8067c05198 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.72.1 + 2.72.2 com.google.api gax-grpc - 2.72.1 + 2.72.2 com.google.api gax-httpjson - 2.72.1 + 2.72.2 com.google.api api-common - 2.55.1 + 2.55.2 diff --git a/dependencies.txt b/dependencies.txt index 58ada42bfd..7d1b241457 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -9,14 +9,14 @@ # Pom-Parent Dependencies # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2 -io.grpc:grpc-bom,grpc=1.74.0 -com.google.auth:google-auth-library-bom,google.auth=1.40.0 -com.google.http-client:google-http-client,google.http-client=1.47.1 +io.grpc:grpc-bom,grpc=1.76.2 +com.google.auth:google-auth-library-bom,google.auth=1.41.0 +com.google.http-client:google-http-client,google.http-client=2.0.2 com.google.code.gson:gson,gson=2.13.2 -com.google.guava:guava,guava=33.4.8-jre -com.google.protobuf:protobuf-java,protobuf=4.31.1 -io.opentelemetry:opentelemetry-bom,opentelemetry=1.55.0 -com.google.errorprone:error_prone_annotations,errorprone=2.43.0 +com.google.guava:guava,guava=33.5.0-jre +com.google.protobuf:protobuf-java,protobuf=4.33.1 +io.opentelemetry:opentelemetry-bom,opentelemetry=1.57.0 +com.google.errorprone:error_prone_annotations,errorprone=2.45.0 com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1 org.threeten:threetenbp,threetenbp=1.7.2 org.slf4j:slf4j-api,slf4j=2.0.17 @@ -44,7 +44,7 @@ com.google.cloud.opentelemetry:exporter-metrics,google.cloud.opentelemetry=0.36. com.google.flogger:flogger,flogger=0.9 org.apache.arrow:arrow-memory-core,arrow=18.3.0 dev.cel:cel,dev.cel=0.11.1 -com.google.crypto.tink:tink,com.google.crypto.tink=1.19.0 +com.google.crypto.tink:tink,com.google.crypto.tink=1.20.0 # The follow opentelemetry dependencies have a different version from the opentelemetry-bom io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.37.0 -io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha +io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.52.0-alpha diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index b77346aa85..ad8db6ca4c 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.64.1 + 2.64.2 GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -75,81 +75,81 @@ com.google.api api-common - 2.55.1 + 2.55.2 com.google.api gax-bom - 2.72.1 + 2.72.2 pom import com.google.api gapic-generator-java - 2.64.1 + 2.64.2 com.google.api.grpc grpc-google-common-protos - 2.63.1 + 2.63.2 com.google.api.grpc proto-google-common-protos - 2.63.1 + 2.63.2 com.google.api.grpc proto-google-iam-v1 - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v2 - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v2beta - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v3 - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v3beta - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v1 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v2 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v2beta - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v3 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v3beta - 1.58.1 + 1.58.2 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index c9d08b722e..1bcf00ffc7 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java @@ -27,8 +27,8 @@ 1.3.2 - 1.76.0 - 1.40.0 + 1.76.2 + 1.41.0 2.0.2 2.12.1 33.5.0-jre diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index a1f6adf345..8687a85b96 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.64.1 + 2.64.2 GAPIC Generator Java GAPIC generator Java @@ -14,7 +14,7 @@ true UTF-8 - 44d6bef0ca6db8bba3fb324c8186e694bcc4829c + 9fcfbea0aa5b50fa22e190faceb073d74504172b 1.8 1.8 @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.64.1 + 2.64.2 pom import diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 0bd67e1663..913ffd0f5c 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -1898,12 +1898,15 @@ private static void updateGapicMetadata( serviceClientProtoBuilder.putRpcs(rpcName, methodList); } - metadataBuilder = - metadataBuilder.putServices( - service.name(), - GapicMetadata.ServiceForTransport.newBuilder() - .putClients("grpc", serviceClientProtoBuilder.build()) - .build()); + GapicMetadata.ServiceForTransport.Builder grpcServiceClient = + GapicMetadata.ServiceForTransport.newBuilder() + .putClients("grpc", serviceClientProtoBuilder.build()); + + if (service.hasApiVersion()) { + grpcServiceClient.setApiVersion(service.apiVersion()); + } + + metadataBuilder = metadataBuilder.putServices(service.name(), grpcServiceClient.build()); context.updateGapicMetadata(metadataBuilder.build()); } } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden index d9a1215708..b0ffbf3c02 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden @@ -17,6 +17,7 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.FieldMask; import google.cloud.ProjectName; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -79,6 +80,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -89,6 +92,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -139,6 +146,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -149,6 +158,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -199,6 +212,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -209,6 +224,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -259,6 +278,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -269,6 +290,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -319,6 +344,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -329,6 +356,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -369,6 +400,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -379,6 +412,10 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); @@ -419,6 +456,8 @@ public class SubscriberClientTest { .setName(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .setTopic(TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]").toString()) .setPushConfig(PushConfig.newBuilder().build()) + .setBigqueryConfig(BigQueryConfig.newBuilder().build()) + .setCloudStorageConfig(CloudStorageConfig.newBuilder().build()) .setAckDeadlineSeconds(2135351438) .setRetainAckedMessages(true) .putAllLabels(new HashMap()) @@ -429,23 +468,25 @@ public class SubscriberClientTest { .setRetryPolicy(RetryPolicy.newBuilder().build()) .setDetached(true) .setEnableExactlyOnceDelivery(true) + .setAnalyticsHubSubscriptionInfo( + Subscription.AnalyticsHubSubscriptionInfo.newBuilder().build()) + .addAllMessageTransforms(new ArrayList()) + .putAllTags(new HashMap()) .build(); mockSubscriber.addResponse(expectedResponse); - UpdateSubscriptionRequest request = - UpdateSubscriptionRequest.newBuilder() - .setSubscription(Subscription.newBuilder().build()) - .build(); + Subscription subscription = Subscription.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); - Subscription actualResponse = client.updateSubscription(request); + Subscription actualResponse = client.updateSubscription(subscription, updateMask); Assert.assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSubscriptionRequest actualRequest = ((UpdateSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(request.getSubscription(), actualRequest.getSubscription()); - Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); + Assert.assertEquals(subscription, actualRequest.getSubscription()); + Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -458,11 +499,9 @@ public class SubscriberClientTest { mockSubscriber.addException(exception); try { - UpdateSubscriptionRequest request = - UpdateSubscriptionRequest.newBuilder() - .setSubscription(Subscription.newBuilder().build()) - .build(); - client.updateSubscription(request); + Subscription subscription = Subscription.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + client.updateSubscription(subscription, updateMask); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. @@ -946,7 +985,7 @@ public class SubscriberClientTest { StreamingPullResponse expectedResponse = StreamingPullResponse.newBuilder() .addAllReceivedMessages(new ArrayList()) - .setAcknowlegeConfirmation( + .setAcknowledgeConfirmation( StreamingPullResponse.AcknowledgeConfirmation.newBuilder().build()) .setModifyAckDeadlineConfirmation( StreamingPullResponse.ModifyAckDeadlineConfirmation.newBuilder().build()) @@ -964,6 +1003,7 @@ public class SubscriberClientTest { .setClientId("clientId908408390") .setMaxOutstandingMessages(-1315266996) .setMaxOutstandingBytes(-2103098517) + .setProtocolVersion(-1161610703) .build(); MockStreamObserver responseObserver = new MockStreamObserver<>(); @@ -995,6 +1035,7 @@ public class SubscriberClientTest { .setClientId("clientId908408390") .setMaxOutstandingMessages(-1315266996) .setMaxOutstandingBytes(-2103098517) + .setProtocolVersion(-1161610703) .build(); MockStreamObserver responseObserver = new MockStreamObserver<>(); @@ -1440,18 +1481,18 @@ public class SubscriberClientTest { .build(); mockSubscriber.addResponse(expectedResponse); - UpdateSnapshotRequest request = - UpdateSnapshotRequest.newBuilder().setSnapshot(Snapshot.newBuilder().build()).build(); + Snapshot snapshot = Snapshot.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); - Snapshot actualResponse = client.updateSnapshot(request); + Snapshot actualResponse = client.updateSnapshot(snapshot, updateMask); Assert.assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSnapshotRequest actualRequest = ((UpdateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(request.getSnapshot(), actualRequest.getSnapshot()); - Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); + Assert.assertEquals(snapshot, actualRequest.getSnapshot()); + Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -1464,9 +1505,9 @@ public class SubscriberClientTest { mockSubscriber.addException(exception); try { - UpdateSnapshotRequest request = - UpdateSnapshotRequest.newBuilder().setSnapshot(Snapshot.newBuilder().build()).build(); - client.updateSnapshot(request); + Snapshot snapshot = Snapshot.newBuilder().build(); + FieldMask updateMask = FieldMask.newBuilder().build(); + client.updateSnapshot(snapshot, updateMask); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java index 7438d53b01..ecc3e682ae 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposerTest.java @@ -33,6 +33,7 @@ import com.google.logging.v2.LoggingProto; import com.google.protobuf.Descriptors.FileDescriptor; import com.google.protobuf.Descriptors.ServiceDescriptor; +import com.google.protobuf.EmptyProto; import com.google.showcase.v1beta1.EchoOuterClass; import com.google.showcase.v1beta1.TestingOuterClass; import com.google.test.collisions.CollisionsOuterClass; @@ -143,6 +144,12 @@ void generateResourceNameClass_loggingOnePatternMultipleVariables() { FileDescriptor commonResourcesFileDescriptor = CommonResources.getDescriptor(); resourceNames.putAll(Parser.parseResourceNames(commonResourcesFileDescriptor)); + // Additional dependency found in LoggingService.DeleteLink LRO + // (google.longrunning.operation_info).response_type. Necessary for + // complete parsing of the descriptors. + FileDescriptor emptyFileDescriptor = EmptyProto.getDescriptor(); + messageTypes.putAll(Parser.parseMessages(emptyFileDescriptor)); + Set outputResourceNames = new HashSet<>(); Parser.parseService( serviceFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); diff --git a/gax-java/README.md b/gax-java/README.md index f9bc8c9259..11ee55fb7b 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.72.1 + 2.72.2 com.google.api gax-grpc - 2.72.1 + 2.72.2 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.72.1', - 'com.google.api:gax-grpc:2.72.1' +compile 'com.google.api:gax:2.72.2', + 'com.google.api:gax-grpc:2.72.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.72.1" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.72.1" +libraryDependencies += "com.google.api" % "gax" % "2.72.2" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.72.2" ``` [//]: # ({x-version-update-end}) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index f82c3afb54..a8183384e8 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.72.1 +version.gax=2.72.2 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.72.1 +version.gax_grpc=2.72.2 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.72.1 +version.gax_bom=2.72.2 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.72.1 +version.gax_httpjson=2.72.2 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. @@ -28,7 +28,7 @@ version.gax_httpjson=2.72.1 version.com_google_protobuf=3.25.8 version.google_java_format=1.15.0 -version.io_grpc=1.76.0 +version.io_grpc=1.76.2 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). @@ -37,8 +37,8 @@ version.io_grpc=1.76.0 # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.61.1 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.61.1 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.40.0 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.40.0 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.41.0 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.41.0 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.47.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1 diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 7b183deb0c..5c13ea88b2 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.72.1 + 2.72.2 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.72.1 + 2.72.2 com.google.api gax - 2.72.1 + 2.72.2 test-jar testlib com.google.api gax - 2.72.1 + 2.72.2 testlib com.google.api gax-grpc - 2.72.1 + 2.72.2 com.google.api gax-grpc - 2.72.1 + 2.72.2 test-jar testlib com.google.api gax-grpc - 2.72.1 + 2.72.2 testlib com.google.api gax-httpjson - 2.72.1 + 2.72.2 com.google.api gax-httpjson - 2.72.1 + 2.72.2 test-jar testlib com.google.api gax-httpjson - 2.72.1 + 2.72.2 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index 09cfd56403..21854d3d79 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.72.1 + 2.72.2 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.72.1 + 2.72.2 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 1d0253a99d..9e889754ed 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.72.1 + 2.72.2 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.72.1 + 2.72.2 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index f4ac551890..e6a568e63b 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.72.1 + 2.72.2 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.72.1 + 2.72.2 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 0f5e0a0ee6..23e4fc20bd 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.72.1 + 2.72.2 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.55.1 + 2.55.2 com.google.auth @@ -98,24 +98,24 @@ com.google.api gax - 2.72.1 + 2.72.2 com.google.api gax - 2.72.1 + 2.72.2 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.63.1 + 2.63.2 com.google.api.grpc grpc-google-common-protos - 2.63.1 + 2.63.2 io.grpc diff --git a/generation_config.yaml b/generation_config.yaml index fee5723e6c..c7afb5877e 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,4 +1,4 @@ -googleapis_commitish: b6bb60733a7314d0c45e294b12d563fd6194b8f5 +googleapis_commitish: c9578f6385fe0fb9067c5dba8d7cdda39efac0ff # the libraries are ordered with respect to library name, which is # java-{library.library_name} or java-{library.api-shortname} when # library.library_name is not defined. diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg index b772eac66c..406018c48a 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.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.54.1" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg index baf136cf82..60c82d4bf4 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.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.54.1" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg index 2fb2fc87c4..60982adf5a 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.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_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 96fc4c451e..3592184d2d 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.63.1 + 2.63.2 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.63.1 + 2.63.2 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 95b5a0c161..14c5029ccc 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.63.1 + 2.63.2 Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.cloud third-party-dependencies - 3.54.1 + 3.54.2 pom import @@ -64,7 +64,7 @@ com.google.api.grpc grpc-google-common-protos - 2.63.1 + 2.63.2 io.grpc @@ -76,7 +76,7 @@ com.google.api.grpc proto-google-common-protos - 2.63.1 + 2.63.2 com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index e940d21e2c..618abf5a70 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.63.1 + 2.63.2 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.63.1 + 2.63.2 diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index ede039214f..5332047dfb 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.62.1 + 2.62.2 pom com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 com.google.cloud google-cloud-core-grpc - 2.62.1 + 2.62.2 com.google.cloud google-cloud-core-http - 2.62.1 + 2.62.2 diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index fd05c4e92d..8bc2995989 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.62.1 + 2.62.2 jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.62.1 + 2.62.2 google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index 4c77e39198..d855f06f62 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.62.1 + 2.62.2 jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.62.1 + 2.62.2 google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index f0054a84e5..f9f1639686 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.62.1 + 2.62.2 google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index 5ac56eb1f9..ba2b0d494d 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.62.1 + 2.62.2 Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.54.1 + 3.54.2 pom import @@ -64,7 +64,7 @@ com.google.errorprone - error_prone_annotationsa + error_prone_annotations ${errorprone.version} diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index 4a59a57694..769d8298b8 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.58.1 + 1.58.2 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index c42a691fd7..2109beefac 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.58.1 + 1.58.2 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 8f363d129a..06dffc3dfb 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.58.1 + 1.58.2 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/grpc-google-iam-v3/pom.xml b/java-iam/grpc-google-iam-v3/pom.xml index dd6dbef735..d5d95a9ccb 100644 --- a/java-iam/grpc-google-iam-v3/pom.xml +++ b/java-iam/grpc-google-iam-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v3 - 1.58.1 + 1.58.2 grpc-google-iam-v3 GRPC library for proto-google-iam-v3 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/grpc-google-iam-v3beta/pom.xml b/java-iam/grpc-google-iam-v3beta/pom.xml index 443ac67400..8ca3ff86c6 100644 --- a/java-iam/grpc-google-iam-v3beta/pom.xml +++ b/java-iam/grpc-google-iam-v3beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v3beta - 1.58.1 + 1.58.2 grpc-google-iam-v3beta GRPC library for proto-google-iam-v3beta com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index f571174ae5..31cba6df23 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.58.1 + 1.58.2 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -50,19 +50,19 @@ com.google.cloud third-party-dependencies - 3.54.1 + 3.54.2 pom import com.google.api.grpc proto-google-iam-v3beta - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v3beta - 1.58.1 + 1.58.2 com.google.guava @@ -88,59 +88,59 @@ com.google.api gax-bom - 2.72.1 + 2.72.2 pom import com.google.api api-common - 2.55.1 + 2.55.2 com.google.api.grpc proto-google-iam-v2 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v2 - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-common-protos - 2.63.1 + 2.63.2 com.google.api.grpc proto-google-iam-v2beta - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v1 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v2beta - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v1 - 1.58.1 + 1.58.2 com.google.api.grpc proto-google-iam-v3 - 1.58.1 + 1.58.2 com.google.api.grpc grpc-google-iam-v3 - 1.58.1 + 1.58.2 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 41b23a264d..2091184ce7 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.58.1 + 1.58.2 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index ac4ff0ab4a..d9659cef2d 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.58.1 + 1.58.2 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index ce6cc39e00..617dfe6a30 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.58.1 + 1.58.2 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/proto-google-iam-v3/pom.xml b/java-iam/proto-google-iam-v3/pom.xml index c7cef1359d..e48ef9b056 100644 --- a/java-iam/proto-google-iam-v3/pom.xml +++ b/java-iam/proto-google-iam-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v3 - 1.58.1 + 1.58.2 proto-google-iam-v3 Proto library for proto-google-iam-v3 com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-iam/proto-google-iam-v3beta/pom.xml b/java-iam/proto-google-iam-v3beta/pom.xml index f2fdee5b35..38df009b23 100644 --- a/java-iam/proto-google-iam-v3beta/pom.xml +++ b/java-iam/proto-google-iam-v3beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v3beta - 1.58.1 + 1.58.2 proto-google-iam-v3beta Proto library for proto-google-iam-v3beta com.google.cloud google-iam-parent - 1.58.1 + 1.58.2 diff --git a/java-shared-dependencies/README.md b/java-shared-dependencies/README.md index ac6fa1b896..8b7c4b138c 100644 --- a/java-shared-dependencies/README.md +++ b/java-shared-dependencies/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 3.54.1 + 3.54.2 pom import diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index fba601084d..d85bce756c 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.54.1 + 3.54.2 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 110c29b9bc..2f0692a36b 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.54.1 + 3.54.2 Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.64.1 + 2.64.2 pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.62.1 + 2.62.2 pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 test-jar com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 7c02b06d5b..ab852aed7d 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.54.1 + 3.54.2 first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.54.1 + 3.54.2 pom import com.google.cloud third-party-dependencies - 3.54.1 + 3.54.2 pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 9dba6615ca..3a89ea92f2 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.54.1 + 3.54.2 Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.64.1 + 2.64.2 ../../gapic-generator-java-pom-parent diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 630bec77ae..1128b86213 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.54.1 + 3.54.2 Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.54.1 + 3.54.2 pom import diff --git a/java-showcase/gapic-showcase/pom.xml b/java-showcase/gapic-showcase/pom.xml index 845158467f..a9e4de22fe 100644 --- a/java-showcase/gapic-showcase/pom.xml +++ b/java-showcase/gapic-showcase/pom.xml @@ -18,7 +18,9 @@ 0.36.2 + 1.2.13 + 1.5.21 @@ -244,13 +246,13 @@ ch.qos.logback logback-classic - 1.5.16 + ${slf4j2-logback.version} test ch.qos.logback logback-core - 1.5.16 + ${slf4j2-logback.version} test @@ -333,13 +335,13 @@ ch.qos.logback logback-classic - 1.2.13 + ${slf4j1-logback.version} test ch.qos.logback logback-core - 1.3.15 + ${slf4j1-logback.version} test diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/gapic_metadata.json b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/gapic_metadata.json index 1ab92719fe..4d11ed39b9 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/gapic_metadata.json +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/gapic_metadata.json @@ -114,7 +114,8 @@ } } } - } + }, + "apiVersion": "v1_20240408" }, "Identity": { "clients": { diff --git a/java-showcase/pom.xml b/java-showcase/pom.xml index 9c3be6630e..5cd5b74247 100644 --- a/java-showcase/pom.xml +++ b/java-showcase/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.54.1 + 3.54.2 pom import diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml index 28bb01b9e4..db49f85f77 100644 --- a/sdk-platform-java-config/pom.xml +++ b/sdk-platform-java-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud sdk-platform-java-config pom - 3.54.1 + 3.54.2 SDK Platform For Java Configurations Shared build configuration for Google Cloud Java libraries. @@ -17,6 +17,6 @@ - 3.54.1 + 3.54.2 \ No newline at end of file diff --git a/versions.txt b/versions.txt index d8bde56d08..5b2e848a86 100644 --- a/versions.txt +++ b/versions.txt @@ -1,26 +1,26 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.64.1:2.64.1 -api-common:2.55.1:2.55.1 -gax:2.72.1:2.72.1 -gax-grpc:2.72.1:2.72.1 -gax-httpjson:0.157.1:0.157.1 -proto-google-common-protos:2.63.1:2.63.1 -grpc-google-common-protos:2.63.1:2.63.1 -proto-google-iam-v1:1.58.1:1.58.1 -grpc-google-iam-v1:1.58.1:1.58.1 -proto-google-iam-v2beta:1.58.1:1.58.1 -grpc-google-iam-v2beta:1.58.1:1.58.1 -google-iam-policy:1.58.1:1.58.1 -proto-google-iam-v2:1.58.1:1.58.1 -grpc-google-iam-v2:1.58.1:1.58.1 -google-cloud-core:2.62.1:2.62.1 -google-cloud-shared-dependencies:3.54.1:3.54.1 -gapic-showcase:0.10.1:0.10.1 -proto-gapic-showcase-v1beta1:0.10.1:0.10.1 -grpc-gapic-showcase-v1beta1:0.10.1:0.10.1 -proto-google-iam-v3:1.58.1:1.58.1 -grpc-google-iam-v3:1.58.1:1.58.1 -proto-google-iam-v3beta:1.58.1:1.58.1 -grpc-google-iam-v3beta:1.58.1:1.58.1 +gapic-generator-java:2.64.2:2.64.2 +api-common:2.55.2:2.55.2 +gax:2.72.2:2.72.2 +gax-grpc:2.72.2:2.72.2 +gax-httpjson:0.157.2:0.157.2 +proto-google-common-protos:2.63.2:2.63.2 +grpc-google-common-protos:2.63.2:2.63.2 +proto-google-iam-v1:1.58.2:1.58.2 +grpc-google-iam-v1:1.58.2:1.58.2 +proto-google-iam-v2beta:1.58.2:1.58.2 +grpc-google-iam-v2beta:1.58.2:1.58.2 +google-iam-policy:1.58.2:1.58.2 +proto-google-iam-v2:1.58.2:1.58.2 +grpc-google-iam-v2:1.58.2:1.58.2 +google-cloud-core:2.62.2:2.62.2 +google-cloud-shared-dependencies:3.54.2:3.54.2 +gapic-showcase:0.10.2:0.10.2 +proto-gapic-showcase-v1beta1:0.10.2:0.10.2 +grpc-gapic-showcase-v1beta1:0.10.2:0.10.2 +proto-google-iam-v3:1.58.2:1.58.2 +grpc-google-iam-v3:1.58.2:1.58.2 +proto-google-iam-v3beta:1.58.2:1.58.2 +grpc-google-iam-v3beta:1.58.2:1.58.2