From a25958bc2045b5e309bf8734188430c0451d3261 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 09:59:03 -0700 Subject: [PATCH 1/7] chore(main): release 0.130.18-alpha-SNAPSHOT (#1124) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../java/com/google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 79a5f4856..da25d5fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.130.17-alpha + 0.130.18-alpha-SNAPSHOT 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 7998b6282..c25cae371 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.130.17-alpha + 0.130.18-alpha-SNAPSHOT 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 c47b7003a..44b2c912d 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.17-alpha"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.18-alpha-SNAPSHOT"; // {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 18b883f0b..aaf0d2ab2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.130.17-alpha:0.130.17-alpha +google-cloud-logging-logback:0.130.17-alpha:0.130.18-alpha-SNAPSHOT From 28c33c26bd791a2892adf3886a8202307aa5ffc3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 26 Jun 2023 19:56:34 +0200 Subject: [PATCH 2/7] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.130.17-alpha (#1125) 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.17-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 --- README.md | 8 ++++---- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 10fe904d4..7026ed768 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.16-alpha + 0.130.17-alpha ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging-logback:0.130.16-alpha' +implementation 'com.google.cloud:google-cloud-logging-logback:0.130.17-alpha' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.16-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.17-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.16-alpha +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.17-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/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index e6de3bf3e..8fa0b2606 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.16-alpha + 0.130.17-alpha From d446dd85cc9ef6ce80b5758bafc39c8d2a1de326 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 28 Jun 2023 18:47:00 +0200 Subject: [PATCH 3/7] chore(deps): update dependency com.google.cloud:libraries-bom to v26.18.0 (#1127) --- 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 2d9c24433..72da2a23b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.17.0 + 26.18.0 pom import From ec7d597f3e32d89dfafcdd972170dfaf7b1d4d31 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 15:27:16 -0400 Subject: [PATCH 4/7] ci: javadoc job (JDK 17) in ci.yaml (#1819) (#1126) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci: javadoc job (JDK 17) in ci.yaml (#1819) This also changes the JDK distribution from zulu to temurin https://github.com/actions/setup-java#eclipse-temurin Source-Link: https://github.com/googleapis/synthtool/commit/ef9fe2ef6d92c7ff967d9d4f704035b3f5c9051d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9 * fix javadoc * 🦉 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: Tomo Suzuki --- .github/.OwlBot.lock.yaml | 5 ++-- .github/workflows/ci.yaml | 26 ++++++++++++++----- .github/workflows/samples.yaml | 2 +- .../logging/logback/LoggingAppender.java | 17 ++++++------ 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ea2ade507..258389d1a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,6 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7 -# created: 2023-06-22T15:06:52.039318836Z - + digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9 +# created: 2023-06-27T18:51:58.922150125Z diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65436cde4..e27b2c575 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - name: "Set jvm system property environment variable for surefire plugin (unit tests)" # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm @@ -54,7 +54,7 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 17 - distribution: zulu + distribution: temurin - run: .kokoro/build.sh env: JOB_TYPE: test @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -81,17 +81,29 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh + javadoc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: javadoc lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 11 - run: java -version - run: .kokoro/build.sh @@ -103,7 +115,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 912ed8b2b..10d252d77 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check 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 44b2c912d..2dd042891 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -86,8 +86,8 @@ * <logDestinationProjectId>String</logDestinationProjectId> * * <!-- Optional: add custom labels to log entries using {@link LoggingEnhancer} classes --> - * <enhancer>com.example.enhancers.TestLoggingEnhancer</enhancer> - * <enhancer>com.example.enhancers.AnotherEnhancer</enhancer> + * <enhancer>com.example.enhancers.TestLoggingEnhancer</enhancer> + * <enhancer>com.example.enhancers.AnotherEnhancer</enhancer> * * <!-- Optional: specifies if a batch's valid entries should be written even if some other entry failed due to an error. Defaults to {@code true} --> * <partialSuccess>true</partialSuccess> @@ -159,9 +159,9 @@ public void setFlushLevel(Level flushLevel) { } /** - * Sets the LOG_ID part of the https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#FIELDS.log_name - * for which the logs are ingested. + * Sets the LOG_ID part of the log + * name for which the logs are ingested. * * @param log LOG_ID part of the name */ @@ -185,9 +185,10 @@ public void setResourceType(String resourceType) { } /** - * Sets the path to the https://cloud.google.com/iam/docs/creating-managing-service-account-keys. If not set - * the appender will use {@link GoogleCredentials#getApplicationDefault()} to authenticate. + * Sets the path to the credential + * file. If not set the appender will use {@link GoogleCredentials#getApplicationDefault()} to + * authenticate. * * @param credentialsFile the path to the credentials file. */ From 75d23eb4e1f8ada5366f63c34ea1face963e64e2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 17 Jul 2023 16:53:01 +0200 Subject: [PATCH 5/7] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 (#1129) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da25d5fbe..ad5b94e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.12.0 + 3.13.0 pom import From 940c3bba964cc88925607dba9f6e2435778dad50 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 17 Jul 2023 20:27:43 +0200 Subject: [PATCH 6/7] deps: update dependency com.google.cloud:google-cloud-logging to v3.15.6 (#1133) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad5b94e2d..061f9a616 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.11 5.1.0 1.1.5 - 3.15.5 + 3.15.6 1.7.36 1.10.1 From ad97e66646c3bfe25c0794414ce72aaccd22311b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:20:44 -0400 Subject: [PATCH 7/7] chore(main): release 0.130.18-alpha (#1132) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../com/google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a76a0807f..d4d30ce37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog +## [0.130.18-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.17-alpha...v0.130.18-alpha) (2023-07-17) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.15.6 ([#1133](https://github.com/googleapis/java-logging-logback/issues/1133)) ([940c3bb](https://github.com/googleapis/java-logging-logback/commit/940c3bba964cc88925607dba9f6e2435778dad50)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 ([#1129](https://github.com/googleapis/java-logging-logback/issues/1129)) ([75d23eb](https://github.com/googleapis/java-logging-logback/commit/75d23eb4e1f8ada5366f63c34ea1face963e64e2)) + ## [0.130.17-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.16-alpha...v0.130.17-alpha) (2023-06-23) diff --git a/pom.xml b/pom.xml index 061f9a616..6e129691b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.130.18-alpha-SNAPSHOT + 0.130.18-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 c25cae371..ca37a0706 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.130.18-alpha-SNAPSHOT + 0.130.18-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 2dd042891..89ceeadb1 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.18-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.18-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 aaf0d2ab2..cf76c374f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.130.17-alpha:0.130.18-alpha-SNAPSHOT +google-cloud-logging-logback:0.130.18-alpha:0.130.18-alpha