diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml index 59e39834d..a7e14bb48 100644 --- a/.github/workflows/update_generation_config.yaml +++ b/.github/workflows/update_generation_config.yaml @@ -26,7 +26,7 @@ jobs: # the branch into which the pull request is merged base_branch: main steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e273f3219..9be00fa1c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.143.1" + ".": "1.144.0" } diff --git a/README.md b/README.md index b0672bc00..c75174913 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.71.0 + 26.72.0 pom import @@ -43,7 +43,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.143.0 + 1.143.1 ``` @@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-pubsub' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-pubsub:1.143.1' +implementation 'com.google.cloud:google-cloud-pubsub:1.144.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.143.1" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.144.0" ``` ## Authentication @@ -420,7 +420,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.143.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.144.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 5281720c5..3b9fcbb54 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.143.1 + 1.144.1-SNAPSHOT pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.143.1 + 1.144.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 8d31ef029..977a7250e 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub - 1.143.1 + 1.144.1-SNAPSHOT jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.143.1 + 1.144.1-SNAPSHOT google-cloud-pubsub diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java index ce9bc6f15..a2d4f3b38 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java @@ -144,7 +144,7 @@ public class Subscriber extends AbstractApiService implements SubscriberInterfac private final boolean maxDurationPerAckExtensionDefaultUsed; private final java.time.Duration minDurationPerAckExtension; private final boolean minDurationPerAckExtensionDefaultUsed; - private final long protocolVersion; + private final long protocolVersion = 1L; // The ExecutorProvider used to generate executors for processing messages. private final ExecutorProvider executorProvider; @@ -183,7 +183,6 @@ private Subscriber(Builder builder) { maxDurationPerAckExtensionDefaultUsed = builder.maxDurationPerAckExtensionDefaultUsed; minDurationPerAckExtension = builder.minDurationPerAckExtension; minDurationPerAckExtensionDefaultUsed = builder.minDurationPerAckExtensionDefaultUsed; - protocolVersion = builder.protocolVersion; clock = builder.clock.isPresent() ? builder.clock.get() : CurrentMillisClock.getDefaultClock(); @@ -551,8 +550,6 @@ public static final class Builder { private boolean enableOpenTelemetryTracing = false; private OpenTelemetry openTelemetry = null; - private long protocolVersion = 0L; - private SubscriberShutdownSettings subscriberShutdownSettings = SubscriberShutdownSettings.newBuilder().build(); @@ -776,12 +773,6 @@ Builder setClock(ApiClock clock) { return this; } - /** Gives the ability to override the protocol version */ - public Builder setProtocolVersion(long protocolVersion) { - this.protocolVersion = protocolVersion; - return this; - } - /** * OpenTelemetry will be enabled if setEnableOpenTelemetry is true and and instance of * OpenTelemetry has been provied. Warning: traces are subject to change. The name and diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index fd03db4db..29b3dd9e0 100644 --- a/grpc-google-cloud-pubsub-v1/pom.xml +++ b/grpc-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.143.1 + 1.144.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index f5fd9874d..14d6127ea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.143.1 + 1.144.1-SNAPSHOT Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.143.1 + 1.144.1-SNAPSHOT diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index 012ad1784..4918ef569 100644 --- a/proto-google-cloud-pubsub-v1/pom.xml +++ b/proto-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.125.1 + 1.126.1-SNAPSHOT proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.143.1 + 1.144.1-SNAPSHOT diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ed71217f5..2bdf5dfa8 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -75,12 +75,12 @@ com.google.protobuf protobuf-java-util - 4.33.1 + 4.33.2 com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index addbfc8a2..fa602649f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.143.1 + 1.144.1-SNAPSHOT @@ -61,7 +61,7 @@ com.google.protobuf protobuf-java-util - 4.33.1 + 4.33.2 @@ -79,7 +79,7 @@ com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6441845bd..a80f9af05 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -45,7 +45,7 @@ com.google.cloud libraries-bom - 26.71.0 + 26.72.0 pom import @@ -85,7 +85,7 @@ com.google.protobuf protobuf-java-util - 4.33.1 + 4.33.2 @@ -103,7 +103,7 @@ com.google.cloud google-cloud-core - 2.62.1 + 2.62.2 tests diff --git a/versions.txt b/versions.txt index e51f1f34a..7667c2b45 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.143.1:1.143.1 -grpc-google-cloud-pubsub-v1:1.125.1:1.125.1 -proto-google-cloud-pubsub-v1:1.125.1:1.125.1 +google-cloud-pubsub:1.144.0:1.144.1-SNAPSHOT +grpc-google-cloud-pubsub-v1:1.126.0:1.126.1-SNAPSHOT +proto-google-cloud-pubsub-v1:1.126.0:1.126.1-SNAPSHOT