Skip to content

Commit

Permalink
Merge branch 'googleapis:main' into message-ordering-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelpri10 authored Feb 8, 2024
2 parents 9fbb3a7 + 77f3c26 commit 962b1f9
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 23 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.126.3](https://github.com/googleapis/java-pubsub/compare/v1.126.2...v1.126.3) (2024-02-08)


### Dependencies

* Update dependency com.google.cloud:google-cloud-core to v2.32.0 ([#1885](https://github.com/googleapis/java-pubsub/issues/1885)) ([a2063cf](https://github.com/googleapis/java-pubsub/commit/a2063cf8f1f792f5ad1994bff00f367b399c0ff2))

## [1.126.2](https://github.com/googleapis/java-pubsub/compare/v1.126.1...v1.126.2) (2024-01-26)


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,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.126.1</version>
<version>1.126.3</version>
</dependency>

```
Expand All @@ -59,13 +59,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.126.2'
implementation 'com.google.cloud:google-cloud-pubsub:1.126.3'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.2"
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.126.3"
```
<!-- {x-version-update-end} -->

Expand Down Expand Up @@ -409,7 +409,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.126.2
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.126.3
[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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.108.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.108.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-pubsub</site.installationModule>
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.108.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.108.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.108.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-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.108.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.108.4-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.126.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.126.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/install-without-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.126.1</version>
<version>1.126.3</version>
</dependency>
<!-- [END pubsub_install_without_bom] -->

Expand Down
2 changes: 1 addition & 1 deletion 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.126.3-SNAPSHOT</version>
<version>1.126.4-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

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.126.2:1.126.3-SNAPSHOT
grpc-google-cloud-pubsub-v1:1.108.2:1.108.3-SNAPSHOT
proto-google-cloud-pubsub-v1:1.108.2:1.108.3-SNAPSHOT
google-cloud-pubsub:1.126.3:1.126.4-SNAPSHOT
grpc-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT
proto-google-cloud-pubsub-v1:1.108.3:1.108.4-SNAPSHOT

0 comments on commit 962b1f9

Please sign in to comment.