Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/update_generation_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.143.1"
".": "1.144.0"
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.71.0</version>
<version>26.72.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -43,7 +43,7 @@ If you are using Maven without the BOM, add this to your dependencies:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.143.0</version>
<version>1.143.1</version>
</dependency>

```
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions google-cloud-pubsub-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub-bom</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -52,17 +52,17 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-pubsub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<packaging>jar</packaging>
<name>Google Cloud Pub/Sub</name>
<url>https://github.com/googleapis/java-pubsub</url>
<description>Java idiomatic client for Google Cloud Pub/Sub</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub-parent</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-pubsub</site.installationModule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-pubsub-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<name>grpc-google-cloud-pubsub-v1</name>
<description>GRPC library for grpc-google-cloud-pubsub-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub-parent</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub-parent</artifactId>
<packaging>pom</packaging>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<name>Google Cloud Pub/Sub Parent</name>
<url>https://github.com/googleapis/java-pubsub</url>
<description>
Expand Down Expand Up @@ -69,17 +69,17 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</dependency>

<!-- Test dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-pubsub-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
<version>1.125.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.126.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<name>proto-google-cloud-pubsub-v1</name>
<description>PROTO library for proto-google-cloud-pubsub-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub-parent</artifactId>
<version>1.143.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.144.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/install-without-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.33.1</version>
<version>4.33.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.62.1</version>
<version>2.62.2</version>
<classifier>tests</classifier>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/snapshot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.143.1</version>
<version>1.144.1-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.33.1</version>
<version>4.33.2</version>
</dependency>

<dependency>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.62.1</version>
<version>2.62.2</version>
<classifier>tests</classifier>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions samples/snippets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.71.0</version>
<version>26.72.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.33.1</version>
<version>4.33.2</version>
</dependency>

<dependency>
Expand All @@ -103,7 +103,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.62.1</version>
<version>2.62.2</version>
<classifier>tests</classifier>
</dependency>
<!-- [END_EXCLUDE] -->
Expand Down
6 changes: 3 additions & 3 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -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