Skip to content

Commit 8c98dda

Browse files
authored
Merge branch 'googleapis:main' into main
2 parents b82fe1b + 6db0390 commit 8c98dda

File tree

27 files changed

+126
-95
lines changed

27 files changed

+126
-95
lines changed

.github/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ branches:
4242
handleGHRelease: true
4343
releaseType: java-backport
4444
branch: 1.129.x
45+
- bumpMinorPreMajor: true
46+
handleGHRelease: true
47+
releaseType: java-backport
48+
branch: 1.137.x

.github/sync-repo-settings.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,24 @@ branchProtectionRules:
177177
- 'Kokoro - Test: Java GraalVM Native Image'
178178
- 'Kokoro - Test: Java 17 GraalVM Native Image'
179179
- javadoc
180+
- pattern: 1.137.x
181+
isAdminEnforced: true
182+
requiredApprovingReviewCount: 1
183+
requiresCodeOwnerReviews: true
184+
requiresStrictStatusChecks: false
185+
requiredStatusCheckContexts:
186+
- dependencies (17)
187+
- lint
188+
- clirr
189+
- units (8)
190+
- units (11)
191+
- 'Kokoro - Test: Integration'
192+
- cla/google
193+
- 'Kokoro - Test: Java GraalVM Native Image'
194+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
195+
- javadoc
196+
- library_generation
197+
- unmanaged_dependency_check
180198
permissionRules:
181199
- team: yoshi-admins
182200
permission: admin

.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.54.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
2121
with:
2222
bom-path: google-cloud-pubsub-bom/pom.xml

.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0"
77
}
88

99
env_vars: {

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [1.137.1](https://github.com/googleapis/java-pubsub/compare/v1.137.0...v1.137.1) (2025-02-26)
4+
5+
6+
### Bug Fixes
7+
8+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.54.0 ([ccf670f](https://github.com/googleapis/java-pubsub/commit/ccf670f9dc755770d40b9d1bf2c870c0452aa39e))
9+
10+
11+
### Dependencies
12+
13+
* Update dependency com.google.cloud:google-cloud-bigquery to v2.48.0 ([#2343](https://github.com/googleapis/java-pubsub/issues/2343)) ([3bbd7e1](https://github.com/googleapis/java-pubsub/commit/3bbd7e1e812a7a00cfff36a0c1d8a5212d4e134a))
14+
* Update dependency com.google.cloud:google-cloud-core to v2.52.0 ([#2348](https://github.com/googleapis/java-pubsub/issues/2348)) ([f0977b4](https://github.com/googleapis/java-pubsub/commit/f0977b40479823ce5b7e90f864261f11115610ca))
15+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.44.0 ([#2349](https://github.com/googleapis/java-pubsub/issues/2349)) ([90ed10b](https://github.com/googleapis/java-pubsub/commit/90ed10b474f7a59286365d8a6ad676d9a4f4113b))
16+
* Update googleapis/sdk-platform-java action to v2.54.0 ([#2347](https://github.com/googleapis/java-pubsub/issues/2347)) ([ac8db2d](https://github.com/googleapis/java-pubsub/commit/ac8db2dda6cd5f0bdf689052bb37cb2eaab08c46))
17+
318
## [1.137.0](https://github.com/googleapis/java-pubsub/compare/v1.136.1...v1.137.0) (2025-02-12)
419

520

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.54.0</version>
22+
<version>26.55.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -43,28 +43,28 @@ If you are using Maven without the BOM, add this to your dependencies:
4343
<dependency>
4444
<groupId>com.google.cloud</groupId>
4545
<artifactId>google-cloud-pubsub</artifactId>
46-
<version>1.136.1</version>
46+
<version>1.137.0</version>
4747
</dependency>
4848

4949
```
5050

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

5353
```Groovy
54-
implementation platform('com.google.cloud:libraries-bom:26.54.0')
54+
implementation platform('com.google.cloud:libraries-bom:26.55.0')
5555
5656
implementation 'com.google.cloud:google-cloud-pubsub'
5757
```
5858
If you are using Gradle without BOM, add this to your dependencies:
5959

6060
```Groovy
61-
implementation 'com.google.cloud:google-cloud-pubsub:1.137.0'
61+
implementation 'com.google.cloud:google-cloud-pubsub:1.137.1'
6262
```
6363

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

6666
```Scala
67-
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.137.0"
67+
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.137.1"
6868
```
6969

7070
## Authentication
@@ -418,7 +418,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
418418
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html
419419
[stability-image]: https://img.shields.io/badge/stability-stable-green
420420
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg
421-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.137.0
421+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.137.1
422422
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
423423
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
424424
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

generation_config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.53.0
2-
googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
3-
libraries_bom_version: 26.54.0
1+
gapic_generator_version: 2.54.0
2+
googleapis_commitish: 68b6376ca75f03094a65ec5bbbc868bd9f058ee3
3+
libraries_bom_version: 26.55.0
44
libraries:
55
- api_shortname: pubsub
66
name_pretty: Cloud Pub/Sub

google-cloud-pubsub-bom/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-pubsub-bom</artifactId>
6-
<version>1.137.0</version><!-- {x-version-update:google-cloud-pubsub:current} -->
6+
<version>1.137.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.43.0</version>
11+
<version>3.44.0</version>
1212
</parent>
1313

1414
<name>Google Cloud pubsub BOM</name>
@@ -52,17 +52,17 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-pubsub</artifactId>
55-
<version>1.137.0</version><!-- {x-version-update:google-cloud-pubsub:current} -->
55+
<version>1.137.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.api.grpc</groupId>
5959
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
60-
<version>1.119.0</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
60+
<version>1.119.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.google.api.grpc</groupId>
6464
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
65-
<version>1.119.0</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
65+
<version>1.119.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
6666
</dependency>
6767
</dependencies>
6868
</dependencyManagement>

0 commit comments

Comments
 (0)