From 80eeb45e6d41ecf118a557ef0a489b3a3d59f9bb Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 18 Aug 2023 13:34:15 -0400 Subject: [PATCH 01/12] ci: javadoc as a required check (#1419) Manual configuration of the required check at Settings tab has been reverted. Adding that back via sync-repo-settings.yaml. --- .github/sync-repo-settings.yaml | 1 + README.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 28f4a217d..f907b699e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -18,6 +18,7 @@ branchProtectionRules: - OwlBot Post Processor - 'Kokoro - Test: Java GraalVM Native Image' - 'Kokoro - Test: Java 17 GraalVM Native Image' + - javadoc - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 diff --git a/README.md b/README.md index 61f2598b4..ec7ef6830 100644 --- a/README.md +++ b/README.md @@ -52,20 +52,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.21.0') +implementation platform('com.google.cloud:libraries-bom:26.22.0') implementation 'com.google.cloud:google-cloud-logging' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging:3.15.7' +implementation 'com.google.cloud:google-cloud-logging:3.15.8' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.7" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.8" ``` @@ -452,7 +452,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-logging/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-logging.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.15.7 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.15.8 [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 From bb6f462d3504db6e700d5eadd0c0a32f6a9958e6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 17:52:13 +0000 Subject: [PATCH 02/12] chore(main): release 3.15.9-SNAPSHOT (#1414) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- .../java/com/google/cloud/logging/Instrumentation.java | 2 +- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 6513e34b5..de8669795 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.15.8 + 3.15.9-SNAPSHOT pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.15.8 + 3.15.9-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 4b27d1e06..d8358bdbf 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.15.8 + 3.15.9-SNAPSHOT jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.15.8 + 3.15.9-SNAPSHOT google-cloud-logging diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java index ca3a6b9f8..4c281e91b 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java @@ -40,7 +40,7 @@ public final class Instrumentation { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.8"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.9-SNAPSHOT"; // {x-version-update-end} public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log"; public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14; diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 5518a8cb6..4a435dff9 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.8 + 3.15.9-SNAPSHOT diff --git a/pom.xml b/pom.xml index a5d420a30..8e51be667 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.15.8 + 3.15.9-SNAPSHOT Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT com.google.cloud google-cloud-logging - 3.15.8 + 3.15.9-SNAPSHOT diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 96662e790..afe18a695 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.8 + 0.104.9-SNAPSHOT proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.8 + 3.15.9-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c8f6e663d..0121cf8d1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.15.8 + 3.15.9-SNAPSHOT diff --git a/versions.txt b/versions.txt index 5325ce73d..852aab170 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.15.8:3.15.8 -grpc-google-cloud-logging-v2:0.104.8:0.104.8 -proto-google-cloud-logging-v2:0.104.8:0.104.8 +google-cloud-logging:3.15.8:3.15.9-SNAPSHOT +grpc-google-cloud-logging-v2:0.104.8:0.104.9-SNAPSHOT +proto-google-cloud-logging-v2:0.104.8:0.104.9-SNAPSHOT From d8305f16e8294bb39929bef84b8edf2b98288b36 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:02:13 -0400 Subject: [PATCH 03/12] chore: Update the Java code generator (gapic-generator-java) to 2.25.0 (#1425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update the Java code generator (gapic-generator-java) to 2.25.0 PiperOrigin-RevId: 563824709 Source-Link: https://github.com/googleapis/googleapis/commit/8fe4127b6bd66764c7a854d555d05ff4914b6716 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8c0112151b19d890bb49b747b0ab28b816d47b1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhjMDExMjE1MWIxOWQ4OTBiYjQ5Yjc0N2IwYWIyOGI4MTZkNDdiMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../java/com/google/logging/v2/BillingAccountLocationName.java | 2 +- .../src/main/java/com/google/logging/v2/BillingAccountName.java | 2 +- .../src/main/java/com/google/logging/v2/CmekSettingsName.java | 2 +- .../src/main/java/com/google/logging/v2/FolderLocationName.java | 2 +- .../src/main/java/com/google/logging/v2/FolderName.java | 2 +- .../src/main/java/com/google/logging/v2/LinkName.java | 2 +- .../src/main/java/com/google/logging/v2/LocationName.java | 2 +- .../src/main/java/com/google/logging/v2/LogBucketName.java | 2 +- .../src/main/java/com/google/logging/v2/LogExclusionName.java | 2 +- .../src/main/java/com/google/logging/v2/LogMetricName.java | 2 +- .../src/main/java/com/google/logging/v2/LogName.java | 2 +- .../src/main/java/com/google/logging/v2/LogSinkName.java | 2 +- .../src/main/java/com/google/logging/v2/LogViewName.java | 2 +- .../java/com/google/logging/v2/OrganizationLocationName.java | 2 +- .../src/main/java/com/google/logging/v2/OrganizationName.java | 2 +- .../src/main/java/com/google/logging/v2/ProjectName.java | 2 +- .../src/main/java/com/google/logging/v2/SettingsName.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java index 46ae7bf30..4a9812183 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java @@ -140,7 +140,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { BillingAccountLocationName that = ((BillingAccountLocationName) o); return Objects.equals(this.billingAccount, that.billingAccount) && Objects.equals(this.location, that.location); diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java index e4b122f5d..c2f0cd358 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java @@ -127,7 +127,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { BillingAccountName that = ((BillingAccountName) o); return Objects.equals(this.billingAccount, that.billingAccount); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java index 0d1093cf6..c9c78694e 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java @@ -325,7 +325,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { CmekSettingsName that = ((CmekSettingsName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.organization, that.organization) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java index 9e4334997..f49c5ae45 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java @@ -137,7 +137,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { FolderLocationName that = ((FolderLocationName) o); return Objects.equals(this.folder, that.folder) && Objects.equals(this.location, that.location); diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java index 14b45b12f..52946796e 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java @@ -127,7 +127,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { FolderName that = ((FolderName) o); return Objects.equals(this.folder, that.folder); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java index 4b20c716c..75ebbc236 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java @@ -388,7 +388,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LinkName that = ((LinkName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.location, that.location) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java index 41db5c824..d35fa539b 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java @@ -137,7 +137,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LocationName that = ((LocationName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.location, that.location); diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java index f3ab7fa01..416ff0a60 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java @@ -344,7 +344,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogBucketName that = ((LogBucketName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.location, that.location) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java index b87f1b4c3..b92fb9c12 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java @@ -296,7 +296,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogExclusionName that = ((LogExclusionName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.exclusion, that.exclusion) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java index 1b8efcb5b..88602294c 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java @@ -137,7 +137,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogMetricName that = ((LogMetricName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.metric, that.metric); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java index 4269202ed..d62ef7876 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java @@ -282,7 +282,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogName that = ((LogName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.log, that.log) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java index 6ac04c85a..63db5f8ac 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java @@ -286,7 +286,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogSinkName that = ((LogSinkName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.sink, that.sink) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java index 2822f2e4e..223dcf90e 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java @@ -388,7 +388,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { LogViewName that = ((LogViewName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.location, that.location) diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java index 91a70bc9e..782996120 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java @@ -137,7 +137,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { OrganizationLocationName that = ((OrganizationLocationName) o); return Objects.equals(this.organization, that.organization) && Objects.equals(this.location, that.location); diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java index e4f8b5921..e2021c38b 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java @@ -127,7 +127,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { OrganizationName that = ((OrganizationName) o); return Objects.equals(this.organization, that.organization); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java index b2396890c..718dc26f6 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java @@ -127,7 +127,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { ProjectName that = ((ProjectName) o); return Objects.equals(this.project, that.project); } diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java index ff30fb787..40a59eee5 100644 --- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java +++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java @@ -265,7 +265,7 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (o != null || getClass() == o.getClass()) { + if (o != null && getClass() == o.getClass()) { SettingsName that = ((SettingsName) o); return Objects.equals(this.project, that.project) && Objects.equals(this.organization, that.organization) From caaaa4140b8c581d06c2d997c8a21d78c0fe11a7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:02:36 -0400 Subject: [PATCH 04/12] chore: for Java repos RenovateBot to ignore GitHub Actions workflow file (#1855) (#1423) chore: for Java repos RenovateBot to ignore GitHub Actions workflow file The actions used in the GitHub Actions workflow files do not appear in libraries' dependencies and mostly maintained by Java postprocessor templates. IgnorePath option document: https://docs.renovatebot.com/configuration-options/ Source-Link: https://github.com/googleapis/synthtool/commit/1543029c843989702adbe789acdead153ad696d1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/requirements.txt | 9 ++++----- renovate.json | 5 ++++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index d5500ef44..52eaa54d8 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:46d2d262cd285c638656c8bde468011b723dc0c7ffd6a5ecc2650fe639c82e8f -# created: 2023-07-24T14:21:17.707234503Z + digest: sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f +# created: 2023-09-05T18:54:42.225408832Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 32989051e..a73256ab8 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -12,9 +12,9 @@ cachetools==5.3.1 \ --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b # via google-auth -certifi==2023.5.7 \ - --hash=sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 \ - --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 +certifi==2023.7.22 \ + --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \ + --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9 # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ @@ -485,6 +485,5 @@ zipp==3.16.1 \ # via importlib-metadata # WARNING: The following packages were not pinned, but pip requires them to be -# pinned when the requirements file includes hashes and the requirement is not -# satisfied by a package already installed. Consider using the --allow-unsafe flag. +# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag. # setuptools diff --git a/renovate.json b/renovate.json index fe57e782e..24af58815 100644 --- a/renovate.json +++ b/renovate.json @@ -10,7 +10,10 @@ ":maintainLockFilesDisabled", ":autodetectPinVersions" ], - "ignorePaths": [".kokoro/requirements.txt"], + "ignorePaths": [ + ".kokoro/requirements.txt", + ".github/workflows/**" + ], "packageRules": [ { "packagePatterns": [ From f9315443ba97104f1a23e5695ed72cb4bd2dfa10 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 11 Sep 2023 17:03:17 +0200 Subject: [PATCH 05/12] deps: update dependency org.easymock:easymock to v5.2.0 (#1421) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e51be667..5720509d6 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.easymock easymock - 5.1.0 + 5.2.0 org.objenesis From ff581a67270777fe15e291794df3b49041c111e3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 11 Sep 2023 17:03:41 +0200 Subject: [PATCH 06/12] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.26 (#1420) --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 50afbca9f..b315a5969 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -110,7 +110,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.24 + 0.9.26 test From bd9be4e8aecd5b7a532a6f2eb91151201a41334f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 11 Sep 2023 17:04:08 +0200 Subject: [PATCH 07/12] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.26 (#1412) --- samples/native-image-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index b315a5969..f954e894e 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -131,7 +131,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.23 + 0.9.26 true com.example.logging.NativeImageLoggingSample From 12f03f4db455d8071afbe288a2e53d9c24de6801 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 11 Sep 2023 17:05:41 +0200 Subject: [PATCH 08/12] chore(deps): update dependency com.google.cloud:libraries-bom to v26.21.0 (#1408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.21.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ec7ef6830..63bd7d0c8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.20.0 + 26.21.0 pom import diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index f954e894e..7de1f432b 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.20.0 + 26.21.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d5e3e6136..e137db629 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.20.0 + 26.21.0 pom import From cd279f5418e2b31bcc2f0bce8a8834987aee0357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 15:20:16 +0000 Subject: [PATCH 09/12] build(deps): bump certifi from 2023.5.7 to 2023.7.22 in /.kokoro (#1417) Bumps [certifi](https://togithub.com/certifi/python-certifi) from 2023.5.7 to 2023.7.22.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=certifi&package-manager=pip&previous-version=2023.5.7&new-version=2023.7.22)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://togithub.com/googleapis/java-logging/network/alerts).
From 4f82f339e47014821eca217f5200080e6b78e03f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 00:38:12 +0200 Subject: [PATCH 10/12] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 (#1424) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5720509d6..a6e763ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.14.0 + 3.15.0 pom import From e56bccea8be877795a0cf9ab96499154efd26124 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 00:38:29 +0200 Subject: [PATCH 11/12] chore(deps): update dependency com.google.cloud:libraries-bom to v26.22.0 (#1427) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.22.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 2 +- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 63bd7d0c8..c124510d9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.21.0 + 26.22.0 pom import diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 7de1f432b..f203f0bd6 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.21.0 + 26.22.0 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index e137db629..5855c8055 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.21.0 + 26.22.0 pom import From b344a333e5f175d2e354d1d28a95d43afd080db7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:52:13 +0000 Subject: [PATCH 12/12] chore(main): release 3.15.9 (#1426) :robot: I have created a release *beep* *boop* --- ## [3.15.9](https://togithub.com/googleapis/java-logging/compare/v3.15.8...v3.15.9) (2023-09-11) ### Dependencies * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1424](https://togithub.com/googleapis/java-logging/issues/1424)) ([4f82f33](https://togithub.com/googleapis/java-logging/commit/4f82f339e47014821eca217f5200080e6b78e03f)) * Update dependency org.easymock:easymock to v5.2.0 ([#1421](https://togithub.com/googleapis/java-logging/issues/1421)) ([f931544](https://togithub.com/googleapis/java-logging/commit/f9315443ba97104f1a23e5695ed72cb4bd2dfa10)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.26 ([#1420](https://togithub.com/googleapis/java-logging/issues/1420)) ([ff581a6](https://togithub.com/googleapis/java-logging/commit/ff581a67270777fe15e291794df3b49041c111e3)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.26 ([#1412](https://togithub.com/googleapis/java-logging/issues/1412)) ([bd9be4e](https://togithub.com/googleapis/java-logging/commit/bd9be4e8aecd5b7a532a6f2eb91151201a41334f)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 10 ++++++++++ google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- .../java/com/google/cloud/logging/Instrumentation.java | 2 +- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 9 files changed, 29 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc746f98c..cbdef2fcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [3.15.9](https://github.com/googleapis/java-logging/compare/v3.15.8...v3.15.9) (2023-09-11) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1424](https://github.com/googleapis/java-logging/issues/1424)) ([4f82f33](https://github.com/googleapis/java-logging/commit/4f82f339e47014821eca217f5200080e6b78e03f)) +* Update dependency org.easymock:easymock to v5.2.0 ([#1421](https://github.com/googleapis/java-logging/issues/1421)) ([f931544](https://github.com/googleapis/java-logging/commit/f9315443ba97104f1a23e5695ed72cb4bd2dfa10)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.26 ([#1420](https://github.com/googleapis/java-logging/issues/1420)) ([ff581a6](https://github.com/googleapis/java-logging/commit/ff581a67270777fe15e291794df3b49041c111e3)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.26 ([#1412](https://github.com/googleapis/java-logging/issues/1412)) ([bd9be4e](https://github.com/googleapis/java-logging/commit/bd9be4e8aecd5b7a532a6f2eb91151201a41334f)) + ## [3.15.8](https://github.com/googleapis/java-logging/compare/v3.15.7...v3.15.8) (2023-08-08) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index de8669795..987e8244d 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.15.9-SNAPSHOT + 3.15.9 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.15.9-SNAPSHOT + 3.15.9 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index d8358bdbf..20fa7e5f0 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.15.9-SNAPSHOT + 3.15.9 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.15.9-SNAPSHOT + 3.15.9 google-cloud-logging diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java index 4c281e91b..a1ebad02d 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java @@ -40,7 +40,7 @@ public final class Instrumentation { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.9-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.9"; // {x-version-update-end} public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log"; public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14; diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 4a435dff9..8016b2f7a 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.9-SNAPSHOT + 3.15.9 diff --git a/pom.xml b/pom.xml index a6e763ec6..f3f729532 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.15.9-SNAPSHOT + 3.15.9 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 com.google.cloud google-cloud-logging - 3.15.9-SNAPSHOT + 3.15.9 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index afe18a695..aee30b614 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.9-SNAPSHOT + 0.104.9 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.9-SNAPSHOT + 3.15.9 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0121cf8d1..248f6090a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.15.9-SNAPSHOT + 3.15.9 diff --git a/versions.txt b/versions.txt index 852aab170..9a90bd223 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.15.8:3.15.9-SNAPSHOT -grpc-google-cloud-logging-v2:0.104.8:0.104.9-SNAPSHOT -proto-google-cloud-logging-v2:0.104.8:0.104.9-SNAPSHOT +google-cloud-logging:3.15.9:3.15.9 +grpc-google-cloud-logging-v2:0.104.9:0.104.9 +proto-google-cloud-logging-v2:0.104.9:0.104.9 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy