Skip to content

Commit

Permalink
Merge branch 'main' into owl-bot-update-lock-31aa2ef27b071c2e7844b0eb…
Browse files Browse the repository at this point in the history
…1d5a24254daff06615b1b138b994dd6345c0b0ea
  • Loading branch information
michaelpri10 authored May 29, 2024
2 parents 68c02a9 + 37e94ce commit d5f646c
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 40 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.129.6](https://github.com/googleapis/java-pubsub/compare/v1.129.5...v1.129.6) (2024-05-23)


### Dependencies

* Update dependency com.google.cloud:google-cloud-storage to v2.39.0 ([#2040](https://github.com/googleapis/java-pubsub/issues/2040)) ([eb6bd9c](https://github.com/googleapis/java-pubsub/commit/eb6bd9c559073429d8338b9d8fa83e0e3f61b8e9))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 ([#2035](https://github.com/googleapis/java-pubsub/issues/2035)) ([40fdd7a](https://github.com/googleapis/java-pubsub/commit/40fdd7a71aa07d6c64ac6f96d7c6642af3563280))

## [1.129.5](https://github.com/googleapis/java-pubsub/compare/v1.129.4...v1.129.5) (2024-05-16)


Expand Down
12 changes: 6 additions & 6 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.39.0</version>
<version>26.40.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -44,28 +44,28 @@ 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.129.4</version>
<version>1.129.6</version>
</dependency>

```

If you are using Gradle 5.x or later, add this to your dependencies:

```Groovy
implementation platform('com.google.cloud:libraries-bom:26.39.0')
implementation platform('com.google.cloud:libraries-bom:26.40.0')
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.129.5'
implementation 'com.google.cloud:google-cloud-pubsub:1.129.6'
```

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

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

Expand Down Expand Up @@ -411,7 +411,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.129.5
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.129.6
[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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.111.5</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.111.7-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.111.5</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.111.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
6 changes: 3 additions & 3 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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-pubsub</site.installationModule>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<scope>runtime</scope>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
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.111.5</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.111.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.111.5</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.111.7-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.111.5</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
<version>1.111.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-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.111.5</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
<version>1.111.7-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.129.5</version><!-- {x-version-update:google-cloud-pubsub:current} -->
<version>1.129.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions 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.129.4</version>
<version>1.129.6</version>
</dependency>
<!-- [END pubsub_install_without_bom] -->

Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.26.1</version>
<version>4.27.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -86,12 +86,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.40.1</version>
<version>2.40.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.38.0</version>
<version>2.39.0</version>
</dependency>
</dependencies>

Expand All @@ -101,7 +101,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-snippets-source</id>
Expand Down
6 changes: 3 additions & 3 deletions samples/native-image-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.39.0</version>
<version>26.40.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -113,7 +113,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>0.10.1</version>
<version>0.10.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -134,7 +134,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.10.1</version>
<version>0.10.2</version>
<extensions>true</extensions>
<configuration>
<mainClass>pubsub.NativeImagePubSubSample
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>1.6.14</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
Expand Down
10 changes: 5 additions & 5 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.129.5</version>
<version>1.129.7-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.26.1</version>
<version>4.27.0</version>
</dependency>

<dependency>
Expand All @@ -85,12 +85,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.40.1</version>
<version>2.40.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.38.0</version>
<version>2.39.0</version>
</dependency>
</dependencies>

Expand All @@ -100,7 +100,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-snippets-source</id>
Expand Down
4 changes: 2 additions & 2 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.39.0</version>
<version>26.40.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.26.1</version>
<version>4.27.0</version>
</dependency>

<dependency>
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.129.5:1.129.5
grpc-google-cloud-pubsub-v1:1.111.5:1.111.5
proto-google-cloud-pubsub-v1:1.111.5:1.111.5
google-cloud-pubsub:1.129.6:1.129.7-SNAPSHOT
grpc-google-cloud-pubsub-v1:1.111.6:1.111.7-SNAPSHOT
proto-google-cloud-pubsub-v1:1.111.6:1.111.7-SNAPSHOT

0 comments on commit d5f646c

Please sign in to comment.