From 5bff540e45530c3dc3e0032e8b1f5fde1038fd57 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 18 Aug 2023 13:04:14 -0400 Subject: [PATCH 01/10] ci: javadoc as a required check (#1161) 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 162807bcf..7ab513c08 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -16,6 +16,7 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - OwlBot Post Processor + - javadoc - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 diff --git a/README.md b/README.md index c049c2704..b6b15438f 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-logging-logback - 0.130.20-alpha + 0.130.21-alpha ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging-logback:0.130.20-alpha' +implementation 'com.google.cloud:google-cloud-logging-logback:0.130.21-alpha' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.20-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.21-alpha" ``` @@ -299,7 +299,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-logback/java11.html [stability-image]: https://img.shields.io/badge/stability-preview-yellow [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging-logback.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.20-alpha +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.21-alpha [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 ab8b7363a7d29d3e6771f18d2d5bf2e0f9723b00 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 15:57:11 +0200 Subject: [PATCH 02/10] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 (#1165) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 51c6442f0..027d03b35 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.14.0 + 3.15.0 pom import From 5b48e2be9b92ff51b740a44fcea9e0d794401960 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 16:25:17 +0200 Subject: [PATCH 03/10] deps: update dependency com.google.cloud:google-cloud-logging to v3.15.9 (#1166) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 027d03b35..b628868ae 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.11 5.1.0 1.1.5 - 3.15.8 + 3.15.9 1.7.36 1.10.1 From e64887eb9cb5adecdaab79ebf0b1fde8c7d3fe1d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 16:25:48 +0200 Subject: [PATCH 04/10] deps: update dependency org.easymock:easymock to v5.2.0 (#1162) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b628868ae..e48175cff 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.2.11 - 5.1.0 + 5.2.0 1.1.5 3.15.9 1.7.36 From bc6027e75a12a9a2643da7aa4b24f47502e06e76 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 16:32:23 +0200 Subject: [PATCH 05/10] chore(deps): update dependency com.google.cloud:libraries-bom to v26.22.0 (#1159) 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 --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index fe551e2ad..30a294143 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.21.0 + 26.22.0 pom import From 9560e063d8e573c64bb20bf2e1dd0768cb9116be Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:32:49 -0400 Subject: [PATCH 06/10] chore: for Java repos RenovateBot to ignore GitHub Actions workflow file (#1855) (#1164) 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 43789f1fa..69d96b48f 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 a6ecf6e242253c19c87caa1062895465b0c98eae Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:16:13 +0000 Subject: [PATCH 07/10] chore(main): release 0.130.22-alpha (#1167) :robot: I have created a release *beep* *boop* --- ## [0.130.22-alpha](https://togithub.com/googleapis/java-logging-logback/compare/v0.130.21-alpha...v0.130.22-alpha) (2023-09-12) ### Dependencies * Update dependency com.google.cloud:google-cloud-logging to v3.15.9 ([#1166](https://togithub.com/googleapis/java-logging-logback/issues/1166)) ([5b48e2b](https://togithub.com/googleapis/java-logging-logback/commit/5b48e2be9b92ff51b740a44fcea9e0d794401960)) * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1165](https://togithub.com/googleapis/java-logging-logback/issues/1165)) ([ab8b736](https://togithub.com/googleapis/java-logging-logback/commit/ab8b7363a7d29d3e6771f18d2d5bf2e0f9723b00)) * Update dependency org.easymock:easymock to v5.2.0 ([#1162](https://togithub.com/googleapis/java-logging-logback/issues/1162)) ([e64887e](https://togithub.com/googleapis/java-logging-logback/commit/e64887eb9cb5adecdaab79ebf0b1fde8c7d3fe1d)) --- 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 | 9 +++++++++ pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9efe960..fef3ef36d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog +## [0.130.22-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.21-alpha...v0.130.22-alpha) (2023-09-12) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.15.9 ([#1166](https://github.com/googleapis/java-logging-logback/issues/1166)) ([5b48e2b](https://github.com/googleapis/java-logging-logback/commit/5b48e2be9b92ff51b740a44fcea9e0d794401960)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#1165](https://github.com/googleapis/java-logging-logback/issues/1165)) ([ab8b736](https://github.com/googleapis/java-logging-logback/commit/ab8b7363a7d29d3e6771f18d2d5bf2e0f9723b00)) +* Update dependency org.easymock:easymock to v5.2.0 ([#1162](https://github.com/googleapis/java-logging-logback/issues/1162)) ([e64887e](https://github.com/googleapis/java-logging-logback/commit/e64887eb9cb5adecdaab79ebf0b1fde8c7d3fe1d)) + ## [0.130.21-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.20-alpha...v0.130.21-alpha) (2023-08-08) diff --git a/pom.xml b/pom.xml index e48175cff..80a8970c6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.130.22-alpha-SNAPSHOT + 0.130.22-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 130be38a2..9fd215d50 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.130.22-alpha-SNAPSHOT + 0.130.22-alpha diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index b14511e3d..080516893 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { // See // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files // {x-version-update-start:google-cloud-logging-logback:current} - public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.22-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.22-alpha"; // {x-version-update-end} private static boolean instrumentationAdded = false; private static final Object instrumentationLock = new Object(); diff --git a/versions.txt b/versions.txt index 1c1e678c8..e6573151b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.130.21-alpha:0.130.22-alpha-SNAPSHOT +google-cloud-logging-logback:0.130.22-alpha:0.130.22-alpha From 8e3b5e2854581fce33c145eadf2537b9d5d310bd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 15:53:10 +0200 Subject: [PATCH 08/10] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.130.20-alpha (#1157) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.130.20-alpha * 🦉 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 Co-authored-by: Mridula <66699525+mpeddada1@users.noreply.github.com> --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0b5d430ee..b7d750d92 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-logging-logback - 0.130.19-alpha + 0.130.20-alpha From 26be4a2fd852e741db31e48977189942bff97772 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 15:55:16 +0200 Subject: [PATCH 09/10] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0 (#1170) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.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 | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b6b15438f..0f98ba144 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-logging-logback - 0.130.21-alpha + 0.130.22-alpha ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging-logback:0.130.21-alpha' +implementation 'com.google.cloud:google-cloud-logging-logback:0.130.22-alpha' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.21-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.22-alpha" ``` @@ -299,7 +299,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-logback/java11.html [stability-image]: https://img.shields.io/badge/stability-preview-yellow [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging-logback.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.21-alpha +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.22-alpha [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/pom.xml b/pom.xml index 80a8970c6..5eb65a226 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 html From d5a1b427c68be60973c81e4e3d75d69663b880fc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 15:55:37 +0200 Subject: [PATCH 10/10] chore(deps): update dependency com.google.cloud:libraries-bom to v26.23.0 (#1169) 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.23.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 --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 30a294143..f89d971dd 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.22.0 + 26.23.0 pom import