diff --git a/.github/release-please.yml b/.github/release-please.yml index 2599810ac..c6976da6a 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -30,3 +30,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.121.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 1.123.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5f005e32f..d02beedae 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -135,6 +135,23 @@ branchProtectionRules: - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' + - pattern: 1.123.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - Kokoro - Against Pub/Sub Lite samples + - cla/google + - OwlBot Post Processor + - 'Kokoro - Test: Java GraalVM Native Image' + - 'Kokoro - Test: Java 17 GraalVM Native Image' permissionRules: - team: yoshi-admins permission: admin diff --git a/CHANGELOG.md b/CHANGELOG.md index 658dddfb6..a6692e628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.124.0](https://github.com/googleapis/java-pubsub/compare/v1.123.20...v1.124.0) (2023-07-27) + + +### Features + +* Setup 1.123.x lts branch ([#1676](https://github.com/googleapis/java-pubsub/issues/1676)) ([a60b887](https://github.com/googleapis/java-pubsub/commit/a60b88772d69d367f90bbe61bc4e157338193b0f)) + + +### Documentation + +* Clarified where ordering_key will be written if write_metadata is set ([#1675](https://github.com/googleapis/java-pubsub/issues/1675)) ([462746c](https://github.com/googleapis/java-pubsub/commit/462746cfbf9b712118b67349f2f4f4cebf45932a)) + ## [1.123.20](https://github.com/googleapis/java-pubsub/compare/v1.123.19...v1.123.20) (2023-07-25) diff --git a/README.md b/README.md index 907a828d2..b001b9875 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-pubsub - 1.123.18 + 1.123.20 ``` @@ -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.123.19' +implementation 'com.google.cloud:google-cloud-pubsub:1.123.20' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.123.19" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.123.20" ``` @@ -408,7 +408,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.123.19 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.123.20 [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 diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml index 524443818..1b1c22f9b 100644 --- a/google-cloud-pubsub-bom/pom.xml +++ b/google-cloud-pubsub-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub-bom - 1.123.20 + 1.124.0 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsub - 1.123.20 + 1.124.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 8c863e3a6..21457228c 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-pubsub - 1.123.20 + 1.124.0 jar Google Cloud Pub/Sub https://github.com/googleapis/java-pubsub @@ -11,7 +11,7 @@ com.google.cloud google-cloud-pubsub-parent - 1.123.20 + 1.124.0 google-cloud-pubsub diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml index 88ccb572a..78490937c 100644 --- a/grpc-google-cloud-pubsub-v1/pom.xml +++ b/grpc-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 grpc-google-cloud-pubsub-v1 GRPC library for grpc-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.123.20 + 1.124.0 diff --git a/pom.xml b/pom.xml index d25f1b340..67d7cf6f6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-pubsub-parent pom - 1.123.20 + 1.124.0 Google Cloud Pub/Sub Parent https://github.com/googleapis/java-pubsub @@ -69,17 +69,17 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 com.google.cloud google-cloud-pubsub - 1.123.20 + 1.124.0 diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml index f0d48a997..37bda9ac2 100644 --- a/proto-google-cloud-pubsub-v1/pom.xml +++ b/proto-google-cloud-pubsub-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.105.20 + 1.106.0 proto-google-cloud-pubsub-v1 PROTO library for proto-google-cloud-pubsub-v1 com.google.cloud google-cloud-pubsub-parent - 1.123.20 + 1.124.0 diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java index 8fb85ab64..a4532a62f 100644 --- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java +++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java @@ -682,7 +682,11 @@ public interface AvroConfigOrBuilder * *
      * When true, write the subscription name, message_id, publish_time,
-     * attributes, and ordering_key as additional fields in the output.
+     * attributes, and ordering_key as additional fields in the output. The
+     * subscription name, message_id, and publish_time fields are put in their
+     * own fields while all other message properties other than data (for
+     * example, an ordering_key, if present) are added as entries in the
+     * attributes map.
      * 
* * bool write_metadata = 1; @@ -741,7 +745,11 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *
      * When true, write the subscription name, message_id, publish_time,
-     * attributes, and ordering_key as additional fields in the output.
+     * attributes, and ordering_key as additional fields in the output. The
+     * subscription name, message_id, and publish_time fields are put in their
+     * own fields while all other message properties other than data (for
+     * example, an ordering_key, if present) are added as entries in the
+     * attributes map.
      * 
* * bool write_metadata = 1; @@ -1104,7 +1112,11 @@ public Builder mergeFrom( * *
        * When true, write the subscription name, message_id, publish_time,
-       * attributes, and ordering_key as additional fields in the output.
+       * attributes, and ordering_key as additional fields in the output. The
+       * subscription name, message_id, and publish_time fields are put in their
+       * own fields while all other message properties other than data (for
+       * example, an ordering_key, if present) are added as entries in the
+       * attributes map.
        * 
* * bool write_metadata = 1; @@ -1120,7 +1132,11 @@ public boolean getWriteMetadata() { * *
        * When true, write the subscription name, message_id, publish_time,
-       * attributes, and ordering_key as additional fields in the output.
+       * attributes, and ordering_key as additional fields in the output. The
+       * subscription name, message_id, and publish_time fields are put in their
+       * own fields while all other message properties other than data (for
+       * example, an ordering_key, if present) are added as entries in the
+       * attributes map.
        * 
* * bool write_metadata = 1; @@ -1140,7 +1156,11 @@ public Builder setWriteMetadata(boolean value) { * *
        * When true, write the subscription name, message_id, publish_time,
-       * attributes, and ordering_key as additional fields in the output.
+       * attributes, and ordering_key as additional fields in the output. The
+       * subscription name, message_id, and publish_time fields are put in their
+       * own fields while all other message properties other than data (for
+       * example, an ordering_key, if present) are added as entries in the
+       * attributes map.
        * 
* * bool write_metadata = 1; diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java index fac062007..8dd269745 100644 --- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java +++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java @@ -136,7 +136,7 @@ public com.google.protobuf.ByteString getSubscriptionBytes() { * * * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See - * google/pubsub/v1/pubsub.proto;l=1222 + * google/pubsub/v1/pubsub.proto;l=1226 * @return The returnImmediately. */ @java.lang.Override @@ -687,7 +687,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { * * * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See - * google/pubsub/v1/pubsub.proto;l=1222 + * google/pubsub/v1/pubsub.proto;l=1226 * @return The returnImmediately. */ @java.lang.Override @@ -713,7 +713,7 @@ public boolean getReturnImmediately() { * * * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See - * google/pubsub/v1/pubsub.proto;l=1222 + * google/pubsub/v1/pubsub.proto;l=1226 * @param value The returnImmediately to set. * @return This builder for chaining. */ @@ -743,7 +743,7 @@ public Builder setReturnImmediately(boolean value) { * * * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See - * google/pubsub/v1/pubsub.proto;l=1222 + * google/pubsub/v1/pubsub.proto;l=1226 * @return This builder for chaining. */ @java.lang.Deprecated diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java index 5cb9c98a3..963c7f799 100644 --- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java +++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java @@ -71,7 +71,7 @@ public interface PullRequestOrBuilder * * * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See - * google/pubsub/v1/pubsub.proto;l=1222 + * google/pubsub/v1/pubsub.proto;l=1226 * @return The returnImmediately. */ @java.lang.Deprecated diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto index 9ff80f2f6..4468de178 100644 --- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto +++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto @@ -1030,7 +1030,11 @@ message CloudStorageConfig { // Message payloads and metadata will be written to files as an Avro binary. message AvroConfig { // When true, write the subscription name, message_id, publish_time, - // attributes, and ordering_key as additional fields in the output. + // attributes, and ordering_key as additional fields in the output. The + // subscription name, message_id, and publish_time fields are put in their + // own fields while all other message properties other than data (for + // example, an ordering_key, if present) are added as entries in the + // attributes map. bool write_metadata = 1; } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5fc9a8870..1be91db89 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -44,7 +44,7 @@ com.google.cloud google-cloud-pubsub - 1.123.18 + 1.123.20 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 342b1adeb..59308ca32 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -43,7 +43,7 @@ com.google.cloud google-cloud-pubsub - 1.123.20 + 1.124.0 diff --git a/versions.txt b/versions.txt index 21f76842d..741c90de5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-pubsub:1.123.20:1.123.20 -grpc-google-cloud-pubsub-v1:1.105.20:1.105.20 -proto-google-cloud-pubsub-v1:1.105.20:1.105.20 +google-cloud-pubsub:1.124.0:1.124.0 +grpc-google-cloud-pubsub-v1:1.106.0:1.106.0 +proto-google-cloud-pubsub-v1:1.106.0:1.106.0