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 new file mode 100644 index 000000000..e273f3219 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.143.1" +} diff --git a/README.md b/README.md index b0672bc00..a503ceea7 100644 --- a/README.md +++ b/README.md @@ -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 ``` @@ -51,7 +51,7 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.71.0') +implementation platform('com.google.cloud:libraries-bom:26.72.0') implementation 'com.google.cloud:google-cloud-pubsub' ``` diff --git a/generation_config.yaml b/generation_config.yaml index 744688ac1..5963f47a7 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ gapic_generator_version: 2.64.1 -googleapis_commitish: 5342712986262b93211b136eb4bd6fb79b3764af -libraries_bom_version: 26.71.0 +googleapis_commitish: 4667f02b64f2259ef21249b026ced7bb4351c632 +libraries_bom_version: 26.72.0 libraries: - api_shortname: pubsub name_pretty: Cloud Pub/Sub 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/release-please-config.json b/release-please-config.json new file mode 100644 index 000000000..c80f5319f --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,14 @@ +{ + "release-type": "java-yoshi", + "prerelease-type": "rc1", + "versioning": "prerelease", + "separate-pull-requests": false, + "include-component-in-tag": false, + "group-pull-request-title-pattern": "chore(${branch}): release ${version}", + "prerelease": true, + "packages": { + ".": { + "extra-files": [] + } + } +}