Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 833edef

Browse files
committed
Merge branch 'main' into PR #2537 to update
2 parents 5671d89 + f69de7e commit 833edef

23 files changed

Lines changed: 2746 additions & 356 deletions

File tree

.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.57.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.58.0
2121
with:
2222
bom-path: google-cloud-pubsub-bom/pom.xml

.kokoro/presubmit/graalvm-native-a.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.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-b.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.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-c.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_c:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If you are using Maven without the BOM, add this to your dependencies:
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.76.0')
54+
implementation platform('com.google.cloud:libraries-bom:26.78.0')
5555
5656
implementation 'com.google.cloud:google-cloud-pubsub'
5757
```

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.67.0
2-
googleapis_commitish: 9637e50bc0ff6a5e8944980aaf6a2b7f34a90910
3-
libraries_bom_version: 26.76.0
1+
gapic_generator_version: 2.68.0
2+
googleapis_commitish: c063f49852ce7fc08c722c87f3a6f676209985a2
3+
libraries_bom_version: 26.78.0
44
libraries:
55
- api_shortname: pubsub
66
name_pretty: Cloud Pub/Sub

google-cloud-pubsub-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.57.0</version>
11+
<version>3.58.0</version>
1212
</parent>
1313

1414
<name>Google Cloud pubsub BOM</name>

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@ public final Subscription createSubscription(
866866
* .setPushConfig(PushConfig.newBuilder().build())
867867
* .setBigqueryConfig(BigQueryConfig.newBuilder().build())
868868
* .setCloudStorageConfig(CloudStorageConfig.newBuilder().build())
869+
* .setBigtableConfig(BigtableConfig.newBuilder().build())
869870
* .setAckDeadlineSeconds(2135351438)
870871
* .setRetainAckedMessages(true)
871872
* .setMessageRetentionDuration(Duration.newBuilder().build())
@@ -1133,6 +1134,7 @@ public final Subscription createSubscription(
11331134
* .setPushConfig(PushConfig.newBuilder().build())
11341135
* .setBigqueryConfig(BigQueryConfig.newBuilder().build())
11351136
* .setCloudStorageConfig(CloudStorageConfig.newBuilder().build())
1137+
* .setBigtableConfig(BigtableConfig.newBuilder().build())
11361138
* .setAckDeadlineSeconds(2135351438)
11371139
* .setRetainAckedMessages(true)
11381140
* .setMessageRetentionDuration(Duration.newBuilder().build())

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import com.google.api.gax.rpc.BatchingCallSettings;
4646
import com.google.api.gax.rpc.BatchingDescriptor;
4747
import com.google.api.gax.rpc.ClientContext;
48+
import com.google.api.gax.rpc.LibraryMetadata;
4849
import com.google.api.gax.rpc.PageContext;
4950
import com.google.api.gax.rpc.PagedCallSettings;
5051
import com.google.api.gax.rpc.PagedListDescriptor;
@@ -135,6 +136,7 @@
135136
* retries.
136137
*/
137138
@Generated("by gapic-generator-java")
139+
@SuppressWarnings("CanonicalDuration")
138140
public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
139141
/** The default scopes of the service. */
140142
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -595,6 +597,14 @@ protected PublisherStubSettings(Builder settingsBuilder) throws IOException {
595597
testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
596598
}
597599

600+
@Override
601+
protected LibraryMetadata getLibraryMetadata() {
602+
return LibraryMetadata.newBuilder()
603+
.setArtifactName("com.google.cloud:google-cloud-pubsub")
604+
.setRepository("googleapis/java-pubsub")
605+
.build();
606+
}
607+
598608
/** Builder for PublisherStubSettings. */
599609
public static class Builder extends StubSettings.Builder<PublisherStubSettings, Builder> {
600610
private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.google.api.gax.rpc.ApiCallContext;
3737
import com.google.api.gax.rpc.ApiClientHeaderProvider;
3838
import com.google.api.gax.rpc.ClientContext;
39+
import com.google.api.gax.rpc.LibraryMetadata;
3940
import com.google.api.gax.rpc.PageContext;
4041
import com.google.api.gax.rpc.PagedCallSettings;
4142
import com.google.api.gax.rpc.PagedListDescriptor;
@@ -126,6 +127,7 @@
126127
* retries.
127128
*/
128129
@Generated("by gapic-generator-java")
130+
@SuppressWarnings("CanonicalDuration")
129131
public class SchemaServiceStubSettings extends StubSettings<SchemaServiceStubSettings> {
130132
/** The default scopes of the service. */
131133
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
@@ -460,6 +462,14 @@ protected SchemaServiceStubSettings(Builder settingsBuilder) throws IOException
460462
testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
461463
}
462464

465+
@Override
466+
protected LibraryMetadata getLibraryMetadata() {
467+
return LibraryMetadata.newBuilder()
468+
.setArtifactName("com.google.cloud:google-cloud-pubsub")
469+
.setRepository("googleapis/java-pubsub")
470+
.build();
471+
}
472+
463473
/** Builder for SchemaServiceStubSettings. */
464474
public static class Builder extends StubSettings.Builder<SchemaServiceStubSettings, Builder> {
465475
private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;

0 commit comments

Comments
 (0)