From 61eec72d75785503627fca3f002ecef54af4ebbe Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Thu, 5 Dec 2019 13:36:03 -0500 Subject: [PATCH 01/45] Bump next snapshot (#6989) --- google-cloud-contrib/google-cloud-logging-logback/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-contrib/google-cloud-logging-logback/pom.xml index 77ce9a968..4bbc7bd0c 100644 --- a/google-cloud-contrib/google-cloud-logging-logback/pom.xml +++ b/google-cloud-contrib/google-cloud-logging-logback/pom.xml @@ -20,7 +20,7 @@ com.google.cloud google-cloud-contrib - 0.120.0-alpha + 0.120.1-alpha-SNAPSHOT From 00ee26b7ffee1167559befa32352be6f00811422 Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Thu, 26 Dec 2019 15:43:11 -0700 Subject: [PATCH 02/45] chore: make java-logging-logback releasable (#3) * chore: make java-logging-logback releasable * fix * add more to pom * remove skip build --- .github/ISSUE_TEMPLATE/bug_report.md | 51 ++++ .github/ISSUE_TEMPLATE/feature_request.md | 21 ++ .github/ISSUE_TEMPLATE/support_request.md | 7 + .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/release-please.yml | 1 + .gitignore | 45 ++++ .kokoro/build.bat | 3 + .kokoro/build.sh | 60 +++++ .kokoro/coerce_logs.sh | 38 +++ .kokoro/common.cfg | 13 + .kokoro/continuous/common.cfg | 25 ++ .kokoro/continuous/dependencies.cfg | 12 + .kokoro/continuous/integration.cfg | 7 + .kokoro/continuous/java11.cfg | 7 + .kokoro/continuous/java7.cfg | 7 + .kokoro/continuous/java8-osx.cfg | 3 + .kokoro/continuous/java8-win.cfg | 3 + .kokoro/continuous/java8.cfg | 7 + .kokoro/continuous/lint.cfg | 13 + .kokoro/continuous/propose_release.cfg | 53 ++++ .kokoro/continuous/propose_release.sh | 29 +++ .kokoro/dependencies.sh | 27 +++ .kokoro/linkage-monitor.sh | 33 +++ .kokoro/nightly/common.cfg | 25 ++ .kokoro/nightly/dependencies.cfg | 12 + .kokoro/nightly/integration.cfg | 7 + .kokoro/nightly/java11.cfg | 7 + .kokoro/nightly/java7.cfg | 7 + .kokoro/nightly/java8-osx.cfg | 3 + .kokoro/nightly/java8-win.cfg | 3 + .kokoro/nightly/java8.cfg | 7 + .kokoro/nightly/lint.cfg | 13 + .kokoro/presubmit/clirr.cfg | 13 + .kokoro/presubmit/common.cfg | 34 +++ .kokoro/presubmit/dependencies.cfg | 12 + .kokoro/presubmit/integration.cfg | 31 +++ .kokoro/presubmit/java11.cfg | 7 + .kokoro/presubmit/java7.cfg | 7 + .kokoro/presubmit/java8-osx.cfg | 3 + .kokoro/presubmit/java8-win.cfg | 3 + .kokoro/presubmit/java8.cfg | 7 + .kokoro/presubmit/linkage-monitor.cfg | 12 + .kokoro/presubmit/lint.cfg | 13 + .kokoro/release/bump_snapshot.cfg | 53 ++++ .kokoro/release/bump_snapshot.sh | 30 +++ .kokoro/release/common.cfg | 49 ++++ .kokoro/release/common.sh | 50 ++++ .kokoro/release/drop.cfg | 9 + .kokoro/release/drop.sh | 32 +++ .kokoro/release/promote.cfg | 10 + .kokoro/release/promote.sh | 34 +++ .kokoro/release/publish_javadoc.cfg | 19 ++ .kokoro/release/publish_javadoc.sh | 55 +++++ .kokoro/release/snapshot.cfg | 6 + .kokoro/release/snapshot.sh | 33 +++ .kokoro/release/stage.cfg | 44 ++++ .kokoro/release/stage.sh | 42 ++++ .kokoro/trampoline.sh | 24 ++ .repo-metadata.json | 13 + CODE_OF_CONDUCT.md | 93 +++++++ CONTRIBUTING.md | 28 +++ LICENSE | 5 +- .../README.md => README.md | 0 codecov.yaml | 4 + .../google-cloud-logging-logback/pom.xml | 69 ------ java.header | 15 ++ license-checks.xml | 10 + pom.xml | 229 ++++++++++++++++++ renovate.json | 27 +++ .../logging/logback/LoggingAppender.java | 0 .../logging/logback/LoggingEventEnhancer.java | 0 .../logging/logback/MDCEventEnhancer.java | 0 .../enhancers/AnotherTestLoggingEnhancer.java | 0 .../enhancers/TestLoggingEnhancer.java | 0 .../logging/logback/LoggingAppenderTest.java | 0 .../logging/logback/MDCEventEnhancerTest.java | 0 .../cloud/logging/logback/StackTraceTest.java | 0 77 files changed, 1604 insertions(+), 71 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/support_request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/release-please.yml create mode 100644 .gitignore create mode 100644 .kokoro/build.bat create mode 100755 .kokoro/build.sh create mode 100755 .kokoro/coerce_logs.sh create mode 100644 .kokoro/common.cfg create mode 100644 .kokoro/continuous/common.cfg create mode 100644 .kokoro/continuous/dependencies.cfg create mode 100644 .kokoro/continuous/integration.cfg create mode 100644 .kokoro/continuous/java11.cfg create mode 100644 .kokoro/continuous/java7.cfg create mode 100644 .kokoro/continuous/java8-osx.cfg create mode 100644 .kokoro/continuous/java8-win.cfg create mode 100644 .kokoro/continuous/java8.cfg create mode 100644 .kokoro/continuous/lint.cfg create mode 100644 .kokoro/continuous/propose_release.cfg create mode 100755 .kokoro/continuous/propose_release.sh create mode 100755 .kokoro/dependencies.sh create mode 100755 .kokoro/linkage-monitor.sh create mode 100644 .kokoro/nightly/common.cfg create mode 100644 .kokoro/nightly/dependencies.cfg create mode 100644 .kokoro/nightly/integration.cfg create mode 100644 .kokoro/nightly/java11.cfg create mode 100644 .kokoro/nightly/java7.cfg create mode 100644 .kokoro/nightly/java8-osx.cfg create mode 100644 .kokoro/nightly/java8-win.cfg create mode 100644 .kokoro/nightly/java8.cfg create mode 100644 .kokoro/nightly/lint.cfg create mode 100644 .kokoro/presubmit/clirr.cfg create mode 100644 .kokoro/presubmit/common.cfg create mode 100644 .kokoro/presubmit/dependencies.cfg create mode 100644 .kokoro/presubmit/integration.cfg create mode 100644 .kokoro/presubmit/java11.cfg create mode 100644 .kokoro/presubmit/java7.cfg create mode 100644 .kokoro/presubmit/java8-osx.cfg create mode 100644 .kokoro/presubmit/java8-win.cfg create mode 100644 .kokoro/presubmit/java8.cfg create mode 100644 .kokoro/presubmit/linkage-monitor.cfg create mode 100644 .kokoro/presubmit/lint.cfg create mode 100644 .kokoro/release/bump_snapshot.cfg create mode 100755 .kokoro/release/bump_snapshot.sh create mode 100644 .kokoro/release/common.cfg create mode 100755 .kokoro/release/common.sh create mode 100644 .kokoro/release/drop.cfg create mode 100755 .kokoro/release/drop.sh create mode 100644 .kokoro/release/promote.cfg create mode 100755 .kokoro/release/promote.sh create mode 100644 .kokoro/release/publish_javadoc.cfg create mode 100755 .kokoro/release/publish_javadoc.sh create mode 100644 .kokoro/release/snapshot.cfg create mode 100755 .kokoro/release/snapshot.sh create mode 100644 .kokoro/release/stage.cfg create mode 100755 .kokoro/release/stage.sh create mode 100644 .kokoro/trampoline.sh create mode 100644 .repo-metadata.json create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md rename google-cloud-contrib/google-cloud-logging-logback/README.md => README.md (100%) create mode 100644 codecov.yaml delete mode 100644 google-cloud-contrib/google-cloud-logging-logback/pom.xml create mode 100644 java.header create mode 100644 license-checks.xml create mode 100644 pom.xml create mode 100644 renovate.json rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/main/java/com/google/cloud/logging/logback/LoggingAppender.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/test/java/com/example/enhancers/TestLoggingEnhancer.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java (100%) rename {google-cloud-contrib/google-cloud-logging-logback/src => src}/test/java/com/google/cloud/logging/logback/StackTraceTest.java (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..4e3e20cc8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,51 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + +Please run down the following list and make sure you've tried the usual "quick fixes": + + - Search the issues already opened: https://github.com/googleapis/java-logging-logback/issues + - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform + +If you are still having issues, please include as much information as possible: + +#### Environment details + +1. Specify the API at the beginning of the title. For example, "BigQuery: ..."). + General, Core, and Other are also allowed as types +2. OS type and version: +3. Java version: +4. logging-logback version(s): + +#### Steps to reproduce + + 1. ? + 2. ? + +#### Code example + +```java +// example +``` + +#### Stack trace +``` +Any relevant stacktrace here. +``` + +#### External references such as API reference guides + +- ? + +#### Any additional information below + + +Following these steps guarantees the quickest resolution possible. + +Thanks! diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..754e30c68 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,21 @@ +--- +name: Feature request +about: Suggest an idea for this library + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + +**Is your feature request related to a problem? Please describe.** +What the problem is. Example: I'm always frustrated when [...] + +**Describe the solution you'd like** +What you want to happen. + +**Describe alternatives you've considered** +Any alternative solutions or features you've considered. + +**Additional context** +Any other context or screenshots about the feature request. diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md new file mode 100644 index 000000000..995869032 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/support_request.md @@ -0,0 +1,7 @@ +--- +name: Support request +about: If you have a support contract with Google, please create an issue in the Google Cloud Support console. + +--- + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..0bd0ee062 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1 @@ +Fixes # (it's a good idea to open an issue first for context and/or discussion) \ No newline at end of file diff --git a/.github/release-please.yml b/.github/release-please.yml new file mode 100644 index 000000000..827446828 --- /dev/null +++ b/.github/release-please.yml @@ -0,0 +1 @@ +releaseType: java-yoshi diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..dc2d514ce --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +.gitignore + +# Packages +dist +bin +var +sdist +target + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg + +.metadata +.project +.pydevproject +*.iml +.idea +.settings +.DS_Store +.classpath + +# Built documentation +docs/ + + +# Wheel directory used in Travis builds. +gcloud-java-wheels/ +src/test/resources/gcd-head.zip +src/test/resources/gcd-v1beta2-rev1-2.1.1.zip + +# API key file containing value of GOOGLE_API_KEY for integration tests +api_key + +# Python utilities +*.pyc +artman-genfiles +venv \ No newline at end of file diff --git a/.kokoro/build.bat b/.kokoro/build.bat new file mode 100644 index 000000000..0c272d775 --- /dev/null +++ b/.kokoro/build.bat @@ -0,0 +1,3 @@ +:: See documentation in type-shell-output.bat + +"C:\Program Files\Git\bin\bash.exe" github/java-logging-logback/.kokoro/build.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh new file mode 100755 index 000000000..fa132f410 --- /dev/null +++ b/.kokoro/build.sh @@ -0,0 +1,60 @@ +#!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Print out Java version +java -version +echo ${JOB_TYPE} + +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C + +# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then + export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) +fi + +case ${JOB_TYPE} in +test) + mvn test -B -Dclirr.skip=true + bash ${KOKORO_GFILE_DIR}/codecov.sh + bash .kokoro/coerce_logs.sh + ;; +lint) + mvn com.coveo:fmt-maven-plugin:check + ;; +javadoc) + mvn javadoc:javadoc javadoc:test-javadoc + ;; +integration) + mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + bash .kokoro/coerce_logs.sh + ;; +clirr) + mvn -B clirr:check + ;; +*) + ;; +esac \ No newline at end of file diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh new file mode 100755 index 000000000..5cf7ba49e --- /dev/null +++ b/.kokoro/coerce_logs.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script finds and moves sponge logs so that they can be found by placer +# and are not flagged as flaky by sponge. + +set -eo pipefail + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +job=$(basename ${KOKORO_JOB_NAME}) + +echo "coercing sponge logs..." +for xml in `find . -name *-sponge_log.xml` +do + echo "processing ${xml}" + class=$(basename ${xml} | cut -d- -f2) + dir=$(dirname ${xml})/${job}/${class} + text=$(dirname ${xml})/${class}-sponge_log.txt + mkdir -p ${dir} + mv ${xml} ${dir}/sponge_log.xml + mv ${text} ${dir}/sponge_log.txt +done diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg new file mode 100644 index 000000000..7f18e7e4a --- /dev/null +++ b/.kokoro/common.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR} +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# All builds use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/build.sh" +} diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg new file mode 100644 index 000000000..4c218c698 --- /dev/null +++ b/.kokoro/continuous/common.cfg @@ -0,0 +1,25 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/.kokoro/continuous/dependencies.cfg b/.kokoro/continuous/dependencies.cfg new file mode 100644 index 000000000..33ad89019 --- /dev/null +++ b/.kokoro/continuous/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/dependencies.sh" +} diff --git a/.kokoro/continuous/integration.cfg b/.kokoro/continuous/integration.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/continuous/integration.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/continuous/java11.cfg b/.kokoro/continuous/java11.cfg new file mode 100644 index 000000000..709f2b4c7 --- /dev/null +++ b/.kokoro/continuous/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg new file mode 100644 index 000000000..cb24f44ee --- /dev/null +++ b/.kokoro/continuous/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/.kokoro/continuous/java8-osx.cfg b/.kokoro/continuous/java8-osx.cfg new file mode 100644 index 000000000..205afdcd1 --- /dev/null +++ b/.kokoro/continuous/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.sh" diff --git a/.kokoro/continuous/java8-win.cfg b/.kokoro/continuous/java8-win.cfg new file mode 100644 index 000000000..26210fe6b --- /dev/null +++ b/.kokoro/continuous/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.bat" diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/continuous/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/continuous/lint.cfg b/.kokoro/continuous/lint.cfg new file mode 100644 index 000000000..6d323c8ae --- /dev/null +++ b/.kokoro/continuous/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/.kokoro/continuous/propose_release.cfg b/.kokoro/continuous/propose_release.cfg new file mode 100644 index 000000000..255133183 --- /dev/null +++ b/.kokoro/continuous/propose_release.cfg @@ -0,0 +1,53 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/continuous/propose_release.sh" +} + +# tokens used by release-please to keep an up-to-date release PR. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" + } + } +} diff --git a/.kokoro/continuous/propose_release.sh b/.kokoro/continuous/propose_release.sh new file mode 100755 index 000000000..372054a17 --- /dev/null +++ b/.kokoro/continuous/propose_release.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + # Groom the release PR as new commits are merged. + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ + --repo-url=googleapis/java-logging-logback \ + --package-name="logging-logback" \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ + --release-type=java-yoshi +fi diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh new file mode 100755 index 000000000..feffdbd0e --- /dev/null +++ b/.kokoro/dependencies.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +cd github/java-logging-logback/ + +# Print out Java +java -version +echo $JOB_TYPE + +export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" + +mvn install -DskipTests=true -B -V +mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh new file mode 100755 index 000000000..2ba5e887f --- /dev/null +++ b/.kokoro/linkage-monitor.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail +# Display commands being run. +set -x + +cd github/java-logging-logback/ + +# Print out Java version +java -version +echo ${JOB_TYPE} + +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V + +# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR +JAR=linkage-monitor-latest-all-deps.jar +curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}" + +# Fails if there's new linkage errors compared with baseline +java -jar ${JAR} com.google.cloud:libraries-bom diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg new file mode 100644 index 000000000..4c218c698 --- /dev/null +++ b/.kokoro/nightly/common.cfg @@ -0,0 +1,25 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/.kokoro/nightly/dependencies.cfg b/.kokoro/nightly/dependencies.cfg new file mode 100644 index 000000000..33ad89019 --- /dev/null +++ b/.kokoro/nightly/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/dependencies.sh" +} diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/nightly/integration.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/nightly/java11.cfg b/.kokoro/nightly/java11.cfg new file mode 100644 index 000000000..709f2b4c7 --- /dev/null +++ b/.kokoro/nightly/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/.kokoro/nightly/java7.cfg b/.kokoro/nightly/java7.cfg new file mode 100644 index 000000000..cb24f44ee --- /dev/null +++ b/.kokoro/nightly/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/.kokoro/nightly/java8-osx.cfg b/.kokoro/nightly/java8-osx.cfg new file mode 100644 index 000000000..205afdcd1 --- /dev/null +++ b/.kokoro/nightly/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.sh" diff --git a/.kokoro/nightly/java8-win.cfg b/.kokoro/nightly/java8-win.cfg new file mode 100644 index 000000000..26210fe6b --- /dev/null +++ b/.kokoro/nightly/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.bat" diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/nightly/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/nightly/lint.cfg b/.kokoro/nightly/lint.cfg new file mode 100644 index 000000000..6d323c8ae --- /dev/null +++ b/.kokoro/nightly/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/.kokoro/presubmit/clirr.cfg b/.kokoro/presubmit/clirr.cfg new file mode 100644 index 000000000..ec572442e --- /dev/null +++ b/.kokoro/presubmit/clirr.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "clirr" +} \ No newline at end of file diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg new file mode 100644 index 000000000..a0fcbb3b1 --- /dev/null +++ b/.kokoro/presubmit/common.cfg @@ -0,0 +1,34 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} diff --git a/.kokoro/presubmit/dependencies.cfg b/.kokoro/presubmit/dependencies.cfg new file mode 100644 index 000000000..33ad89019 --- /dev/null +++ b/.kokoro/presubmit/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/dependencies.sh" +} diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg new file mode 100644 index 000000000..141f90c13 --- /dev/null +++ b/.kokoro/presubmit/integration.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/presubmit/java11.cfg b/.kokoro/presubmit/java11.cfg new file mode 100644 index 000000000..709f2b4c7 --- /dev/null +++ b/.kokoro/presubmit/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg new file mode 100644 index 000000000..cb24f44ee --- /dev/null +++ b/.kokoro/presubmit/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/.kokoro/presubmit/java8-osx.cfg b/.kokoro/presubmit/java8-osx.cfg new file mode 100644 index 000000000..205afdcd1 --- /dev/null +++ b/.kokoro/presubmit/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.sh" diff --git a/.kokoro/presubmit/java8-win.cfg b/.kokoro/presubmit/java8-win.cfg new file mode 100644 index 000000000..26210fe6b --- /dev/null +++ b/.kokoro/presubmit/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-logging-logback/.kokoro/build.bat" diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/presubmit/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/.kokoro/presubmit/linkage-monitor.cfg b/.kokoro/presubmit/linkage-monitor.cfg new file mode 100644 index 000000000..28cf064a9 --- /dev/null +++ b/.kokoro/presubmit/linkage-monitor.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/linkage-monitor.sh" +} \ No newline at end of file diff --git a/.kokoro/presubmit/lint.cfg b/.kokoro/presubmit/lint.cfg new file mode 100644 index 000000000..6d323c8ae --- /dev/null +++ b/.kokoro/presubmit/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/.kokoro/release/bump_snapshot.cfg b/.kokoro/release/bump_snapshot.cfg new file mode 100644 index 000000000..3be109b18 --- /dev/null +++ b/.kokoro/release/bump_snapshot.cfg @@ -0,0 +1,53 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/bump_snapshot.sh" +} + +# tokens used by release-please to keep an up-to-date release PR. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" + } + } +} diff --git a/.kokoro/release/bump_snapshot.sh b/.kokoro/release/bump_snapshot.sh new file mode 100755 index 000000000..4de0f2757 --- /dev/null +++ b/.kokoro/release/bump_snapshot.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + # Groom the snapshot release PR immediately after publishing a release + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ + --repo-url=googleapis/java-logging-logback \ + --package-name="logging-logback" \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ + --snapshot \ + --release-type=java-auth-yoshi +fi diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg new file mode 100644 index 000000000..6f459cf05 --- /dev/null +++ b/.kokoro/release/common.cfg @@ -0,0 +1,49 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-logging-logback/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-keyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-passphrase" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-pubkeyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "sonatype-credentials" + } + } +} diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh new file mode 100755 index 000000000..6e3f65999 --- /dev/null +++ b/.kokoro/release/common.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# Get secrets from keystore and set and environment variables +setup_environment_secrets() { + export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase) + export GPG_TTY=$(tty) + export GPG_HOMEDIR=/gpg + mkdir $GPG_HOMEDIR + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg + export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|') + export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|') +} + +create_settings_xml_file() { + echo " + + + ossrh + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-staging + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-snapshots + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + +" > $1 +} \ No newline at end of file diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg new file mode 100644 index 000000000..39ed3cf7e --- /dev/null +++ b/.kokoro/release/drop.cfg @@ -0,0 +1,9 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/drop.sh" +} + +# Download staging properties file. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging-logback" \ No newline at end of file diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh new file mode 100755 index 000000000..5c4551efa --- /dev/null +++ b/.kokoro/release/drop.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi + +source $(dirname "$0")/common.sh +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:drop -B \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg new file mode 100644 index 000000000..3a21b50fa --- /dev/null +++ b/.kokoro/release/promote.cfg @@ -0,0 +1,10 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/promote.sh" +} + +# Download staging properties file. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging-logback" + diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh new file mode 100755 index 000000000..1fa95fa53 --- /dev/null +++ b/.kokoro/release/promote.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi + +source $(dirname "$0")/common.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:release -B \ + -DperformRelease=true \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg new file mode 100644 index 000000000..600ba5d09 --- /dev/null +++ b/.kokoro/release/publish_javadoc.cfg @@ -0,0 +1,19 @@ +# Format: //devtools/kokoro/config/proto/build.proto +env_vars: { + key: "STAGING_BUCKET" + value: "docs-staging" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/publish_javadoc.sh" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh new file mode 100755 index 000000000..e8907b29e --- /dev/null +++ b/.kokoro/release/publish_javadoc.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright 2019 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +if [[ -z "${CREDENTIALS}" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi + +if [[ -z "${STAGING_BUCKET}" ]]; then + echo "Need to set STAGING_BUCKET environment variable" + exit 1 +fi + +# work from the git root directory +pushd $(dirname "$0")/../../ + +# install docuploader package +python3 -m pip install gcp-docuploader + +# compile all packages +mvn clean install -B -DskipTests=true + +NAME=logging-logback +VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) + +# build the docs +mvn site -B + +pushd target/site/apidocs + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload docs +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET} + +popd diff --git a/.kokoro/release/snapshot.cfg b/.kokoro/release/snapshot.cfg new file mode 100644 index 000000000..2bd1e3e1b --- /dev/null +++ b/.kokoro/release/snapshot.cfg @@ -0,0 +1,6 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/snapshot.sh" +} \ No newline at end of file diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh new file mode 100755 index 000000000..098168a73 --- /dev/null +++ b/.kokoro/release/snapshot.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +source $(dirname "$0")/common.sh +MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml +pushd $(dirname "$0")/../../ + +# ensure we're trying to push a snapshot (no-result returns non-zero exit code) +grep SNAPSHOT versions.txt + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg new file mode 100644 index 000000000..4ca97d1df --- /dev/null +++ b/.kokoro/release/stage.cfg @@ -0,0 +1,44 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-logging-logback/.kokoro/release/stage.sh" +} + +# Need to save the properties file +action { + define_artifacts { + regex: "github/java-logging-logback/target/nexus-staging/staging/*.properties" + strip_prefix: "github/java-logging-logback" + } +} + +# Fetch the token needed for reporting release status to GitHub +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} + +# Fetch magictoken to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "releasetool-magictoken" + } + } +} + +# Fetch api key to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "magic-github-proxy-api-key" + } + } +} diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh new file mode 100755 index 000000000..3c482cbc5 --- /dev/null +++ b/.kokoro/release/stage.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# Start the releasetool reporter +python3 -m pip install gcp-releasetool +python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script + +source $(dirname "$0")/common.sh +MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} + +if [[ -n "${AUTORELEASE_PR}" ]] +then + mvn nexus-staging:release -B \ + -DperformRelease=true \ + --settings=settings.xml +fi \ No newline at end of file diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh new file mode 100644 index 000000000..ba17ce014 --- /dev/null +++ b/.kokoro/trampoline.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +set -eo pipefail +# Always run the cleanup script, regardless of the success of bouncing into +# the container. +function cleanup() { + chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + echo "cleanup"; +} +trap cleanup EXIT +python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/.repo-metadata.json b/.repo-metadata.json new file mode 100644 index 000000000..e9f30315e --- /dev/null +++ b/.repo-metadata.json @@ -0,0 +1,13 @@ +{ + "name": "logging-logback", + "name_pretty": "Google Cloud Logging Logback Appender", + "product_documentation": "https://cloud.google.com/logging-logback/docs/", + "client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/logging/logback/package-summary.html", + "issue_tracker": "https://issuetracker.google.com/savedsearches/559764", + "release_level": "alpha", + "language": "java", + "repo": "googleapis/java-logging-logback", + "repo_short": "java-logging-logback", + "distribution_name": "com.google.cloud:google-cloud-logging-logback", + "api_id": "logging.googleapis.com" +} \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..6b2238bb7 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,93 @@ +# Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, education, socio-economic status, nationality, personal appearance, +race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +This Code of Conduct also applies outside the project spaces when the Project +Steward has a reasonable belief that an individual's behavior may have a +negative impact on the project or its community. + +## Conflict Resolution + +We do not believe that all conflict is bad; healthy debate and disagreement +often yield positive results. However, it is never okay to be disrespectful or +to engage in behavior that violates the project’s code of conduct. + +If you see someone violating the code of conduct, you are encouraged to address +the behavior directly with those involved. Many issues can be resolved quickly +and easily, and this gives people more control over the outcome of their +dispute. If you are unable to resolve the matter for any reason, or if the +behavior is threatening or harassing, report it. We are dedicated to providing +an environment where participants feel welcome and safe. + +Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the +Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +receive and address reported violations of the code of conduct. They will then +work with a committee consisting of representatives from the Open Source +Programs Office and the Google Open Source Strategy team. If for any reason you +are uncomfortable reaching out the Project Steward, please email +opensource@google.com. + +We will investigate every complaint, but you may not receive a direct response. +We will use our discretion in determining when and how to follow up on reported +incidents, which may range from not taking action to permanent expulsion from +the project and project-sponsored spaces. We will notify the accused of the +report and provide them an opportunity to discuss it before any action is taken. +The identity of the reporter will be omitted from the details of the report +supplied to the accused. In potentially harmful situations, such as ongoing +harassment or threats to anyone's safety, we may take action without notice. + +## Attribution + +This Code of Conduct is adapted from the Contributor Covenant, version 1.4, +available at +https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..ebbb59e53 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,28 @@ +# How to Contribute + +We'd love to accept your patches and contributions to this project. There are +just a few small guidelines you need to follow. + +## Contributor License Agreement + +Contributions to this project must be accompanied by a Contributor License +Agreement. You (or your employer) retain the copyright to your contribution; +this simply gives us permission to use and redistribute your contributions as +part of the project. Head over to to see +your current agreements on file or to sign a new one. + +You generally only need to submit a CLA once, so if you've already submitted one +(even if it was for a different project), you probably don't need to do it +again. + +## Code reviews + +All submissions, including submissions by project members, require review. We +use GitHub pull requests for this purpose. Consult +[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more +information on using pull requests. + +## Community Guidelines + +This project follows +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file diff --git a/LICENSE b/LICENSE index 4eedc0116..d64569567 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ Apache License APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a diff --git a/google-cloud-contrib/google-cloud-logging-logback/README.md b/README.md similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/README.md rename to README.md diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 000000000..5724ea947 --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,4 @@ +--- +codecov: + ci: + - source.cloud.google.com diff --git a/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-contrib/google-cloud-logging-logback/pom.xml deleted file mode 100644 index 4bbc7bd0c..000000000 --- a/google-cloud-contrib/google-cloud-logging-logback/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - google-cloud-logging-logback - 0.116.0-alpha - jar - Google Cloud Logging Logback Appender - https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback - - Logback support for Google Cloud Logging - - - - 1.2.3 - - - - com.google.cloud - google-cloud-contrib - 0.120.1-alpha-SNAPSHOT - - - - ch.qos.logback - logback-classic - ${logback.version} - - - com.google.cloud - google-cloud-logging - 1.98.0 - - - - org.easymock - easymock - test - - - com.google.truth - truth - test - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - true - - - - - \ No newline at end of file diff --git a/java.header b/java.header new file mode 100644 index 000000000..3a9b503aa --- /dev/null +++ b/java.header @@ -0,0 +1,15 @@ +^/\*$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \*$ +^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ +^ \* you may not use this file except in compliance with the License\.$ +^ \* You may obtain a copy of the License at$ +^ \*$ +^ \*[ ]+https?://www.apache.org/licenses/LICENSE-2\.0$ +^ \*$ +^ \* Unless required by applicable law or agreed to in writing, software$ +^ \* distributed under the License is distributed on an "AS IS" BASIS,$ +^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$ +^ \* See the License for the specific language governing permissions and$ +^ \* limitations under the License\.$ +^ \*/$ diff --git a/license-checks.xml b/license-checks.xml new file mode 100644 index 000000000..6597fced8 --- /dev/null +++ b/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..b374e82af --- /dev/null +++ b/pom.xml @@ -0,0 +1,229 @@ + + + 4.0.0 + + google-cloud-logging-logback + 0.116.0-alpha + jar + Google Cloud Logging Logback Appender + https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback + + Logback support for Google Cloud Logging + + + + 1.2.3 + 3.6 + 1.0 + 2.8.6 + 1.98.0 + 28.1-android + 1.7.25 + 0.18.0 + 4.12 + 1.8.1 + + + + com.google.cloud + google-cloud-shared-config + 0.3.0 + + + + + chingor + Jeff Ching + chingor@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/java-logging-logback.git + scm:git:git@github.com:googleapis/java-logging-logback.git + https://github.com/googleapis/java-logging-logback + HEAD + + + https://github.com/googleapis/java-logging-logback/issues + GitHub Issues + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + com.google.guava + guava-bom + ${guava.version} + pom + import + + + com.google.code.gson + gson + ${gson.version} + + + com.google.auth + google-auth-library-bom + ${google.auth.version} + pom + import + + + + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + com.google.cloud + google-cloud-logging + ${logging.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.google.api + api-common + ${google.api-common.version} + + + com.google.cloud + google-cloud-core + 1.91.3 + + + com.google.auth + google-auth-library-oauth2-http + + + com.google.guava + guava + + + + + junit + junit + ${junit.version} + test + + + org.easymock + easymock + ${easymock.version} + test + + + com.google.truth + truth + ${truth.version} + test + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + + index + dependency-info + team + ci-management + issue-management + licenses + scm + dependency-management + distribution-management + summary + modules + + + + + true + ${site.installationModule} + jar + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + html + + aggregate + javadoc + + + + + none + protected + true + ${project.build.directory}/javadoc + + + Test helpers packages + com.google.cloud.testing + + + SPI packages + com.google.cloud.spi* + + + + + https://grpc.io/grpc-java/javadoc/ + https://developers.google.com/protocol-buffers/docs/reference/java/ + https://googleapis.dev/java/google-auth-library/latest/ + https://googleapis.dev/java/gax/latest/ + https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ + + + + + + \ No newline at end of file diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000..998104700 --- /dev/null +++ b/renovate.json @@ -0,0 +1,27 @@ +{ + "extends": [ + "config:base" + ], + "ignoreDeps": [], + "packageRules": [ + { + "managers": ["maven"], + "packageNames": ["com.google.guava:guava*"], + "versionScheme": "docker" + }, + { + "packagePatterns": ["^io.grpc:grpc-"], + "groupName": "gRPC packages" + }, + { + "packagePatterns": ["^com.google.protobuf:protobuf-"], + "groupName": "Protobuf packages" + }, + { + "packagePatterns": ["^io.opencensus:opencensus-"], + "groupName": "OpenCensus packages" + } + ], + "semanticCommits": true, + "semanticCommitType": "deps" +} diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java rename to src/main/java/com/google/cloud/logging/logback/LoggingAppender.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java b/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java rename to src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java b/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java rename to src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java b/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java rename to src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java b/src/test/java/com/example/enhancers/TestLoggingEnhancer.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java rename to src/test/java/com/example/enhancers/TestLoggingEnhancer.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java rename to src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java b/src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java rename to src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java b/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java similarity index 100% rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java rename to src/test/java/com/google/cloud/logging/logback/StackTraceTest.java From d1a49a5a5db84a47e607ba9d14024db93322abb4 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 26 Dec 2019 17:51:03 -0600 Subject: [PATCH 03/45] chore: group core transport dependencies --- renovate.json | 55 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/renovate.json b/renovate.json index 998104700..d014232c5 100644 --- a/renovate.json +++ b/renovate.json @@ -1,27 +1,58 @@ { "extends": [ - "config:base" + ":separateMajorReleases", + ":combinePatchMinorReleases", + ":ignoreUnstable", + ":prImmediately", + ":updateNotScheduled", + ":automergeDisabled", + ":ignoreModulesAndTests", + ":maintainLockFilesDisabled", + ":autodetectPinVersions" ], - "ignoreDeps": [], "packageRules": [ { - "managers": ["maven"], - "packageNames": ["com.google.guava:guava*"], + "packagePatterns": [ + "^com.google.guava:" + ], "versionScheme": "docker" }, { - "packagePatterns": ["^io.grpc:grpc-"], - "groupName": "gRPC packages" + "packagePatterns": [ + "^com.google.api:gax", + "^com.google.auth:", + "^com.google.cloud:google-cloud-core", + "^io.grpc:" + ], + "groupName": "core dependencies" }, { - "packagePatterns": ["^com.google.protobuf:protobuf-"], - "groupName": "Protobuf packages" + "packagePatterns": [ + "^com.google.http-client:", + "^com.google.oauth-client:", + "^com.google.api-client:" + ], + "groupName": "core transport dependencies" }, { - "packagePatterns": ["^io.opencensus:opencensus-"], - "groupName": "OpenCensus packages" + "packagePatterns": [ + "*" + ], + "semanticCommitType": "deps", + "semanticCommitScope": null + }, + { + "packagePatterns": [ + "^org.apache.maven", + "^org.jacoco:", + "^org.codehaus.mojo:", + "^org.sonatype.plugins:", + "^com.coveo:", + "^com.google.cloud:google-cloud-shared-config" + ], + "semanticCommitType": "build", + "semanticCommitScope": "deps" } ], - "semanticCommits": true, - "semanticCommitType": "deps" + "semanticCommits": true } From 8c06e9ab3fc44bd738e80fc966e739e8cb9f70bb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Dec 2019 02:06:02 +0200 Subject: [PATCH 04/45] deps: update core dependencies (#11) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b374e82af..0ab4ba7ab 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.98.0 28.1-android 1.7.25 - 0.18.0 + 0.19.0 4.12 1.8.1 @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.91.3 + 1.92.0 com.google.auth From ce949a0ee0f10d1276ce3da94230c6e5f57e7b4b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Dec 2019 03:04:45 +0200 Subject: [PATCH 05/45] deps: update dependency org.slf4j:slf4j-api to v1.7.30 (#12) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ab4ba7ab..41ff0fe19 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.8.6 1.98.0 28.1-android - 1.7.25 + 1.7.30 0.19.0 4.12 1.8.1 From 137fd963db405ab376cfde502e1ec206ba5caf1a Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Fri, 27 Dec 2019 10:50:04 -0700 Subject: [PATCH 06/45] chore: add synth.py file (#14) Fixes #10 --- synth.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 synth.py diff --git a/synth.py b/synth.py new file mode 100644 index 000000000..c484fc4d2 --- /dev/null +++ b/synth.py @@ -0,0 +1,24 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This script is used to synthesize generated parts of this library.""" + +import synthtool as s +import synthtool.gcp as gcp + + +templates = gcp.CommonTemplates().java_library() +s.copy(templates, excludes=[ + 'README.md', +]) \ No newline at end of file From 8dca41ff6a284348c26f3d20c7381178bfb85e8c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 3 Jan 2020 11:26:08 -0800 Subject: [PATCH 07/45] chore: update common templates (#16) --- .github/release-please.yml | 1 + .kokoro/build.sh | 14 +- .kokoro/dependencies.sh | 6 +- .kokoro/release/drop.cfg | 3 - .kokoro/release/promote.cfg | 4 - .kokoro/release/publish_javadoc.sh | 2 +- synth.metadata | 542 +++++++++++++++++++++++++++++ 7 files changed, 559 insertions(+), 13 deletions(-) create mode 100644 synth.metadata diff --git a/.github/release-please.yml b/.github/release-please.yml index 827446828..dce2c8450 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f410..dc2936ef7 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -49,12 +50,17 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index feffdbd0e..db776b50e 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg index 39ed3cf7e..e833cf491 100644 --- a/.kokoro/release/drop.cfg +++ b/.kokoro/release/drop.cfg @@ -4,6 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-logging-logback/.kokoro/release/drop.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging-logback" \ No newline at end of file diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg index 3a21b50fa..76e82ac94 100644 --- a/.kokoro/release/promote.cfg +++ b/.kokoro/release/promote.cfg @@ -4,7 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-logging-logback/.kokoro/release/promote.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-logging-logback" - diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index e8907b29e..2706a15aa 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -DskipTests=true -NAME=logging-logback +NAME=google-cloud-logging-logback VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs diff --git a/synth.metadata b/synth.metadata new file mode 100644 index 000000000..b69eb7b36 --- /dev/null +++ b/synth.metadata @@ -0,0 +1,542 @@ +{ + "updateTime": "2019-12-28T09:04:26.534651Z", + "sources": [ + { + "template": { + "name": "java_library", + "origin": "synthtool.gcp", + "version": "2019.10.17" + } + } + ], + "newFiles": [ + { + "path": "CODE_OF_CONDUCT.md" + }, + { + "path": "LICENSE" + }, + { + "path": "CONTRIBUTING.md" + }, + { + "path": "codecov.yaml" + }, + { + "path": "renovate.json" + }, + { + "path": ".repo-metadata.json" + }, + { + "path": "pom.xml" + }, + { + "path": ".gitignore" + }, + { + "path": "synth.py" + }, + { + "path": "license-checks.xml" + }, + { + "path": "README.md" + }, + { + "path": "java.header" + }, + { + "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" + }, + { + "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" + }, + { + "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" + }, + { + "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" + }, + { + "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" + }, + { + "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" + }, + { + "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" + }, + { + "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" + }, + { + "path": ".github/release-please.yml" + }, + { + "path": ".github/PULL_REQUEST_TEMPLATE.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/support_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/feature_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/bug_report.md" + }, + { + "path": ".git/shallow" + }, + { + "path": ".git/index" + }, + { + "path": ".git/HEAD" + }, + { + "path": ".git/config" + }, + { + "path": ".git/packed-refs" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" + }, + { + "path": ".git/objects/f9/82b3f0690a4f9bba58e7dc4b23c075a5f6126c" + }, + { + "path": ".git/objects/b9/0ec1fc6b2a5c60296609fd875381cff9faf187" + }, + { + "path": ".git/objects/d7/bdcd01f1483c064854fd3592be29d8861b83c7" + }, + { + "path": ".git/objects/0c/272d77533a7c58c87006b3875175d9a0b06871" + }, + { + "path": ".git/objects/4b/645e3775347c4a4bed68d640d99625269967d4" + }, + { + "path": ".git/objects/e2/52687630b9d56048bafbb869e5e87050b5d63c" + }, + { + "path": ".git/objects/3f/422c252acaa6848fa18e32c6b59279557a63de" + }, + { + "path": ".git/objects/d9/da84471af0b4bfb01b735cdd32a09aba47e1d3" + }, + { + "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" + }, + { + "path": ".git/objects/8a/3f26a32a3c4a24dc8da6f2bf404f8c6a7bccaa" + }, + { + "path": ".git/objects/5d/8005deb10566e786835cab634f9804c8ef2dc6" + }, + { + "path": ".git/objects/37/2054a1700974802e947bf8f7fe493281707ad5" + }, + { + "path": ".git/objects/a3/6e1351767b441c9599d7fca4501f9c5c55d73e" + }, + { + "path": ".git/objects/3b/e109b188cab6492f0d1ff12bf3025b946b90db" + }, + { + "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + }, + { + "path": ".git/objects/4c/a97d1df449b3e129acb03bfefbd377444741bd" + }, + { + "path": ".git/objects/4c/218c698e8e38ad801a0271c01e87134c3d8c4f" + }, + { + "path": ".git/objects/4e/3e20cc835b2e3ac474f3862a2abde033b9c345" + }, + { + "path": ".git/objects/5a/40846e9a158a2f61da038f5dc0a80235951f7f" + }, + { + "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" + }, + { + "path": ".git/objects/26/210fe6b265b03bb98c7289c0e01be36474540f" + }, + { + "path": ".git/objects/25/51331836988832f7cf2b6e805f9bd92e7237b2" + }, + { + "path": ".git/objects/fe/5969d61f4e387dcf4289dc30901ac5e7ced62d" + }, + { + "path": ".git/objects/fe/ffdbd0ef7720a7eb3c9d3254dd09d7fcdc3c06" + }, + { + "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" + }, + { + "path": ".git/objects/eb/a7f7ce6bf3519dfe70756688f86182da71f496" + }, + { + "path": ".git/objects/3a/21b50fad302cec01c7d2c85063d9e4151e2db8" + }, + { + "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + }, + { + "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" + }, + { + "path": ".git/objects/c4/84fc4d29b76b33e0fb58a21f03ba018b3316c2" + }, + { + "path": ".git/objects/48/444eb4e525731076cfb804bc6b04f8559f52db" + }, + { + "path": ".git/objects/06/a1d0cfe214ac41604a1313a2714751a14f8250" + }, + { + "path": ".git/objects/4d/e0f275702016c4446ceb0f2a1ab6fee0db4023" + }, + { + "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" + }, + { + "path": ".git/objects/ba/c0b01753192b04618d5d49525afc125b2327e5" + }, + { + "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + }, + { + "path": ".git/objects/a0/fcbb3b1f6e7c3d18a8004f6164f922bd91167c" + }, + { + "path": ".git/objects/20/1039015dcc687b2d2595060b8add46c93702db" + }, + { + "path": ".git/objects/20/5afdcd11814be7a58e1eb7977673ae5c2930e2" + }, + { + "path": ".git/objects/91/a881c1f1f865c8d3cd3cbd20bbaa3d46620e31" + }, + { + "path": ".git/objects/e9/f30315ee917b2da35b51ca06e26b095f7ea4b8" + }, + { + "path": ".git/objects/df/404f8bab2e8bc719bb8d40e9268494f3fab40d" + }, + { + "path": ".git/objects/df/ab30fb78d1e6bed3f518bcfa86ceaebfca6ada" + }, + { + "path": ".git/objects/35/774238f99272b49d54b6e663fb170d6f5fbfc9" + }, + { + "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + }, + { + "path": ".git/objects/2b/d1e3e1b8fab1a0b41dfd17670888fd37a6233b" + }, + { + "path": ".git/objects/2b/a5e887f6c530d2acc787cf65d0eb217a814955" + }, + { + "path": ".git/objects/16/f7b7dcb7fe6afca54f670a0d3381501f7f299c" + }, + { + "path": ".git/objects/41/ff0fe195d023fcec65dbf736ea4946a69e9ce3" + }, + { + "path": ".git/objects/fa/26b858fb45362de670bd603d8fdcf212abe3d1" + }, + { + "path": ".git/objects/fa/132f410dcc443acaca1e838b1c6e3e895b3545" + }, + { + "path": ".git/objects/a2/2a7ee1c4cfb5cc7605d1ecf71f157267ccdc47" + }, + { + "path": ".git/objects/85/ca38907d5acf8a777117d013bf2384478c23d1" + }, + { + "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" + }, + { + "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" + }, + { + "path": ".git/objects/13/7fd963db405ab376cfde502e1ec206ba5caf1a" + }, + { + "path": ".git/objects/9f/0dd76d1eabeea7c1957f55106deb736314e6e1" + }, + { + "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" + }, + { + "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + }, + { + "path": ".git/objects/60/0ba5d09d8196acc8f8ebfa9d3f057e71606728" + }, + { + "path": ".git/objects/79/8fd6357287ff161ffafcca7063e457c910c32f" + }, + { + "path": ".git/objects/62/4ce5db167b2ce961a553b9746962040ddd5bd7" + }, + { + "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" + }, + { + "path": ".git/objects/67/3157413af09b22187e1a1ac89df8ea5612402c" + }, + { + "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + }, + { + "path": ".git/objects/33/ad8901962f8d2149b86ca0a60e8a1f309d97a4" + }, + { + "path": ".git/objects/28/cf064a9e5dd3823cb92cd71955b5ab6cba5ca8" + }, + { + "path": ".git/objects/dc/2d514ce20dec305fca6f466f6713298a6c55f8" + }, + { + "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + }, + { + "path": ".git/objects/54/77c432226e4e66e28117e4109942b6657388c3" + }, + { + "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + }, + { + "path": ".git/objects/da/a76fd98da6d911ff077d207e21cad37eee3b3a" + }, + { + "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" + }, + { + "path": ".git/objects/7f/18e7e4abf229e81b9266c3c880df4e7c46cbdd" + }, + { + "path": ".git/objects/36/024400e50542ba3403d4f442bd8c9840ea4437" + }, + { + "path": ".git/objects/bd/24cbdd03a34eecdf6e620649aaa3b624adedf8" + }, + { + "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" + }, + { + "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + }, + { + "path": ".git/objects/e8/907b29eafa39d2ebd141b157a51bd6edae7b77" + }, + { + "path": ".git/objects/6f/459cf05842f33cf37a32ae59927abe5dc92bf5" + }, + { + "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" + }, + { + "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + }, + { + "path": ".git/objects/ae/52a286a4f016c950805bd26181a27ed9e15776" + }, + { + "path": ".git/objects/39/ed3cf7e8de33d5c8d9662f3efcb5bbacf1dfaa" + }, + { + "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" + }, + { + "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" + }, + { + "path": ".git/refs/remotes/origin/HEAD" + }, + { + "path": ".git/refs/heads/autosynth" + }, + { + "path": ".git/refs/heads/master" + }, + { + "path": ".kokoro/coerce_logs.sh" + }, + { + "path": ".kokoro/common.cfg" + }, + { + "path": ".kokoro/build.sh" + }, + { + "path": ".kokoro/linkage-monitor.sh" + }, + { + "path": ".kokoro/build.bat" + }, + { + "path": ".kokoro/dependencies.sh" + }, + { + "path": ".kokoro/trampoline.sh" + }, + { + "path": ".kokoro/nightly/java7.cfg" + }, + { + "path": ".kokoro/nightly/common.cfg" + }, + { + "path": ".kokoro/nightly/java8.cfg" + }, + { + "path": ".kokoro/nightly/java11.cfg" + }, + { + "path": ".kokoro/nightly/java8-osx.cfg" + }, + { + "path": ".kokoro/nightly/lint.cfg" + }, + { + "path": ".kokoro/nightly/integration.cfg" + }, + { + "path": ".kokoro/nightly/dependencies.cfg" + }, + { + "path": ".kokoro/nightly/java8-win.cfg" + }, + { + "path": ".kokoro/release/common.cfg" + }, + { + "path": ".kokoro/release/bump_snapshot.sh" + }, + { + "path": ".kokoro/release/stage.cfg" + }, + { + "path": ".kokoro/release/promote.sh" + }, + { + "path": ".kokoro/release/drop.cfg" + }, + { + "path": ".kokoro/release/drop.sh" + }, + { + "path": ".kokoro/release/bump_snapshot.cfg" + }, + { + "path": ".kokoro/release/publish_javadoc.cfg" + }, + { + "path": ".kokoro/release/snapshot.sh" + }, + { + "path": ".kokoro/release/promote.cfg" + }, + { + "path": ".kokoro/release/stage.sh" + }, + { + "path": ".kokoro/release/common.sh" + }, + { + "path": ".kokoro/release/publish_javadoc.sh" + }, + { + "path": ".kokoro/release/snapshot.cfg" + }, + { + "path": ".kokoro/presubmit/java7.cfg" + }, + { + "path": ".kokoro/presubmit/common.cfg" + }, + { + "path": ".kokoro/presubmit/linkage-monitor.cfg" + }, + { + "path": ".kokoro/presubmit/java8.cfg" + }, + { + "path": ".kokoro/presubmit/clirr.cfg" + }, + { + "path": ".kokoro/presubmit/java11.cfg" + }, + { + "path": ".kokoro/presubmit/java8-osx.cfg" + }, + { + "path": ".kokoro/presubmit/lint.cfg" + }, + { + "path": ".kokoro/presubmit/integration.cfg" + }, + { + "path": ".kokoro/presubmit/dependencies.cfg" + }, + { + "path": ".kokoro/presubmit/java8-win.cfg" + }, + { + "path": ".kokoro/continuous/java7.cfg" + }, + { + "path": ".kokoro/continuous/common.cfg" + }, + { + "path": ".kokoro/continuous/java8.cfg" + }, + { + "path": ".kokoro/continuous/java11.cfg" + }, + { + "path": ".kokoro/continuous/java8-osx.cfg" + }, + { + "path": ".kokoro/continuous/lint.cfg" + }, + { + "path": ".kokoro/continuous/integration.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.cfg" + }, + { + "path": ".kokoro/continuous/dependencies.cfg" + }, + { + "path": ".kokoro/continuous/java8-win.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.sh" + }, + { + "path": "__pycache__/synth.cpython-36.pyc" + } + ] +} \ No newline at end of file From 3f0c4a4f00973e4d2f2b0553e9286805dad17f91 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 3 Jan 2020 22:01:19 +0200 Subject: [PATCH 08/45] chore(deps): update dependency junit:junit to v4.13 (#17) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41ff0fe19..e439359c1 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 28.1-android 1.7.30 0.19.0 - 4.12 + 4.13 1.8.1 From a6100ccf5a9cc2f3b3a45d33f04d3a965152e5f5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 3 Jan 2020 23:02:22 +0200 Subject: [PATCH 09/45] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.3.1 (#19) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e439359c1..3ce47ae00 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-shared-config - 0.3.0 + 0.3.1 From 37b956c33136b2e66c2ccfd4c31e83152799257b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Jan 2020 08:41:38 -0800 Subject: [PATCH 10/45] chore: update common templates (#20) --- .kokoro/build.sh | 15 +- .kokoro/continuous/samples.cfg | 31 +++ .kokoro/nightly/samples.cfg | 31 +++ .kokoro/presubmit/samples.cfg | 31 +++ CONTRIBUTING.md | 104 +++++++++- synth.metadata | 359 +++++++++++++++++---------------- 6 files changed, 397 insertions(+), 174 deletions(-) create mode 100644 .kokoro/continuous/samples.cfg create mode 100644 .kokoro/nightly/samples.cfg create mode 100644 .kokoro/presubmit/samples.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index dc2936ef7..f1ae58408 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,13 +44,26 @@ test) bash .kokoro/coerce_logs.sh ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn \ + -Penable-samples \ + com.coveo:fmt-maven-plugin:check ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + ;; +samples) + mvn -B \ + -Penable-samples \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg new file mode 100644 index 000000000..fa7b493d0 --- /dev/null +++ b/.kokoro/continuous/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg new file mode 100644 index 000000000..9a9102490 --- /dev/null +++ b/.kokoro/nightly/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg new file mode 100644 index 000000000..fa7b493d0 --- /dev/null +++ b/.kokoro/presubmit/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ebbb59e53..085021dde 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,4 +25,106 @@ information on using pull requests. ## Community Guidelines This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). + +## Building the project + +To build, package, and run all unit tests run the command + +``` +mvn clean verify +``` + +### Running Integration tests + +To include integration tests when building the project, you need access to +a GCP Project with a valid service account. + +For instructions on how to generate a service account and corresponding +credentials JSON see: [Creating a Service Account][1]. + +Then run the following to build, package, run all unit tests and run all +integration tests. + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-integration-tests clean verify +``` + +## Code Samples + +Code Samples must be bundled in separate Maven modules, and guarded by a +Maven profile with the name `enable-samples`. + +The samples must be separate from the primary project for a few reasons: +1. Primary projects have a minimum Java version of Java 7 whereas samples have + a minimum Java version of Java 8. Due to this we need the ability to + selectively exclude samples from a build run. +2. Many code samples depend on external GCP services and need + credentials to access the service. +3. Code samples are not released as Maven artifacts and must be excluded from + release builds. + +### Building + +```bash +mvn -Penable-samples clean verify +``` + +Some samples require access to GCP services and require a service account: + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-samples clean verify +``` + +### Profile Config + +1. To add samples in a profile to your Maven project, add the following to your +`pom.xml` + + ```xml + + [...] + + + enable-samples + + sample + + + + [...] + + ``` + +2. [Activate](#profile-activation) the profile. +3. Define your samples in a normal Maven project in the `samples/` directory + +### Profile Activation + +To include code samples when building and testing the project, enable the +`enable-samples` Maven profile. + +#### Command line + +To activate the Maven profile on the command line add `-Penable-samples` to your +Maven command. + +#### Maven `settings.xml` + +To activate the Maven profile in your `~/.m2/settings.xml` add an entry of +`enable-samples` following the instructions in [Active Profiles][2]. + +This method has the benefit of applying to all projects you build (and is +respected by IntelliJ IDEA) and is recommended if you are going to be +contributing samples to several projects. + +#### IntelliJ IDEA + +To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in +[Activate Maven profiles][3] to activate `enable-samples`. + +[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account +[2]: https://maven.apache.org/settings.html#Active_Profiles +[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles diff --git a/synth.metadata b/synth.metadata index b69eb7b36..33b88b6d1 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-12-28T09:04:26.534651Z", + "updateTime": "2020-01-07T09:14:25.880791Z", "sources": [ { "template": { @@ -11,532 +11,547 @@ ], "newFiles": [ { - "path": "CODE_OF_CONDUCT.md" + "path": ".repo-metadata.json" }, { - "path": "LICENSE" + "path": "renovate.json" }, { - "path": "CONTRIBUTING.md" + "path": "license-checks.xml" + }, + { + "path": "synth.py" }, { "path": "codecov.yaml" }, { - "path": "renovate.json" + "path": "LICENSE" }, { - "path": ".repo-metadata.json" + "path": ".gitignore" }, { "path": "pom.xml" }, { - "path": ".gitignore" + "path": "CODE_OF_CONDUCT.md" }, { - "path": "synth.py" + "path": "synth.metadata" }, { - "path": "license-checks.xml" + "path": "README.md" }, { - "path": "README.md" + "path": "CONTRIBUTING.md" }, { "path": "java.header" }, { - "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" + "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" }, { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" + "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" }, { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" + "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" }, { - "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" + "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" }, { - "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" + "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" }, { - "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" + "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" }, { - "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" + "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" }, { - "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" + "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" }, { - "path": ".github/release-please.yml" + "path": ".kokoro/build.bat" }, { - "path": ".github/PULL_REQUEST_TEMPLATE.md" + "path": ".kokoro/build.sh" }, { - "path": ".github/ISSUE_TEMPLATE/support_request.md" + "path": ".kokoro/dependencies.sh" }, { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" + "path": ".kokoro/common.cfg" }, { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" + "path": ".kokoro/trampoline.sh" }, { - "path": ".git/shallow" + "path": ".kokoro/coerce_logs.sh" }, { - "path": ".git/index" + "path": ".kokoro/linkage-monitor.sh" }, { - "path": ".git/HEAD" + "path": ".kokoro/continuous/dependencies.cfg" }, { - "path": ".git/config" + "path": ".kokoro/continuous/samples.cfg" }, { - "path": ".git/packed-refs" + "path": ".kokoro/continuous/java7.cfg" }, { - "path": ".git/logs/HEAD" + "path": ".kokoro/continuous/java8-osx.cfg" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": ".kokoro/continuous/java8-win.cfg" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": ".kokoro/continuous/propose_release.sh" }, { - "path": ".git/logs/refs/heads/master" + "path": ".kokoro/continuous/lint.cfg" }, { - "path": ".git/objects/f9/82b3f0690a4f9bba58e7dc4b23c075a5f6126c" + "path": ".kokoro/continuous/java11.cfg" }, { - "path": ".git/objects/b9/0ec1fc6b2a5c60296609fd875381cff9faf187" + "path": ".kokoro/continuous/common.cfg" }, { - "path": ".git/objects/d7/bdcd01f1483c064854fd3592be29d8861b83c7" + "path": ".kokoro/continuous/propose_release.cfg" }, { - "path": ".git/objects/0c/272d77533a7c58c87006b3875175d9a0b06871" + "path": ".kokoro/continuous/java8.cfg" }, { - "path": ".git/objects/4b/645e3775347c4a4bed68d640d99625269967d4" + "path": ".kokoro/continuous/integration.cfg" }, { - "path": ".git/objects/e2/52687630b9d56048bafbb869e5e87050b5d63c" + "path": ".kokoro/release/drop.sh" }, { - "path": ".git/objects/3f/422c252acaa6848fa18e32c6b59279557a63de" + "path": ".kokoro/release/stage.cfg" }, { - "path": ".git/objects/d9/da84471af0b4bfb01b735cdd32a09aba47e1d3" + "path": ".kokoro/release/promote.cfg" }, { - "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" + "path": ".kokoro/release/publish_javadoc.cfg" }, { - "path": ".git/objects/8a/3f26a32a3c4a24dc8da6f2bf404f8c6a7bccaa" + "path": ".kokoro/release/bump_snapshot.cfg" }, { - "path": ".git/objects/5d/8005deb10566e786835cab634f9804c8ef2dc6" + "path": ".kokoro/release/promote.sh" }, { - "path": ".git/objects/37/2054a1700974802e947bf8f7fe493281707ad5" + "path": ".kokoro/release/stage.sh" }, { - "path": ".git/objects/a3/6e1351767b441c9599d7fca4501f9c5c55d73e" + "path": ".kokoro/release/snapshot.sh" }, { - "path": ".git/objects/3b/e109b188cab6492f0d1ff12bf3025b946b90db" + "path": ".kokoro/release/snapshot.cfg" }, { - "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + "path": ".kokoro/release/common.cfg" }, { - "path": ".git/objects/4c/a97d1df449b3e129acb03bfefbd377444741bd" + "path": ".kokoro/release/bump_snapshot.sh" }, { - "path": ".git/objects/4c/218c698e8e38ad801a0271c01e87134c3d8c4f" + "path": ".kokoro/release/common.sh" }, { - "path": ".git/objects/4e/3e20cc835b2e3ac474f3862a2abde033b9c345" + "path": ".kokoro/release/drop.cfg" }, { - "path": ".git/objects/5a/40846e9a158a2f61da038f5dc0a80235951f7f" + "path": ".kokoro/release/publish_javadoc.sh" }, { - "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" + "path": ".kokoro/presubmit/dependencies.cfg" }, { - "path": ".git/objects/26/210fe6b265b03bb98c7289c0e01be36474540f" + "path": ".kokoro/presubmit/samples.cfg" }, { - "path": ".git/objects/25/51331836988832f7cf2b6e805f9bd92e7237b2" + "path": ".kokoro/presubmit/java7.cfg" }, { - "path": ".git/objects/fe/5969d61f4e387dcf4289dc30901ac5e7ced62d" + "path": ".kokoro/presubmit/java8-osx.cfg" }, { - "path": ".git/objects/fe/ffdbd0ef7720a7eb3c9d3254dd09d7fcdc3c06" + "path": ".kokoro/presubmit/linkage-monitor.cfg" }, { - "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" + "path": ".kokoro/presubmit/java8-win.cfg" }, { - "path": ".git/objects/eb/a7f7ce6bf3519dfe70756688f86182da71f496" + "path": ".kokoro/presubmit/lint.cfg" }, { - "path": ".git/objects/3a/21b50fad302cec01c7d2c85063d9e4151e2db8" + "path": ".kokoro/presubmit/java11.cfg" }, { - "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + "path": ".kokoro/presubmit/common.cfg" }, { - "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" + "path": ".kokoro/presubmit/clirr.cfg" }, { - "path": ".git/objects/c4/84fc4d29b76b33e0fb58a21f03ba018b3316c2" + "path": ".kokoro/presubmit/java8.cfg" }, { - "path": ".git/objects/48/444eb4e525731076cfb804bc6b04f8559f52db" + "path": ".kokoro/presubmit/integration.cfg" }, { - "path": ".git/objects/06/a1d0cfe214ac41604a1313a2714751a14f8250" + "path": ".kokoro/nightly/dependencies.cfg" }, { - "path": ".git/objects/4d/e0f275702016c4446ceb0f2a1ab6fee0db4023" + "path": ".kokoro/nightly/samples.cfg" }, { - "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" + "path": ".kokoro/nightly/java7.cfg" }, { - "path": ".git/objects/ba/c0b01753192b04618d5d49525afc125b2327e5" + "path": ".kokoro/nightly/java8-osx.cfg" }, { - "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + "path": ".kokoro/nightly/java8-win.cfg" }, { - "path": ".git/objects/a0/fcbb3b1f6e7c3d18a8004f6164f922bd91167c" + "path": ".kokoro/nightly/lint.cfg" }, { - "path": ".git/objects/20/1039015dcc687b2d2595060b8add46c93702db" + "path": ".kokoro/nightly/java11.cfg" }, { - "path": ".git/objects/20/5afdcd11814be7a58e1eb7977673ae5c2930e2" + "path": ".kokoro/nightly/common.cfg" }, { - "path": ".git/objects/91/a881c1f1f865c8d3cd3cbd20bbaa3d46620e31" + "path": ".kokoro/nightly/java8.cfg" }, { - "path": ".git/objects/e9/f30315ee917b2da35b51ca06e26b095f7ea4b8" + "path": ".kokoro/nightly/integration.cfg" }, { - "path": ".git/objects/df/404f8bab2e8bc719bb8d40e9268494f3fab40d" + "path": ".github/release-please.yml" }, { - "path": ".git/objects/df/ab30fb78d1e6bed3f518bcfa86ceaebfca6ada" + "path": ".github/PULL_REQUEST_TEMPLATE.md" }, { - "path": ".git/objects/35/774238f99272b49d54b6e663fb170d6f5fbfc9" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { - "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": ".git/objects/2b/d1e3e1b8fab1a0b41dfd17670888fd37a6233b" + "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": ".git/objects/2b/a5e887f6c530d2acc787cf65d0eb217a814955" + "path": "__pycache__/synth.cpython-36.pyc" }, { - "path": ".git/objects/16/f7b7dcb7fe6afca54f670a0d3381501f7f299c" + "path": ".git/index" }, { - "path": ".git/objects/41/ff0fe195d023fcec65dbf736ea4946a69e9ce3" + "path": ".git/packed-refs" }, { - "path": ".git/objects/fa/26b858fb45362de670bd603d8fdcf212abe3d1" + "path": ".git/HEAD" }, { - "path": ".git/objects/fa/132f410dcc443acaca1e838b1c6e3e895b3545" + "path": ".git/config" }, { - "path": ".git/objects/a2/2a7ee1c4cfb5cc7605d1ecf71f157267ccdc47" + "path": ".git/shallow" }, { - "path": ".git/objects/85/ca38907d5acf8a777117d013bf2384478c23d1" + "path": ".git/objects/5a/40846e9a158a2f61da038f5dc0a80235951f7f" + }, + { + "path": ".git/objects/7f/18e7e4abf229e81b9266c3c880df4e7c46cbdd" }, { "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" }, { - "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" + "path": ".git/objects/c4/84fc4d29b76b33e0fb58a21f03ba018b3316c2" }, { - "path": ".git/objects/13/7fd963db405ab376cfde502e1ec206ba5caf1a" + "path": ".git/objects/85/ca38907d5acf8a777117d013bf2384478c23d1" }, { - "path": ".git/objects/9f/0dd76d1eabeea7c1957f55106deb736314e6e1" + "path": ".git/objects/62/4ce5db167b2ce961a553b9746962040ddd5bd7" }, { - "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" + "path": ".git/objects/4d/e0f275702016c4446ceb0f2a1ab6fee0db4023" }, { - "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + "path": ".git/objects/0c/272d77533a7c58c87006b3875175d9a0b06871" }, { - "path": ".git/objects/60/0ba5d09d8196acc8f8ebfa9d3f057e71606728" + "path": ".git/objects/8a/3f26a32a3c4a24dc8da6f2bf404f8c6a7bccaa" }, { - "path": ".git/objects/79/8fd6357287ff161ffafcca7063e457c910c32f" + "path": ".git/objects/2b/a5e887f6c530d2acc787cf65d0eb217a814955" }, { - "path": ".git/objects/62/4ce5db167b2ce961a553b9746962040ddd5bd7" + "path": ".git/objects/2b/d1e3e1b8fab1a0b41dfd17670888fd37a6233b" }, { - "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" + "path": ".git/objects/6f/459cf05842f33cf37a32ae59927abe5dc92bf5" }, { - "path": ".git/objects/67/3157413af09b22187e1a1ac89df8ea5612402c" + "path": ".git/objects/fa/26b858fb45362de670bd603d8fdcf212abe3d1" }, { - "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + "path": ".git/objects/20/1039015dcc687b2d2595060b8add46c93702db" }, { - "path": ".git/objects/33/ad8901962f8d2149b86ca0a60e8a1f309d97a4" + "path": ".git/objects/20/5afdcd11814be7a58e1eb7977673ae5c2930e2" }, { - "path": ".git/objects/28/cf064a9e5dd3823cb92cd71955b5ab6cba5ca8" + "path": ".git/objects/ae/52a286a4f016c950805bd26181a27ed9e15776" }, { - "path": ".git/objects/dc/2d514ce20dec305fca6f466f6713298a6c55f8" + "path": ".git/objects/37/2054a1700974802e947bf8f7fe493281707ad5" }, { - "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + "path": ".git/objects/06/a1d0cfe214ac41604a1313a2714751a14f8250" }, { - "path": ".git/objects/54/77c432226e4e66e28117e4109942b6657388c3" + "path": ".git/objects/26/210fe6b265b03bb98c7289c0e01be36474540f" }, { - "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + "path": ".git/objects/76/e82ac94bc06712bcc5ba612c672887e96801aa" }, { - "path": ".git/objects/da/a76fd98da6d911ff077d207e21cad37eee3b3a" + "path": ".git/objects/4b/645e3775347c4a4bed68d640d99625269967d4" }, { - "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" + "path": ".git/objects/a2/2a7ee1c4cfb5cc7605d1ecf71f157267ccdc47" }, { - "path": ".git/objects/7f/18e7e4abf229e81b9266c3c880df4e7c46cbdd" + "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" }, { - "path": ".git/objects/36/024400e50542ba3403d4f442bd8c9840ea4437" + "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" }, { - "path": ".git/objects/bd/24cbdd03a34eecdf6e620649aaa3b624adedf8" + "path": ".git/objects/3d/19017d68ed86d13980dba97da79e3cd6e15e71" }, { "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" }, { - "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" }, { - "path": ".git/objects/e8/907b29eafa39d2ebd141b157a51bd6edae7b77" + "path": ".git/objects/79/8fd6357287ff161ffafcca7063e457c910c32f" }, { - "path": ".git/objects/6f/459cf05842f33cf37a32ae59927abe5dc92bf5" + "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" }, { - "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" + "path": ".git/objects/ba/c0b01753192b04618d5d49525afc125b2327e5" }, { - "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" }, { - "path": ".git/objects/ae/52a286a4f016c950805bd26181a27ed9e15776" + "path": ".git/objects/3f/422c252acaa6848fa18e32c6b59279557a63de" }, { - "path": ".git/objects/39/ed3cf7e8de33d5c8d9662f3efcb5bbacf1dfaa" + "path": ".git/objects/16/f7b7dcb7fe6afca54f670a0d3381501f7f299c" }, { - "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" + "path": ".git/objects/a6/100ccf5a9cc2f3b3a45d33f04d3a965152e5f5" }, { - "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" + "path": ".git/objects/91/a881c1f1f865c8d3cd3cbd20bbaa3d46620e31" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" }, { - "path": ".git/refs/heads/autosynth" + "path": ".git/objects/3c/e47ae00995d5e38a0ef8595c4da2e1b56e4d28" }, { - "path": ".git/refs/heads/master" + "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" }, { - "path": ".kokoro/coerce_logs.sh" + "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" }, { - "path": ".kokoro/common.cfg" + "path": ".git/objects/b9/0ec1fc6b2a5c60296609fd875381cff9faf187" }, { - "path": ".kokoro/build.sh" + "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" }, { - "path": ".kokoro/linkage-monitor.sh" + "path": ".git/objects/df/404f8bab2e8bc719bb8d40e9268494f3fab40d" }, { - "path": ".kokoro/build.bat" + "path": ".git/objects/df/ab30fb78d1e6bed3f518bcfa86ceaebfca6ada" }, { - "path": ".kokoro/dependencies.sh" + "path": ".git/objects/b6/9eb7b36915784a989a3bf5451ca37e82343559" }, { - "path": ".kokoro/trampoline.sh" + "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" }, { - "path": ".kokoro/nightly/java7.cfg" + "path": ".git/objects/4c/218c698e8e38ad801a0271c01e87134c3d8c4f" }, { - "path": ".kokoro/nightly/common.cfg" + "path": ".git/objects/4c/a97d1df449b3e129acb03bfefbd377444741bd" }, { - "path": ".kokoro/nightly/java8.cfg" + "path": ".git/objects/e8/33cf4918918d24fa20777355be64bf99553705" }, { - "path": ".kokoro/nightly/java11.cfg" + "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" }, { - "path": ".kokoro/nightly/java8-osx.cfg" + "path": ".git/objects/4e/3e20cc835b2e3ac474f3862a2abde033b9c345" }, { - "path": ".kokoro/nightly/lint.cfg" + "path": ".git/objects/28/cf064a9e5dd3823cb92cd71955b5ab6cba5ca8" }, { - "path": ".kokoro/nightly/integration.cfg" + "path": ".git/objects/db/776b50e0609f6e0fecf913dbfd6dfca086bd81" }, { - "path": ".kokoro/nightly/dependencies.cfg" + "path": ".git/objects/e2/52687630b9d56048bafbb869e5e87050b5d63c" }, { - "path": ".kokoro/nightly/java8-win.cfg" + "path": ".git/objects/64/9839ef8947939ff0d93724bde76934b1fc488f" }, { - "path": ".kokoro/release/common.cfg" + "path": ".git/objects/3b/e109b188cab6492f0d1ff12bf3025b946b90db" }, { - "path": ".kokoro/release/bump_snapshot.sh" + "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" }, { - "path": ".kokoro/release/stage.cfg" + "path": ".git/objects/f9/82b3f0690a4f9bba58e7dc4b23c075a5f6126c" }, { - "path": ".kokoro/release/promote.sh" + "path": ".git/objects/35/774238f99272b49d54b6e663fb170d6f5fbfc9" }, { - "path": ".kokoro/release/drop.cfg" + "path": ".git/objects/54/77c432226e4e66e28117e4109942b6657388c3" }, { - "path": ".kokoro/release/drop.sh" + "path": ".git/objects/8d/b47ef9b43e947185c3be43c0fc76c036d5dc4f" }, { - "path": ".kokoro/release/bump_snapshot.cfg" + "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" }, { - "path": ".kokoro/release/publish_javadoc.cfg" + "path": ".git/objects/a3/6e1351767b441c9599d7fca4501f9c5c55d73e" }, { - "path": ".kokoro/release/snapshot.sh" + "path": ".git/objects/a3/d2edc5c02283ceaf2cbbbdb55e022a41f80d91" }, { - "path": ".kokoro/release/promote.cfg" + "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" }, { - "path": ".kokoro/release/stage.sh" + "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" }, { - "path": ".kokoro/release/common.sh" + "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" }, { - "path": ".kokoro/release/publish_javadoc.sh" + "path": ".git/objects/e9/f30315ee917b2da35b51ca06e26b095f7ea4b8" }, { - "path": ".kokoro/release/snapshot.cfg" + "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" }, { - "path": ".kokoro/presubmit/java7.cfg" + "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" }, { - "path": ".kokoro/presubmit/common.cfg" + "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" }, { - "path": ".kokoro/presubmit/linkage-monitor.cfg" + "path": ".git/objects/60/0ba5d09d8196acc8f8ebfa9d3f057e71606728" }, { - "path": ".kokoro/presubmit/java8.cfg" + "path": ".git/objects/25/51331836988832f7cf2b6e805f9bd92e7237b2" }, { - "path": ".kokoro/presubmit/clirr.cfg" + "path": ".git/objects/67/3157413af09b22187e1a1ac89df8ea5612402c" }, { - "path": ".kokoro/presubmit/java11.cfg" + "path": ".git/objects/d9/da84471af0b4bfb01b735cdd32a09aba47e1d3" }, { - "path": ".kokoro/presubmit/java8-osx.cfg" + "path": ".git/objects/bd/24cbdd03a34eecdf6e620649aaa3b624adedf8" }, { - "path": ".kokoro/presubmit/lint.cfg" + "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" }, { - "path": ".kokoro/presubmit/integration.cfg" + "path": ".git/objects/9f/0dd76d1eabeea7c1957f55106deb736314e6e1" }, { - "path": ".kokoro/presubmit/dependencies.cfg" + "path": ".git/objects/5d/8005deb10566e786835cab634f9804c8ef2dc6" }, { - "path": ".kokoro/presubmit/java8-win.cfg" + "path": ".git/objects/dc/2d514ce20dec305fca6f466f6713298a6c55f8" }, { - "path": ".kokoro/continuous/java7.cfg" + "path": ".git/objects/dc/e2c8450921a822a44e69d9cd82992b1f91fc65" }, { - "path": ".kokoro/continuous/common.cfg" + "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" }, { - "path": ".kokoro/continuous/java8.cfg" + "path": ".git/objects/d7/bdcd01f1483c064854fd3592be29d8861b83c7" }, { - "path": ".kokoro/continuous/java11.cfg" + "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" }, { - "path": ".kokoro/continuous/java8-osx.cfg" + "path": ".git/objects/a0/fcbb3b1f6e7c3d18a8004f6164f922bd91167c" }, { - "path": ".kokoro/continuous/lint.cfg" + "path": ".git/objects/27/06a15aa948c1a162bd2bb97d809f8ce6cdf3fa" }, { - "path": ".kokoro/continuous/integration.cfg" + "path": ".git/objects/33/ad8901962f8d2149b86ca0a60e8a1f309d97a4" }, { - "path": ".kokoro/continuous/propose_release.cfg" + "path": ".git/objects/fe/5969d61f4e387dcf4289dc30901ac5e7ced62d" }, { - "path": ".kokoro/continuous/dependencies.cfg" + "path": ".git/refs/remotes/origin/HEAD" }, { - "path": ".kokoro/continuous/java8-win.cfg" + "path": ".git/refs/heads/autosynth" }, { - "path": ".kokoro/continuous/propose_release.sh" + "path": ".git/refs/heads/master" }, { - "path": "__pycache__/synth.cpython-36.pyc" + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" } ] } \ No newline at end of file From 5c10b7afbcdf117c3df666c998daaedfd4a87b67 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Jan 2020 11:38:29 -0800 Subject: [PATCH 11/45] chore: allow unstable renovate updates --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renovate.json b/renovate.json index d014232c5..f3a70c970 100644 --- a/renovate.json +++ b/renovate.json @@ -52,6 +52,12 @@ ], "semanticCommitType": "build", "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-" + ], + "ignoreUnstable": false } ], "semanticCommits": true From 0e1926753ace8e4204f16d6c84d34c2084e838e2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 01:16:36 +0100 Subject: [PATCH 12/45] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ce47ae00..785d169b9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-shared-config - 0.3.1 + 0.4.0 From 3873af2cbb71901e337ebd816cbc7ac53d817c3f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 17 Jan 2020 10:11:46 -0800 Subject: [PATCH 13/45] chore(regen): update common renovate configuration --- renovate.json | 6 + synth.metadata | 446 ++++++++----------------------------------------- 2 files changed, 79 insertions(+), 373 deletions(-) diff --git a/renovate.json b/renovate.json index f3a70c970..a5cdff45c 100644 --- a/renovate.json +++ b/renovate.json @@ -58,6 +58,12 @@ "^com.google.cloud:google-cloud-" ], "ignoreUnstable": false + }, + { + "packagePatterns": [ + "^com.fasterxml.jackson.core" + ], + "groupName": "jackson dependencies" } ], "semanticCommits": true diff --git a/synth.metadata b/synth.metadata index 33b88b6d1..f7811aa60 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-07T09:14:25.880791Z", + "updateTime": "2020-01-16T09:11:10.003957Z", "sources": [ { "template": { @@ -11,118 +11,82 @@ ], "newFiles": [ { - "path": ".repo-metadata.json" + "path": "pom.xml" }, { - "path": "renovate.json" + "path": ".repo-metadata.json" }, { - "path": "license-checks.xml" + "path": "java.header" }, { - "path": "synth.py" + "path": "CONTRIBUTING.md" }, { - "path": "codecov.yaml" + "path": "synth.metadata" }, { - "path": "LICENSE" + "path": "renovate.json" }, { - "path": ".gitignore" + "path": "synth.py" }, { - "path": "pom.xml" + "path": "license-checks.xml" }, { "path": "CODE_OF_CONDUCT.md" }, { - "path": "synth.metadata" - }, - { - "path": "README.md" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": "java.header" - }, - { - "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" + "path": "LICENSE" }, { - "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" + "path": "codecov.yaml" }, { - "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" + "path": ".gitignore" }, { - "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" + "path": "README.md" }, { - "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" + "path": ".github/release-please.yml" }, { - "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" + "path": ".github/PULL_REQUEST_TEMPLATE.md" }, { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" + "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": ".kokoro/build.bat" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { "path": ".kokoro/build.sh" }, - { - "path": ".kokoro/dependencies.sh" - }, { "path": ".kokoro/common.cfg" }, { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/coerce_logs.sh" + "path": ".kokoro/build.bat" }, { "path": ".kokoro/linkage-monitor.sh" }, { - "path": ".kokoro/continuous/dependencies.cfg" - }, - { - "path": ".kokoro/continuous/samples.cfg" - }, - { - "path": ".kokoro/continuous/java7.cfg" - }, - { - "path": ".kokoro/continuous/java8-osx.cfg" - }, - { - "path": ".kokoro/continuous/java8-win.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.sh" - }, - { - "path": ".kokoro/continuous/lint.cfg" + "path": ".kokoro/coerce_logs.sh" }, { - "path": ".kokoro/continuous/java11.cfg" + "path": ".kokoro/dependencies.sh" }, { - "path": ".kokoro/continuous/common.cfg" + "path": ".kokoro/trampoline.sh" }, { - "path": ".kokoro/continuous/propose_release.cfg" + "path": ".kokoro/continuous/samples.cfg" }, { "path": ".kokoro/continuous/java8.cfg" @@ -131,107 +95,35 @@ "path": ".kokoro/continuous/integration.cfg" }, { - "path": ".kokoro/release/drop.sh" - }, - { - "path": ".kokoro/release/stage.cfg" - }, - { - "path": ".kokoro/release/promote.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.cfg" - }, - { - "path": ".kokoro/release/promote.sh" - }, - { - "path": ".kokoro/release/stage.sh" - }, - { - "path": ".kokoro/release/snapshot.sh" - }, - { - "path": ".kokoro/release/snapshot.cfg" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.sh" - }, - { - "path": ".kokoro/release/common.sh" - }, - { - "path": ".kokoro/release/drop.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.sh" - }, - { - "path": ".kokoro/presubmit/dependencies.cfg" - }, - { - "path": ".kokoro/presubmit/samples.cfg" - }, - { - "path": ".kokoro/presubmit/java7.cfg" - }, - { - "path": ".kokoro/presubmit/java8-osx.cfg" - }, - { - "path": ".kokoro/presubmit/linkage-monitor.cfg" + "path": ".kokoro/continuous/java11.cfg" }, { - "path": ".kokoro/presubmit/java8-win.cfg" + "path": ".kokoro/continuous/propose_release.cfg" }, { - "path": ".kokoro/presubmit/lint.cfg" + "path": ".kokoro/continuous/common.cfg" }, { - "path": ".kokoro/presubmit/java11.cfg" + "path": ".kokoro/continuous/propose_release.sh" }, { - "path": ".kokoro/presubmit/common.cfg" + "path": ".kokoro/continuous/java7.cfg" }, { - "path": ".kokoro/presubmit/clirr.cfg" + "path": ".kokoro/continuous/lint.cfg" }, { - "path": ".kokoro/presubmit/java8.cfg" + "path": ".kokoro/continuous/java8-osx.cfg" }, { - "path": ".kokoro/presubmit/integration.cfg" + "path": ".kokoro/continuous/dependencies.cfg" }, { - "path": ".kokoro/nightly/dependencies.cfg" + "path": ".kokoro/continuous/java8-win.cfg" }, { "path": ".kokoro/nightly/samples.cfg" }, - { - "path": ".kokoro/nightly/java7.cfg" - }, - { - "path": ".kokoro/nightly/java8-osx.cfg" - }, - { - "path": ".kokoro/nightly/java8-win.cfg" - }, - { - "path": ".kokoro/nightly/lint.cfg" - }, - { - "path": ".kokoro/nightly/java11.cfg" - }, - { - "path": ".kokoro/nightly/common.cfg" - }, { "path": ".kokoro/nightly/java8.cfg" }, @@ -239,319 +131,127 @@ "path": ".kokoro/nightly/integration.cfg" }, { - "path": ".github/release-please.yml" - }, - { - "path": ".github/PULL_REQUEST_TEMPLATE.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" - }, - { - "path": "__pycache__/synth.cpython-36.pyc" - }, - { - "path": ".git/index" - }, - { - "path": ".git/packed-refs" - }, - { - "path": ".git/HEAD" - }, - { - "path": ".git/config" - }, - { - "path": ".git/shallow" - }, - { - "path": ".git/objects/5a/40846e9a158a2f61da038f5dc0a80235951f7f" - }, - { - "path": ".git/objects/7f/18e7e4abf229e81b9266c3c880df4e7c46cbdd" - }, - { - "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" - }, - { - "path": ".git/objects/c4/84fc4d29b76b33e0fb58a21f03ba018b3316c2" - }, - { - "path": ".git/objects/85/ca38907d5acf8a777117d013bf2384478c23d1" - }, - { - "path": ".git/objects/62/4ce5db167b2ce961a553b9746962040ddd5bd7" - }, - { - "path": ".git/objects/4d/e0f275702016c4446ceb0f2a1ab6fee0db4023" - }, - { - "path": ".git/objects/0c/272d77533a7c58c87006b3875175d9a0b06871" - }, - { - "path": ".git/objects/8a/3f26a32a3c4a24dc8da6f2bf404f8c6a7bccaa" - }, - { - "path": ".git/objects/2b/a5e887f6c530d2acc787cf65d0eb217a814955" - }, - { - "path": ".git/objects/2b/d1e3e1b8fab1a0b41dfd17670888fd37a6233b" - }, - { - "path": ".git/objects/6f/459cf05842f33cf37a32ae59927abe5dc92bf5" - }, - { - "path": ".git/objects/fa/26b858fb45362de670bd603d8fdcf212abe3d1" - }, - { - "path": ".git/objects/20/1039015dcc687b2d2595060b8add46c93702db" - }, - { - "path": ".git/objects/20/5afdcd11814be7a58e1eb7977673ae5c2930e2" - }, - { - "path": ".git/objects/ae/52a286a4f016c950805bd26181a27ed9e15776" - }, - { - "path": ".git/objects/37/2054a1700974802e947bf8f7fe493281707ad5" - }, - { - "path": ".git/objects/06/a1d0cfe214ac41604a1313a2714751a14f8250" - }, - { - "path": ".git/objects/26/210fe6b265b03bb98c7289c0e01be36474540f" - }, - { - "path": ".git/objects/76/e82ac94bc06712bcc5ba612c672887e96801aa" - }, - { - "path": ".git/objects/4b/645e3775347c4a4bed68d640d99625269967d4" - }, - { - "path": ".git/objects/a2/2a7ee1c4cfb5cc7605d1ecf71f157267ccdc47" - }, - { - "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" - }, - { - "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" - }, - { - "path": ".git/objects/3d/19017d68ed86d13980dba97da79e3cd6e15e71" - }, - { - "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" - }, - { - "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" - }, - { - "path": ".git/objects/79/8fd6357287ff161ffafcca7063e457c910c32f" - }, - { - "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" - }, - { - "path": ".git/objects/ba/c0b01753192b04618d5d49525afc125b2327e5" - }, - { - "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" - }, - { - "path": ".git/objects/3f/422c252acaa6848fa18e32c6b59279557a63de" - }, - { - "path": ".git/objects/16/f7b7dcb7fe6afca54f670a0d3381501f7f299c" - }, - { - "path": ".git/objects/a6/100ccf5a9cc2f3b3a45d33f04d3a965152e5f5" - }, - { - "path": ".git/objects/91/a881c1f1f865c8d3cd3cbd20bbaa3d46620e31" - }, - { - "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" - }, - { - "path": ".git/objects/3c/e47ae00995d5e38a0ef8595c4da2e1b56e4d28" - }, - { - "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" - }, - { - "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" - }, - { - "path": ".git/objects/b9/0ec1fc6b2a5c60296609fd875381cff9faf187" - }, - { - "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" - }, - { - "path": ".git/objects/df/404f8bab2e8bc719bb8d40e9268494f3fab40d" - }, - { - "path": ".git/objects/df/ab30fb78d1e6bed3f518bcfa86ceaebfca6ada" - }, - { - "path": ".git/objects/b6/9eb7b36915784a989a3bf5451ca37e82343559" - }, - { - "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" - }, - { - "path": ".git/objects/4c/218c698e8e38ad801a0271c01e87134c3d8c4f" - }, - { - "path": ".git/objects/4c/a97d1df449b3e129acb03bfefbd377444741bd" - }, - { - "path": ".git/objects/e8/33cf4918918d24fa20777355be64bf99553705" - }, - { - "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" - }, - { - "path": ".git/objects/4e/3e20cc835b2e3ac474f3862a2abde033b9c345" - }, - { - "path": ".git/objects/28/cf064a9e5dd3823cb92cd71955b5ab6cba5ca8" - }, - { - "path": ".git/objects/db/776b50e0609f6e0fecf913dbfd6dfca086bd81" - }, - { - "path": ".git/objects/e2/52687630b9d56048bafbb869e5e87050b5d63c" - }, - { - "path": ".git/objects/64/9839ef8947939ff0d93724bde76934b1fc488f" + "path": ".kokoro/nightly/java11.cfg" }, { - "path": ".git/objects/3b/e109b188cab6492f0d1ff12bf3025b946b90db" + "path": ".kokoro/nightly/common.cfg" }, { - "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + "path": ".kokoro/nightly/java7.cfg" }, { - "path": ".git/objects/f9/82b3f0690a4f9bba58e7dc4b23c075a5f6126c" + "path": ".kokoro/nightly/lint.cfg" }, { - "path": ".git/objects/35/774238f99272b49d54b6e663fb170d6f5fbfc9" + "path": ".kokoro/nightly/java8-osx.cfg" }, { - "path": ".git/objects/54/77c432226e4e66e28117e4109942b6657388c3" + "path": ".kokoro/nightly/dependencies.cfg" }, { - "path": ".git/objects/8d/b47ef9b43e947185c3be43c0fc76c036d5dc4f" + "path": ".kokoro/nightly/java8-win.cfg" }, { - "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + "path": ".kokoro/release/publish_javadoc.cfg" }, { - "path": ".git/objects/a3/6e1351767b441c9599d7fca4501f9c5c55d73e" + "path": ".kokoro/release/common.sh" }, { - "path": ".git/objects/a3/d2edc5c02283ceaf2cbbbdb55e022a41f80d91" + "path": ".kokoro/release/promote.sh" }, { - "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + "path": ".kokoro/release/common.cfg" }, { - "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + "path": ".kokoro/release/publish_javadoc.sh" }, { - "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" + "path": ".kokoro/release/drop.sh" }, { - "path": ".git/objects/e9/f30315ee917b2da35b51ca06e26b095f7ea4b8" + "path": ".kokoro/release/stage.sh" }, { - "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + "path": ".kokoro/release/promote.cfg" }, { - "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + "path": ".kokoro/release/snapshot.cfg" }, { - "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + "path": ".kokoro/release/bump_snapshot.cfg" }, { - "path": ".git/objects/60/0ba5d09d8196acc8f8ebfa9d3f057e71606728" + "path": ".kokoro/release/drop.cfg" }, { - "path": ".git/objects/25/51331836988832f7cf2b6e805f9bd92e7237b2" + "path": ".kokoro/release/bump_snapshot.sh" }, { - "path": ".git/objects/67/3157413af09b22187e1a1ac89df8ea5612402c" + "path": ".kokoro/release/stage.cfg" }, { - "path": ".git/objects/d9/da84471af0b4bfb01b735cdd32a09aba47e1d3" + "path": ".kokoro/release/snapshot.sh" }, { - "path": ".git/objects/bd/24cbdd03a34eecdf6e620649aaa3b624adedf8" + "path": ".kokoro/presubmit/samples.cfg" }, { - "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + "path": ".kokoro/presubmit/java8.cfg" }, { - "path": ".git/objects/9f/0dd76d1eabeea7c1957f55106deb736314e6e1" + "path": ".kokoro/presubmit/integration.cfg" }, { - "path": ".git/objects/5d/8005deb10566e786835cab634f9804c8ef2dc6" + "path": ".kokoro/presubmit/java11.cfg" }, { - "path": ".git/objects/dc/2d514ce20dec305fca6f466f6713298a6c55f8" + "path": ".kokoro/presubmit/linkage-monitor.cfg" }, { - "path": ".git/objects/dc/e2c8450921a822a44e69d9cd82992b1f91fc65" + "path": ".kokoro/presubmit/common.cfg" }, { - "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" + "path": ".kokoro/presubmit/java7.cfg" }, { - "path": ".git/objects/d7/bdcd01f1483c064854fd3592be29d8861b83c7" + "path": ".kokoro/presubmit/lint.cfg" }, { - "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + "path": ".kokoro/presubmit/java8-osx.cfg" }, { - "path": ".git/objects/a0/fcbb3b1f6e7c3d18a8004f6164f922bd91167c" + "path": ".kokoro/presubmit/dependencies.cfg" }, { - "path": ".git/objects/27/06a15aa948c1a162bd2bb97d809f8ce6cdf3fa" + "path": ".kokoro/presubmit/clirr.cfg" }, { - "path": ".git/objects/33/ad8901962f8d2149b86ca0a60e8a1f309d97a4" + "path": ".kokoro/presubmit/java8-win.cfg" }, { - "path": ".git/objects/fe/5969d61f4e387dcf4289dc30901ac5e7ced62d" + "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" }, { - "path": ".git/refs/heads/autosynth" + "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" }, { - "path": ".git/refs/heads/master" + "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" }, { - "path": ".git/logs/HEAD" + "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" }, { - "path": ".git/logs/refs/heads/master" + "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" } ] } \ No newline at end of file From 58f36dec1a48f5d2a68b1327251350265941b438 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 30 Jan 2020 22:22:43 +0100 Subject: [PATCH 14/45] deps: update core dependencies (#18) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 785d169b9..2ba5fe3a1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.98.0 28.1-android 1.7.30 - 0.19.0 + 0.20.0 4.13 1.8.1 @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.92.0 + 1.92.3 com.google.auth From 2b7877dc4978043609a47fe0f7dfa8914c9e2622 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 30 Jan 2020 22:22:49 +0100 Subject: [PATCH 15/45] deps: update dependency com.google.guava:guava-bom to v28.2-android (#15) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ba5fe3a1..f5bb2ec14 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.0 2.8.6 1.98.0 - 28.1-android + 28.2-android 1.7.30 0.20.0 4.13 From f11c0623f316347f13ffbffd8e8607f7bfccd5cb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 30 Jan 2020 23:32:15 +0100 Subject: [PATCH 16/45] test(deps): update dependency com.google.truth:truth to v1.0.1 (#28) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5bb2ec14..3a92a85c1 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.2.3 3.6 - 1.0 + 1.0.1 2.8.6 1.98.0 28.2-android From 5c5e703535ffcc549335b0326ef455434041da5b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 31 Jan 2020 09:17:43 -0800 Subject: [PATCH 17/45] chore: group guava with other core dependencies --- renovate.json | 3 +- synth.metadata | 247 +------------------------------------------------ 2 files changed, 3 insertions(+), 247 deletions(-) diff --git a/renovate.json b/renovate.json index a5cdff45c..268a4669a 100644 --- a/renovate.json +++ b/renovate.json @@ -22,7 +22,8 @@ "^com.google.api:gax", "^com.google.auth:", "^com.google.cloud:google-cloud-core", - "^io.grpc:" + "^io.grpc:", + "^com.google.guava:" ], "groupName": "core dependencies" }, diff --git a/synth.metadata b/synth.metadata index f7811aa60..b5b4d83c2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-16T09:11:10.003957Z", + "updateTime": "2020-01-31T09:14:08.424434Z", "sources": [ { "template": { @@ -8,250 +8,5 @@ "version": "2019.10.17" } } - ], - "newFiles": [ - { - "path": "pom.xml" - }, - { - "path": ".repo-metadata.json" - }, - { - "path": "java.header" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": "synth.metadata" - }, - { - "path": "renovate.json" - }, - { - "path": "synth.py" - }, - { - "path": "license-checks.xml" - }, - { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "LICENSE" - }, - { - "path": "codecov.yaml" - }, - { - "path": ".gitignore" - }, - { - "path": "README.md" - }, - { - "path": ".github/release-please.yml" - }, - { - "path": ".github/PULL_REQUEST_TEMPLATE.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".kokoro/build.sh" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/build.bat" - }, - { - "path": ".kokoro/linkage-monitor.sh" - }, - { - "path": ".kokoro/coerce_logs.sh" - }, - { - "path": ".kokoro/dependencies.sh" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/continuous/samples.cfg" - }, - { - "path": ".kokoro/continuous/java8.cfg" - }, - { - "path": ".kokoro/continuous/integration.cfg" - }, - { - "path": ".kokoro/continuous/java11.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.cfg" - }, - { - "path": ".kokoro/continuous/common.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.sh" - }, - { - "path": ".kokoro/continuous/java7.cfg" - }, - { - "path": ".kokoro/continuous/lint.cfg" - }, - { - "path": ".kokoro/continuous/java8-osx.cfg" - }, - { - "path": ".kokoro/continuous/dependencies.cfg" - }, - { - "path": ".kokoro/continuous/java8-win.cfg" - }, - { - "path": ".kokoro/nightly/samples.cfg" - }, - { - "path": ".kokoro/nightly/java8.cfg" - }, - { - "path": ".kokoro/nightly/integration.cfg" - }, - { - "path": ".kokoro/nightly/java11.cfg" - }, - { - "path": ".kokoro/nightly/common.cfg" - }, - { - "path": ".kokoro/nightly/java7.cfg" - }, - { - "path": ".kokoro/nightly/lint.cfg" - }, - { - "path": ".kokoro/nightly/java8-osx.cfg" - }, - { - "path": ".kokoro/nightly/dependencies.cfg" - }, - { - "path": ".kokoro/nightly/java8-win.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.cfg" - }, - { - "path": ".kokoro/release/common.sh" - }, - { - "path": ".kokoro/release/promote.sh" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.sh" - }, - { - "path": ".kokoro/release/drop.sh" - }, - { - "path": ".kokoro/release/stage.sh" - }, - { - "path": ".kokoro/release/promote.cfg" - }, - { - "path": ".kokoro/release/snapshot.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.cfg" - }, - { - "path": ".kokoro/release/drop.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.sh" - }, - { - "path": ".kokoro/release/stage.cfg" - }, - { - "path": ".kokoro/release/snapshot.sh" - }, - { - "path": ".kokoro/presubmit/samples.cfg" - }, - { - "path": ".kokoro/presubmit/java8.cfg" - }, - { - "path": ".kokoro/presubmit/integration.cfg" - }, - { - "path": ".kokoro/presubmit/java11.cfg" - }, - { - "path": ".kokoro/presubmit/linkage-monitor.cfg" - }, - { - "path": ".kokoro/presubmit/common.cfg" - }, - { - "path": ".kokoro/presubmit/java7.cfg" - }, - { - "path": ".kokoro/presubmit/lint.cfg" - }, - { - "path": ".kokoro/presubmit/java8-osx.cfg" - }, - { - "path": ".kokoro/presubmit/dependencies.cfg" - }, - { - "path": ".kokoro/presubmit/clirr.cfg" - }, - { - "path": ".kokoro/presubmit/java8-win.cfg" - }, - { - "path": "src/test/java/com/google/cloud/logging/logback/StackTraceTest.java" - }, - { - "path": "src/test/java/com/google/cloud/logging/logback/MDCEventEnhancerTest.java" - }, - { - "path": "src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java" - }, - { - "path": "src/test/java/com/example/enhancers/TestLoggingEnhancer.java" - }, - { - "path": "src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java" - }, - { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java" - }, - { - "path": "src/main/java/com/google/cloud/logging/logback/MDCEventEnhancer.java" - }, - { - "path": "src/main/java/com/google/cloud/logging/logback/LoggingAppender.java" - } ] } \ No newline at end of file From 7b0d336aeebfe35fa7873a1f43108949fa7432e5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 3 Feb 2020 10:13:14 -0800 Subject: [PATCH 18/45] chore: linkage monitor check should skipp clirr and enforcer --- .kokoro/linkage-monitor.sh | 7 ++++++- synth.metadata | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh index 2ba5e887f..24b7bb3eb 100755 --- a/.kokoro/linkage-monitor.sh +++ b/.kokoro/linkage-monitor.sh @@ -23,7 +23,12 @@ cd github/java-logging-logback/ java -version echo ${JOB_TYPE} -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR JAR=linkage-monitor-latest-all-deps.jar diff --git a/synth.metadata b/synth.metadata index b5b4d83c2..7a15ec3d3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-31T09:14:08.424434Z", + "updateTime": "2020-02-01T09:13:37.746201Z", "sources": [ { "template": { From 8b9574de2a70a5672cbfa13c3d13684066f8be05 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Feb 2020 21:36:21 +0100 Subject: [PATCH 19/45] deps: update dependency com.google.cloud:google-cloud-core to v1.92.4 (#32) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a92a85c1..f350d5c79 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.92.3 + 1.92.4 com.google.auth From dd8b48348c5a04f42e963bf1cc5d427aa6e56d3a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 11 Feb 2020 18:07:58 +0100 Subject: [PATCH 20/45] deps: update dependency com.google.cloud:google-cloud-core to v1.92.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f350d5c79..7d628f41c 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.92.4 + 1.92.5 com.google.auth From a30b29f3cd878fb5f6613888b54da3103af4cf47 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 11 Feb 2020 11:50:49 -0800 Subject: [PATCH 21/45] chore: only allow renovate-bot for trusted-contribution auto-labeling --- .github/trusted-contribution.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/trusted-contribution.yml diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml new file mode 100644 index 000000000..f247d5c78 --- /dev/null +++ b/.github/trusted-contribution.yml @@ -0,0 +1,2 @@ +trustedContributors: +- renovate-bot \ No newline at end of file From eb7cd0d4a9ea0e1e1acd1b99fec081213d7f67ee Mon Sep 17 00:00:00 2001 From: David Supplee Date: Wed, 12 Feb 2020 14:29:57 -0800 Subject: [PATCH 22/45] chore: update github url (#37) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d628f41c..f576fe236 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 0.116.0-alpha jar Google Cloud Logging Logback Appender - https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback + https://github.com/googleapis/java-logging-logback Logback support for Google Cloud Logging @@ -226,4 +226,4 @@ - \ No newline at end of file + From 2256b32a7cf8ce878037888d5793215e68c2886a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 21 Feb 2020 15:41:05 -0800 Subject: [PATCH 23/45] chore: update common templates --- .kokoro/build.sh | 23 +++++++++++++++-------- renovate.json | 7 +++++++ synth.metadata | 18 ++++++++++++++++-- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f1ae58408..d11958c5a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -62,14 +62,21 @@ integration) bash .kokoro/coerce_logs.sh ;; samples) - mvn -B \ - -Penable-samples \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - bash .kokoro/coerce_logs.sh + if [[ -f samples/pom.xml ]] + then + pushd samples + mvn -B \ + -Penable-samples \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check diff --git a/renovate.json b/renovate.json index 268a4669a..fc6412701 100644 --- a/renovate.json +++ b/renovate.json @@ -54,6 +54,13 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:libraries-bom" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" diff --git a/synth.metadata b/synth.metadata index 7a15ec3d3..1c0ffef6b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,11 +1,25 @@ { - "updateTime": "2020-02-01T09:13:37.746201Z", + "updateTime": "2020-02-21T23:10:53.290677Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-logging-logback.git", + "sha": "eb7cd0d4a9ea0e1e1acd1b99fec081213d7f67ee" + } + }, + { + "git": { + "name": "synthtool", + "remote": "rpc://devrel/cloud/libraries/tools/autosynth", + "sha": "706a38c26db42299845396cdae55db635c38794a" + } + }, { "template": { "name": "java_library", "origin": "synthtool.gcp", - "version": "2019.10.17" + "version": "2020.2.4" } } ] From bac7c70c9afe6e37ca49795c8de79f4471244996 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 Feb 2020 10:37:54 -0800 Subject: [PATCH 24/45] chore: update common templates --- .kokoro/build.sh | 24 +++++++++++++++++++++--- synth.metadata | 4 ++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d11958c5a..0c3083bb9 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,19 +37,24 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) fi +RETURN_CODE=0 +set +e + case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true + RETURN_CODE=$? bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh ;; lint) mvn \ -Penable-samples \ com.coveo:fmt-maven-plugin:check + RETURN_CODE=$? ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc + RETURN_CODE=$? ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ @@ -59,7 +64,7 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; samples) if [[ -f samples/pom.xml ]] @@ -72,7 +77,7 @@ samples) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? popd else echo "no sample pom.xml found - skipping sample tests" @@ -80,7 +85,20 @@ samples) ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +# fix output location of logs +bash .kokoro/coerce_logs.sh + +if [[ "${ENABLE_BUILD_COP}" == "true" ]] +then + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop + ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-logging-logback +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 1c0ffef6b..440568716 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,11 +1,11 @@ { - "updateTime": "2020-02-21T23:10:53.290677Z", + "updateTime": "2020-02-22T10:16:04.749530Z", "sources": [ { "git": { "name": ".", "remote": "https://github.com/googleapis/java-logging-logback.git", - "sha": "eb7cd0d4a9ea0e1e1acd1b99fec081213d7f67ee" + "sha": "2256b32a7cf8ce878037888d5793215e68c2886a" } }, { From 431a839b2c893b3f48ae2d2ccf4623a864d32796 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 25 Feb 2020 10:21:37 -0800 Subject: [PATCH 25/45] chore: update common templates --- .kokoro/build.sh | 8 ++++++-- .kokoro/continuous/java8.cfg | 5 +++++ .kokoro/nightly/integration.cfg | 14 ++++++++++++++ .kokoro/nightly/java8.cfg | 5 +++++ .kokoro/nightly/samples.cfg | 21 +++++++++++++-------- .kokoro/presubmit/java8.cfg | 5 +++++ synth.metadata | 16 +--------------- 7 files changed, 49 insertions(+), 25 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0c3083bb9..12f6cd9a2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,7 +44,6 @@ case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? - bash ${KOKORO_GFILE_DIR}/codecov.sh ;; lint) mvn \ @@ -91,6 +90,11 @@ clirr) ;; esac +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + # fix output location of logs bash .kokoro/coerce_logs.sh @@ -101,4 +105,4 @@ then fi echo "exiting with ${RETURN_CODE}" -exit ${RETURN_CODE} \ No newline at end of file +exit ${RETURN_CODE} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 3b017fc80..495cc7bac 100644 --- a/.kokoro/continuous/java8.cfg +++ b/.kokoro/continuous/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 3b017fc80..8bf59c02e 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -5,3 +5,17 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg index 3b017fc80..495cc7bac 100644 --- a/.kokoro/nightly/java8.cfg +++ b/.kokoro/nightly/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index 9a9102490..b4b051cd0 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -2,23 +2,28 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } env_vars: { - key: "JOB_TYPE" - value: "samples" + key: "JOB_TYPE" + value: "samples" } env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } before_action { diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 3b017fc80..495cc7bac 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/synth.metadata b/synth.metadata index 440568716..3a8573e89 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,6 @@ { - "updateTime": "2020-02-22T10:16:04.749530Z", + "updateTime": "2020-02-24T23:15:21.868537Z", "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-logging-logback.git", - "sha": "2256b32a7cf8ce878037888d5793215e68c2886a" - } - }, - { - "git": { - "name": "synthtool", - "remote": "rpc://devrel/cloud/libraries/tools/autosynth", - "sha": "706a38c26db42299845396cdae55db635c38794a" - } - }, { "template": { "name": "java_library", From ba71ed8c018b837ffd526228541f87c8ac6207f9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 10 Mar 2020 16:44:11 +0100 Subject: [PATCH 26/45] deps: update dependency com.google.cloud:google-cloud-core to v1.93.1 (#44) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | minor | `1.92.5` -> `1.93.1` | --- ### Release Notes
googleapis/java-core ### [`v1.93.1`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1931httpswwwgithubcomgoogleapisjava-corecomparev1930v1931-2020-02-28) [Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.0...v1.93.1) ### [`v1.93.0`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1930httpswwwgithubcomgoogleapisjava-corecomparev1926v1930-2020-02-27) [Compare Source](https://togithub.com/googleapis/java-core/compare/v1.92.5...v1.93.0) ##### Features - support conditional policies ([#​110](https://www.github.com/googleapis/java-core/issues/110)) ([61e2d19](https://www.github.com/googleapis/java-core/commit/61e2d19bb4400978681aa018a8dc200214203830)) ##### Bug Fixes - fix conversion for pre-epoch timestamps ([#​160](https://www.github.com/googleapis/java-core/issues/160)) ([1f8b6b4](https://www.github.com/googleapis/java-core/commit/1f8b6b4835aaa702ec94bbbde89ed90f519c935a)) ##### Dependencies - update dependency com.google.api:gax-bom to v1.54.0 ([#​168](https://www.github.com/googleapis/java-core/issues/168)) ([5b52f9e](https://www.github.com/googleapis/java-core/commit/5b52f9e8d8cdc82b56114d3d1e857d137ae7ca98)) - update dependency io.grpc:grpc-bom to v1.27.2 ([#​166](https://www.github.com/googleapis/java-core/issues/166)) ([28c9859](https://www.github.com/googleapis/java-core/commit/28c98595c9ee96760a063085bd85024177bd6dd2)) ##### [1.92.5](https://www.github.com/googleapis/java-core/compare/v1.92.4...v1.92.5) (2020-02-10) ##### Dependencies - update dependency com.google.api-client:google-api-client-bom to v1.30.8 ([#​146](https://www.github.com/googleapis/java-core/issues/146)) ([1d9c7db](https://www.github.com/googleapis/java-core/commit/1d9c7db40502eff9723f27c24be31ecc2fac9c5d)) - update dependency com.google.protobuf:protobuf-bom to v3.11.3 ([#​148](https://www.github.com/googleapis/java-core/issues/148)) ([092c69b](https://www.github.com/googleapis/java-core/commit/092c69bef5b10cf27ef6770e90ae8e50ea205dcd)) ##### [1.92.4](https://www.github.com/googleapis/java-core/compare/v1.92.3...v1.92.4) (2020-01-31) ##### Dependencies - update core dependencies ([#​143](https://www.github.com/googleapis/java-core/issues/143)) ([454ce1d](https://www.github.com/googleapis/java-core/commit/454ce1dc5a6a41f3333a2a5303315cd9eb66f442)) ##### [1.92.3](https://www.github.com/googleapis/java-core/compare/v1.92.2...v1.92.3) (2020-01-28) ##### Dependencies - update dependency com.google.api:gax-bom to v1.53.0 ([#​126](https://www.github.com/googleapis/java-core/issues/126)) ([bdb1bce](https://www.github.com/googleapis/java-core/commit/bdb1bceb63502c828a37dd50fdb3e0e2204fc0aa)) - update dependency com.google.auth:google-auth-library-bom to v0.20.0 ([#​135](https://www.github.com/googleapis/java-core/issues/135)) ([f40c636](https://www.github.com/googleapis/java-core/commit/f40c6365b1b19bc3360b0094599311bc3271f0e5)) - update dependency com.google.http-client:google-http-client-bom to v1.34.1 ([#​137](https://www.github.com/googleapis/java-core/issues/137)) ([9216702](https://www.github.com/googleapis/java-core/commit/92167026d8e4178ebb952490a3322bd685441a60)) - update dependency org.threeten:threetenbp to v1.4.1 ([82cac64](https://www.github.com/googleapis/java-core/commit/82cac64486352e46ddc6044a72fff6141d9b10ce)) ##### [1.92.2](https://www.github.com/googleapis/java-core/compare/v1.92.1...v1.92.2) (2020-01-09) ##### Bug Fixes - cast to proper interface ([#​124](https://www.github.com/googleapis/java-core/issues/124)) ([cd6eabf](https://www.github.com/googleapis/java-core/commit/cd6eabffcdeed485aba088336fa473a6b85c752d)), closes [#​123](https://www.github.com/googleapis/java-core/issues/123) ##### [1.92.1](https://www.github.com/googleapis/java-core/compare/v1.92.0...v1.92.1) (2020-01-02) ##### Dependencies - update dependency com.google.errorprone:error_prone_annotations to v2.3.4 ([#​105](https://www.github.com/googleapis/java-core/issues/105)) ([52f47c5](https://www.github.com/googleapis/java-core/commit/52f47c5ed84742b4b41417c486bfbb3c817b4a23)) - update dependency com.google.guava:guava-bom to v28.2-android ([#​113](https://www.github.com/googleapis/java-core/issues/113)) ([8b11b1a](https://www.github.com/googleapis/java-core/commit/8b11b1a8d452ab823f35509ae42263c4a69f2a5a)) - update dependency com.google.http-client:google-http-client-bom to v1.34.0 ([#​98](https://www.github.com/googleapis/java-core/issues/98)) ([d8e946d](https://www.github.com/googleapis/java-core/commit/d8e946dfd3866380406b02ad908925c4250cc34a)) - update dependency com.google.protobuf:protobuf-bom to v3.11.1 ([#​106](https://www.github.com/googleapis/java-core/issues/106)) ([6d36434](https://www.github.com/googleapis/java-core/commit/6d364341bc5552e98590f9344b0e2d8cf4e68f0c)) - update dependency io.grpc:grpc-bom to v1.26.0 ([#​107](https://www.github.com/googleapis/java-core/issues/107)) ([fca41a7](https://www.github.com/googleapis/java-core/commit/fca41a73fb6ca42eb4014d3cec6b32cc8e97ded9))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f576fe236..4e735d79d 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.92.5 + 1.93.1 com.google.auth From 2a18c6377628bf1018aa165d4aa0f48d6d361d77 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 16 Mar 2020 16:12:18 +0100 Subject: [PATCH 27/45] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.2.0 (#49) This PR contains the following updates: | Package | Update | Change | |---|---|---| | org.apache.maven.plugins:maven-javadoc-plugin | minor | `3.1.1` -> `3.2.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e735d79d..dcc336cca 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 html From 49c702f63025efe265d22a152fbef2ff73cf07d8 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 16 Mar 2020 08:29:12 -0700 Subject: [PATCH 28/45] chore: update PR template (#48) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2020-03-14 02:16:53,783 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .github/PULL_REQUEST_TEMPLATE.md .github/release-please.yml .github/trusted-contribution.yml .kokoro/build.bat .kokoro/build.sh .kokoro/coerce_logs.sh .kokoro/common.cfg .kokoro/continuous/common.cfg .kokoro/continuous/dependencies.cfg .kokoro/continuous/integration.cfg .kokoro/continuous/java11.cfg .kokoro/continuous/java7.cfg .kokoro/continuous/java8-osx.cfg .kokoro/continuous/java8-win.cfg .kokoro/continuous/java8.cfg .kokoro/continuous/lint.cfg .kokoro/continuous/propose_release.cfg .kokoro/continuous/samples.cfg .kokoro/dependencies.sh .kokoro/linkage-monitor.sh .kokoro/nightly/common.cfg .kokoro/nightly/dependencies.cfg .kokoro/nightly/integration.cfg .kokoro/nightly/java11.cfg .kokoro/nightly/java7.cfg .kokoro/nightly/java8-osx.cfg .kokoro/nightly/java8-win.cfg .kokoro/nightly/java8.cfg .kokoro/nightly/lint.cfg .kokoro/nightly/samples.cfg .kokoro/presubmit/clirr.cfg .kokoro/presubmit/common.cfg .kokoro/presubmit/dependencies.cfg .kokoro/presubmit/integration.cfg .kokoro/presubmit/java11.cfg .kokoro/presubmit/java7.cfg .kokoro/presubmit/java8-osx.cfg .kokoro/presubmit/java8-win.cfg .kokoro/presubmit/java8.cfg .kokoro/presubmit/linkage-monitor.cfg .kokoro/presubmit/lint.cfg .kokoro/presubmit/samples.cfg .kokoro/release/bump_snapshot.cfg .kokoro/release/common.cfg .kokoro/release/common.sh .kokoro/release/drop.cfg .kokoro/release/drop.sh .kokoro/release/promote.cfg .kokoro/release/promote.sh .kokoro/release/publish_javadoc.cfg .kokoro/release/publish_javadoc.sh .kokoro/release/snapshot.cfg .kokoro/release/snapshot.sh .kokoro/release/stage.cfg .kokoro/release/stage.sh .kokoro/trampoline.sh CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md codecov.yaml java.header license-checks.xml renovate.json 2020-03-14 02:16:53,982 synthtool > Wrote metadata to synth.metadata. ```
--- .github/PULL_REQUEST_TEMPLATE.md | 8 +++++++- synth.metadata | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0bd0ee062..a4f5f28c3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1,7 @@ -Fixes # (it's a good idea to open an issue first for context and/or discussion) \ No newline at end of file +Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: +- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-logging-logback/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea +- [ ] Ensure the tests and linter pass +- [ ] Code coverage does not decrease (if any source code was changed) +- [ ] Appropriate docs were updated (if necessary) + +Fixes # ☕️ diff --git a/synth.metadata b/synth.metadata index 3a8573e89..c90e57800 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-02-24T23:15:21.868537Z", + "updateTime": "2020-03-14T09:16:53.981761Z", "sources": [ { "template": { From dc962a73382498fc77a8fb9972769b71cdf4c00f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 17 Mar 2020 16:12:43 -0700 Subject: [PATCH 29/45] samples: scaffold pom.xml files (#51) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2020-03-17 12:21:46,959 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .github/PULL_REQUEST_TEMPLATE.md .github/release-please.yml .github/trusted-contribution.yml .kokoro/build.bat .kokoro/build.sh .kokoro/coerce_logs.sh .kokoro/common.cfg .kokoro/continuous/common.cfg .kokoro/continuous/dependencies.cfg .kokoro/continuous/integration.cfg .kokoro/continuous/java11.cfg .kokoro/continuous/java7.cfg .kokoro/continuous/java8-osx.cfg .kokoro/continuous/java8-win.cfg .kokoro/continuous/java8.cfg .kokoro/continuous/lint.cfg .kokoro/continuous/propose_release.cfg .kokoro/continuous/samples.cfg .kokoro/dependencies.sh .kokoro/linkage-monitor.sh .kokoro/nightly/common.cfg .kokoro/nightly/dependencies.cfg .kokoro/nightly/integration.cfg .kokoro/nightly/java11.cfg .kokoro/nightly/java7.cfg .kokoro/nightly/java8-osx.cfg .kokoro/nightly/java8-win.cfg .kokoro/nightly/java8.cfg .kokoro/nightly/lint.cfg .kokoro/nightly/samples.cfg .kokoro/presubmit/clirr.cfg .kokoro/presubmit/common.cfg .kokoro/presubmit/dependencies.cfg .kokoro/presubmit/integration.cfg .kokoro/presubmit/java11.cfg .kokoro/presubmit/java7.cfg .kokoro/presubmit/java8-osx.cfg .kokoro/presubmit/java8-win.cfg .kokoro/presubmit/java8.cfg .kokoro/presubmit/linkage-monitor.cfg .kokoro/presubmit/lint.cfg .kokoro/presubmit/samples.cfg .kokoro/release/bump_snapshot.cfg .kokoro/release/common.cfg .kokoro/release/common.sh .kokoro/release/drop.cfg .kokoro/release/drop.sh .kokoro/release/promote.cfg .kokoro/release/promote.sh .kokoro/release/publish_javadoc.cfg .kokoro/release/publish_javadoc.sh .kokoro/release/snapshot.cfg .kokoro/release/snapshot.sh .kokoro/release/stage.cfg .kokoro/release/stage.sh .kokoro/trampoline.sh CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md codecov.yaml java.header license-checks.xml renovate.json samples/install-without-bom/pom.xml samples/pom.xml samples/snapshot/pom.xml samples/snippets/pom.xml 2020-03-17 12:21:47,169 synthtool > Wrote metadata to synth.metadata. ```
--- samples/install-without-bom/pom.xml | 84 +++++++++++++++++++++++++++++ samples/pom.xml | 56 +++++++++++++++++++ samples/snapshot/pom.xml | 83 ++++++++++++++++++++++++++++ samples/snippets/pom.xml | 60 +++++++++++++++++++++ synth.metadata | 2 +- 5 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 samples/install-without-bom/pom.xml create mode 100644 samples/pom.xml create mode 100644 samples/snapshot/pom.xml create mode 100644 samples/snippets/pom.xml diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml new file mode 100644 index 000000000..4e87afa60 --- /dev/null +++ b/samples/install-without-bom/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + com.google.cloud + logging-logback-install-without-bom + jar + Google Google Cloud Logging Logback Appender Install Without Bom + https://github.com/googleapis/java-logging-logback + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + com.google.cloud + google-cloud-logging-logback + + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + diff --git a/samples/pom.xml b/samples/pom.xml new file mode 100644 index 000000000..44dc79a3a --- /dev/null +++ b/samples/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + com.google.cloud + google-cloud-logging-logback-samples + 0.0.1-SNAPSHOT + pom + Google Google Cloud Logging Logback Appender Samples Parent + https://github.com/googleapis/java-logging-logback + + Java idiomatic client for Google Cloud Platform services. + + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + install-without-bom + snapshot + snippets + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml new file mode 100644 index 000000000..b0a059cb7 --- /dev/null +++ b/samples/snapshot/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + com.google.cloud + logging-logback-snapshot + jar + Google Google Cloud Logging Logback Appender Snapshot Samples + https://github.com/googleapis/java-logging-logback + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + com.google.cloud + google-cloud-logging-logback + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + \ No newline at end of file diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml new file mode 100644 index 000000000..a3bedae22 --- /dev/null +++ b/samples/snippets/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + com.google.cloud + logging-logback-snippets + jar + Google Google Cloud Logging Logback Appender Snippets + https://github.com/googleapis/java-logging-logback + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + + com.google.cloud + libraries-bom + + pom + import + + + + + + + com.google.cloud + google-cloud-logging-logback + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + diff --git a/synth.metadata b/synth.metadata index c90e57800..4fe15892c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-03-14T09:16:53.981761Z", + "updateTime": "2020-03-17T19:21:47.168716Z", "sources": [ { "template": { From f93850925ece4c75225494a29aaf008f899ba24b Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 18 Mar 2020 08:49:32 -0700 Subject: [PATCH 30/45] samples: fix snippet closing tag (#52) --- 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 4e87afa60..e9c73cb2f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -31,7 +31,7 @@ google-cloud-logging-logback - + junit From 641f831ba97a247bc58596f8697e253c2ca98f9d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 23 Mar 2020 16:11:25 -0700 Subject: [PATCH 31/45] chore: use java helper for templates (#53) --- synth.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/synth.py b/synth.py index c484fc4d2..141684f5e 100644 --- a/synth.py +++ b/synth.py @@ -14,11 +14,8 @@ """This script is used to synthesize generated parts of this library.""" -import synthtool as s -import synthtool.gcp as gcp +import synthtool.languages.java as java - -templates = gcp.CommonTemplates().java_library() -s.copy(templates, excludes=[ +java.common_templates(excludes=[ 'README.md', -]) \ No newline at end of file +]) From 0d436ef17e811d673cda9e1c5fc86764155c7ace Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 23 Mar 2020 19:34:33 -0700 Subject: [PATCH 32/45] chore: enable context aware commits (#54) --- synth.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/synth.py b/synth.py index 141684f5e..df5ccd322 100644 --- a/synth.py +++ b/synth.py @@ -16,6 +16,8 @@ import synthtool.languages.java as java +AUTOSYNTH_MULTIPLE_COMMITS = True + java.common_templates(excludes=[ 'README.md', ]) From e68627aff308f83406cd6f83fcd4c121e9d15e5c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 26 Mar 2020 00:22:30 +0100 Subject: [PATCH 33/45] deps: update dependency com.google.api:api-common to v1.9.0 (#56) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.api:api-common](https://togithub.com/googleapis/api-common-java) | minor | `1.8.1` -> `1.9.0` | --- ### Release Notes
googleapis/api-common-java ### [`v1.9.0`](https://togithub.com/googleapis/api-common-java/releases/v1.9.0) [Compare Source](https://togithub.com/googleapis/api-common-java/compare/v1.8.1...v1.9.0) 03-25-2020 14:09 PST #### New Features - Add `@BetaApi` `ApiFutres.catchingAsync()` ([#​117](https://togithub.com/googleapis/api-common-java/pull/117)) ##### Dependencies - Update guava to v28.2-android ([#​110](https://togithub.com/googleapis/api-common-java/pull/110)) - Update error_prone_annotations to v2.2.3 ([#​111](https://togithub.com/googleapis/api-common-java/pull/111))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcc336cca..9e523e268 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.7.30 0.20.0 4.13 - 1.8.1 + 1.9.0 From 4df7e73beed765340d738883e5e16dbf15644105 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 25 Mar 2020 22:10:41 -0700 Subject: [PATCH 34/45] chore: update common templates (#57) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/f193fffb-af3a-401a-a8ed-2548fbd8844c/targets --- .kokoro/build.sh | 19 ++++++++++------ .kokoro/common.sh | 44 ++++++++++++++++++++++++++++++++++++++ .kokoro/dependencies.sh | 15 +++++++++---- .kokoro/linkage-monitor.sh | 22 +++++++++++++------ renovate.json | 6 ++++-- synth.metadata | 10 ++++----- 6 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 .kokoro/common.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 12f6cd9a2..62c498801 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -20,17 +20,22 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo cd ${scriptDir}/.. +# include common functions +source ${scriptDir}/common.sh + # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true \ - -T 1C +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then diff --git a/.kokoro/common.sh b/.kokoro/common.sh new file mode 100644 index 000000000..a3bbc5f67 --- /dev/null +++ b/.kokoro/common.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# set -eo pipefail + +function retry_with_backoff { + attempts_left=$1 + sleep_seconds=$2 + shift 2 + command=$@ + + echo "${command}" + ${command} + exit_code=$? + + if [[ $exit_code == 0 ]] + then + return 0 + fi + + # failure + if [[ ${attempts_left} > 0 ]] + then + echo "failure (${exit_code}), sleeping ${sleep_seconds}..." + sleep ${sleep_seconds} + new_attempts=$((${attempts_left} - 1)) + new_sleep=$((${sleep_seconds} * 2)) + retry_with_backoff ${new_attempts} ${new_sleep} ${command} + fi + + return $exit_code +} diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index db776b50e..0aade871c 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -15,7 +15,13 @@ set -eo pipefail -cd github/java-logging-logback/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java java -version @@ -24,8 +30,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh index 24b7bb3eb..759ab4e2c 100755 --- a/.kokoro/linkage-monitor.sh +++ b/.kokoro/linkage-monitor.sh @@ -17,18 +17,26 @@ set -eo pipefail # Display commands being run. set -x -cd github/java-logging-logback/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR JAR=linkage-monitor-latest-all-deps.jar diff --git a/renovate.json b/renovate.json index fc6412701..f9242fe14 100644 --- a/renovate.json +++ b/renovate.json @@ -56,7 +56,9 @@ }, { "packagePatterns": [ - "^com.google.cloud:libraries-bom" + "^com.google.cloud:google-cloud-logging-logback", + "^com.google.cloud:libraries-bom", + "^com.google.cloud.samples:shared-configuration" ], "semanticCommitType": "chore", "semanticCommitScope": "deps" @@ -75,4 +77,4 @@ } ], "semanticCommits": true -} +} \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 4fe15892c..e2eaeb20a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,11 +1,11 @@ { - "updateTime": "2020-03-17T19:21:47.168716Z", + "updateTime": "2020-03-25T23:36:24.863212Z", "sources": [ { - "template": { - "name": "java_library", - "origin": "synthtool.gcp", - "version": "2020.2.4" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } ] From 13eb882573a0ae91f1875b1f554809d0682e1b64 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 26 Mar 2020 16:57:22 +0100 Subject: [PATCH 35/45] deps: update dependency com.google.cloud.samples:shared-configuration to v1.0.13 (#55) --- samples/install-without-bom/pom.xml | 2 +- samples/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index e9c73cb2f..f4f93d97a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/samples/pom.xml b/samples/pom.xml index 44dc79a3a..e3b5df5aa 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b0a059cb7..326e0c36d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index a3bedae22..9357d148b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 From e3ba8f0f9a339750df0ac90a0b32d7a15d60377e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 30 Mar 2020 20:14:31 +0200 Subject: [PATCH 36/45] chore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.14 (#59) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.13` -> `1.0.14` | --- ### Release Notes
GoogleCloudPlatform/java-repo-tools ### [`v1.0.14`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.14) [Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.13...v1.0.14) - Update CheckStyle to 8.31 - Add SpotBugs
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- samples/install-without-bom/pom.xml | 2 +- samples/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f4f93d97a..3f25f9ca7 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/samples/pom.xml b/samples/pom.xml index e3b5df5aa..109872829 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 326e0c36d..ff87c55cd 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9357d148b..75b7e3a4e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 From 63362dcafe7abae24406edd693b65b6e442cb5bc Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 31 Mar 2020 11:20:42 -0700 Subject: [PATCH 37/45] samples: fix versions (#60) --- pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- versions.txt | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 versions.txt diff --git a/pom.xml b/pom.xml index 9e523e268..4ba471f3c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.116.0-alpha + 0.116.0-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3f25f9ca7..94ff5857c 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.116.0-alpha diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ff87c55cd..8765e71b1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - + 0.116.0-alpha diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 75b7e3a4e..033673722 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - + 4.3.0 pom import diff --git a/versions.txt b/versions.txt new file mode 100644 index 000000000..6c5cdb1ba --- /dev/null +++ b/versions.txt @@ -0,0 +1,4 @@ +# Format: +# module:released-version:current-version + +google-cloud-logging-logback:10.116.0-alpha:0.116.0-alpha \ No newline at end of file From 585d44214e8564d8eef6f545110d244148a5f1c9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 31 Mar 2020 20:28:05 +0200 Subject: [PATCH 38/45] deps: update dependency com.google.cloud:google-cloud-logging to v1.101.0 (#47) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud:google-cloud-logging](https://togithub.com/googleapis/java-logging) | minor | `1.98.0` -> `1.101.0` | --- ### Release Notes
googleapis/java-logging ### [`v1.101.0`](https://togithub.com/googleapis/java-logging/blob/master/CHANGELOG.md#​11010-httpswwwgithubcomgoogleapisjava-loggingcomparev11000v11010-2020-03-25) [Compare Source](https://togithub.com/googleapis/java-logging/compare/v1.100.0...v1.101.0) ##### Features - add CmekSettings options ([#​89](https://www.github.com/googleapis/java-logging/issues/89)) ([f76206d](https://www.github.com/googleapis/java-logging/commit/f76206d6d137fec9e73ef7e93a8b77193d71166c)) ##### Bug Fixes - **regen:** undeprecate resourcenames until multi-pattern resource names are available ([#​108](https://www.github.com/googleapis/java-logging/issues/108)) ([4ca5895](https://www.github.com/googleapis/java-logging/commit/4ca5895f2bb83fcf1c7ecf908aae1c50d9cd89d9)) ##### Dependencies - update core dependencies ([#​61](https://www.github.com/googleapis/java-logging/issues/61)) ([a73322c](https://www.github.com/googleapis/java-logging/commit/a73322cb0e8f43eb253a4004189f1e4d387dcb1c)) - update core dependencies ([#​85](https://www.github.com/googleapis/java-logging/issues/85)) ([5e61aa7](https://www.github.com/googleapis/java-logging/commit/5e61aa7180934af6b63e845f2d172c6e6d08d0ee)) - update core dependencies ([#​92](https://www.github.com/googleapis/java-logging/issues/92)) ([4fe64cc](https://www.github.com/googleapis/java-logging/commit/4fe64cc5fa0c680733e42cfc6d40c9e7aaac77a6)) - update core dependencies to v1.93.1 ([#​113](https://www.github.com/googleapis/java-logging/issues/113)) ([2d68fe9](https://www.github.com/googleapis/java-logging/commit/2d68fe9a9653d08eec5427f877848cbc25c47c4b)) - update core deps ([#​109](https://www.github.com/googleapis/java-logging/issues/109)) ([75d38f1](https://www.github.com/googleapis/java-logging/commit/75d38f1d6d56605f5d446cc581a5abf96256c3f4)) - update dependency com.google.api:api-common to v1.9.0 ([#​120](https://www.github.com/googleapis/java-logging/issues/120)) ([87ebf36](https://www.github.com/googleapis/java-logging/commit/87ebf36b455478357ea1c0185584d5813244ade8)) - update dependency com.google.http-client:google-http-client-bom to v1.34.1 ([#​81](https://www.github.com/googleapis/java-logging/issues/81)) ([dacc7db](https://www.github.com/googleapis/java-logging/commit/dacc7db6775a5489f1d43467bbece7fd781e14ba)) - update dependency com.google.http-client:google-http-client-bom to v1.34.2 ([#​94](https://www.github.com/googleapis/java-logging/issues/94)) ([55f6936](https://www.github.com/googleapis/java-logging/commit/55f6936f9933d17d29ea5244d93b9460837a7c70)) - update dependency com.google.protobuf:protobuf-bom to v3.11.3 ([#​87](https://www.github.com/googleapis/java-logging/issues/87)) ([dee31b3](https://www.github.com/googleapis/java-logging/commit/dee31b386b7b930419013a17cb1ae0399d7a5bdf)) - update dependency com.google.protobuf:protobuf-bom to v3.11.4 ([#​95](https://www.github.com/googleapis/java-logging/issues/95)) ([954897e](https://www.github.com/googleapis/java-logging/commit/954897e43c746961d69550644f1dd5a2936d50e5)) ##### Documentation - **regen:** update sample code to set total timeout, add API client header test ([#​91](https://www.github.com/googleapis/java-logging/issues/91)) ([133a762](https://www.github.com/googleapis/java-logging/commit/133a762a93f0bd2725edc5342eada77459c78896)) ### [`v1.100.0`](https://togithub.com/googleapis/java-logging/blob/master/CHANGELOG.md#​11000-httpswwwgithubcomgoogleapisjava-loggingcomparev1990v11000-2020-01-23) [Compare Source](https://togithub.com/googleapis/java-logging/compare/v1.99.0...v1.100.0) ##### Features - add label fullStacktrace ([#​40](https://www.github.com/googleapis/java-logging/issues/40)) ([43e1953](https://www.github.com/googleapis/java-logging/commit/43e19533f969d0e2a2c0c31669a4de191e8cd67e)) ##### Bug Fixes - support for Cloud Run monitored resource ([#​78](https://www.github.com/googleapis/java-logging/issues/78)) ([b3c1b68](https://www.github.com/googleapis/java-logging/commit/b3c1b68712060299c9df5928ec011f556b8340ad)), closes [#​71](https://www.github.com/googleapis/java-logging/issues/71) ##### Dependencies - update core dependencies ([#​54](https://www.github.com/googleapis/java-logging/issues/54)) ([9ae3410](https://www.github.com/googleapis/java-logging/commit/9ae341087e99edce79d30ddc7d8aa33e347f20d5)) - update dependency com.google.http-client:google-http-client-bom to v1.34.0 ([#​45](https://www.github.com/googleapis/java-logging/issues/45)) ([6bab25b](https://www.github.com/googleapis/java-logging/commit/6bab25b334405278de3bae6c9c2b3a88d872f9bd)) - update dependency com.google.protobuf:protobuf-java to v3.11.1 ([eb0befc](https://www.github.com/googleapis/java-logging/commit/eb0befc97a838b2c003851973d53e8530b54b7a7)) - update dependency org.threeten:threetenbp to v1.4.1 ([f560dca](https://www.github.com/googleapis/java-logging/commit/f560dca9466ce13a634da430ff2209234f22096e)) - update libraries-bom to 3.3.0 ([#​59](https://www.github.com/googleapis/java-logging/issues/59)) ([91c2a4e](https://www.github.com/googleapis/java-logging/commit/91c2a4e993ae2b60cd6c21ec271e805401724cc1)) ##### Documentation - **regen:** updated javadocs from protoc update ([#​41](https://www.github.com/googleapis/java-logging/issues/41)) ([63d626c](https://www.github.com/googleapis/java-logging/commit/63d626cb458aeb631fe2e87d83141bfb6e50e2d4)) ### [`v1.99.0`](https://togithub.com/googleapis/java-logging/blob/master/CHANGELOG.md#​1990-httpswwwgithubcomgoogleapisjava-loggingcompare1980v1990-2019-11-20) [Compare Source](https://togithub.com/googleapis/java-logging/compare/1.98.0...v1.99.0) ##### Features - make repo releasable, add parent/bom ([#​1](https://www.github.com/googleapis/java-logging/issues/1)) ([1249ea7](https://www.github.com/googleapis/java-logging/commit/1249ea764f2531ad7fc6958fc3df47da5bc004d9)) ##### Dependencies - update dependency io.grpc:grpc-bom to v1.25.0 ([#​7](https://www.github.com/googleapis/java-logging/issues/7)) ([f602d3b](https://www.github.com/googleapis/java-logging/commit/f602d3b9096e6121a3f776ac50615461af826053)) - use google-cloud-core-bom and update to v1.91.3 ([#​15](https://www.github.com/googleapis/java-logging/issues/15)) ([f2c9cb8](https://www.github.com/googleapis/java-logging/commit/f2c9cb86ffd6c604b57e8744de19d4b801f2cf00))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ba471f3c..b9739ca98 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 3.6 1.0.1 2.8.6 - 1.98.0 + 1.101.0 28.2-android 1.7.30 0.20.0 From 7c3073662bc4537c8f6a08325d52d2f1ce3dee22 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 31 Mar 2020 20:28:09 +0200 Subject: [PATCH 39/45] deps: update dependency com.google.cloud:google-cloud-core to v1.93.3 (#45) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud:google-cloud-core](https://togithub.com/googleapis/java-core) | patch | `1.93.1` -> `1.93.3` | --- ### Release Notes
googleapis/java-core ### [`v1.93.3`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1933-httpswwwgithubcomgoogleapisjava-corecomparev1932v1933-2020-03-16) [Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.2...v1.93.3) ### [`v1.93.2`](https://togithub.com/googleapis/java-core/blob/master/CHANGELOG.md#​1932-httpswwwgithubcomgoogleapisjava-corecomparev1931v1932-2020-03-10) [Compare Source](https://togithub.com/googleapis/java-core/compare/v1.93.1...v1.93.2)
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9739ca98..c4fa198f8 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.google.cloud google-cloud-core - 1.93.1 + 1.93.3 com.google.auth From d97af7654ec60c29da8335713f3321a220708bfb Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 31 Mar 2020 11:33:58 -0700 Subject: [PATCH 40/45] chore: fix versions manifest --- versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.txt b/versions.txt index 6c5cdb1ba..7cb422991 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:10.116.0-alpha:0.116.0-alpha \ No newline at end of file +google-cloud-logging-logback:0.116.0-alpha:0.116.0-alpha \ No newline at end of file From 9078709bd714775f9a146bde5f61b78d5776fc4a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Apr 2020 21:52:37 +0200 Subject: [PATCH 41/45] chore(deps): update dependency com.google.cloud:libraries-bom to v4.4.0 (#63) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `4.3.0` -> `4.4.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-logging-logback). --- 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 033673722..3d66d11ed 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 4.3.0 + 4.4.0 pom import From 70375e14c9c1e0c76906c87c923e23cd7f6118e8 Mon Sep 17 00:00:00 2001 From: Suraj Dhamecha <48670070+suraj-qlogic@users.noreply.github.com> Date: Thu, 2 Apr 2020 02:41:14 +0530 Subject: [PATCH 42/45] feat: expose flush() method in LoggingAppender (#62) --- .../cloud/logging/logback/LoggingAppender.java | 10 ++++++++++ .../logging/logback/LoggingAppenderTest.java | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) 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 bd24cbdd0..6d5d081bd 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -245,6 +245,16 @@ Logging getLogging() { return logging; } + /** Flushes any pending asynchronous logging writes. */ + public void flush() { + if (!isStarted()) { + return; + } + synchronized (this) { + getLogging().flush(); + } + } + /** Gets the {@link LoggingOptions} to use for this {@link LoggingAppender}. */ protected LoggingOptions getLoggingOptions() { if (loggingOptions == null) { diff --git a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index a36e13517..a3add6f1e 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -305,6 +305,24 @@ public void testAddCustomLoggingEventEnhancers() { assertThat(capturedArgumentMap.get("bar")).isEqualTo("bar"); } + @Test + public void testFlush() { + logging.setFlushSeverity(Severity.ERROR); + Capture> capturedArgument = Capture.newInstance(); + logging.write(capture(capturedArgument), (WriteOption) anyObject(), (WriteOption) anyObject()); + expectLastCall().times(2); + logging.flush(); + replay(logging); + loggingAppender.start(); + Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(100000, 0); + LoggingEvent firstLoggingEvent = createLoggingEvent(Level.WARN, timestamp.getSeconds()); + LoggingEvent secondLoggingEvent = createLoggingEvent(Level.INFO, timestamp.getSeconds()); + loggingAppender.doAppend(firstLoggingEvent); + loggingAppender.doAppend(secondLoggingEvent); + loggingAppender.flush(); + verify(logging); + } + static class CustomLoggingEventEnhancer1 implements LoggingEventEnhancer { @Override From 494a642c3fcbdf184563e6edbcfdd5b35e8fb14e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 2 Apr 2020 14:14:02 -0700 Subject: [PATCH 43/45] chore: bump next snapshot (#61) --- pom.xml | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4fa198f8..564ea13ae 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.116.0-alpha + 0.116.1-alpha-SNAPSHOT jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/versions.txt b/versions.txt index 7cb422991..afaa8a5f3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.116.0-alpha:0.116.0-alpha \ No newline at end of file +google-cloud-logging-logback:0.116.0-alpha:0.116.1-alpha-SNAPSHOT From 1baab895770144febcab3384dcfb6e7bfa896787 Mon Sep 17 00:00:00 2001 From: Ajit Thakor <49403056+athakor@users.noreply.github.com> Date: Fri, 3 Apr 2020 02:44:56 +0530 Subject: [PATCH 44/45] fix: logback error show in error reporting console (#43) --- .../logging/logback/LoggingAppender.java | 16 +++++++++--- .../logging/logback/LoggingAppenderTest.java | 26 +++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) 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 6d5d081bd..1adcd4921 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -39,8 +39,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -72,6 +74,8 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { private static final String LEVEL_NAME_KEY = "levelName"; private static final String LEVEL_VALUE_KEY = "levelValue"; private static final String LOGGER_NAME_KEY = "loggerName"; + private static final String TYPE = + "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent"; private static final List DEFAULT_LOGGING_EVENT_ENHANCERS = ImmutableList.of(new MDCEventEnhancer()); @@ -284,11 +288,17 @@ private LogEntry logEntryFor(ILoggingEvent e) { writeStack(e.getThrowableProxy(), "", payload); Level level = e.getLevel(); + Severity severity = severityFor(level); + + Map jsonContent = new HashMap<>(); + jsonContent.put("message", payload.toString().trim()); + if (severity == Severity.ERROR) { + jsonContent.put("@type", TYPE); + } LogEntry.Builder builder = - LogEntry.newBuilder(Payload.StringPayload.of(payload.toString().trim())) + LogEntry.newBuilder(Payload.JsonPayload.of(jsonContent)) .setTimestamp(e.getTimeStamp()) - .setSeverity(severityFor(level)); - + .setSeverity(severity); builder .addLabel(LEVEL_NAME_KEY, level.toString()) .addLabel(LEVEL_VALUE_KEY, String.valueOf(level.toInt())) diff --git a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index a3add6f1e..ec85327ce 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -34,9 +34,10 @@ import com.google.cloud.logging.Logging; import com.google.cloud.logging.Logging.WriteOption; import com.google.cloud.logging.LoggingOptions; -import com.google.cloud.logging.Payload.StringPayload; +import com.google.cloud.logging.Payload.JsonPayload; import com.google.cloud.logging.Severity; import com.google.common.collect.ImmutableMap; +import java.util.HashMap; import java.util.Map; import org.easymock.Capture; import org.easymock.EasyMock; @@ -82,8 +83,11 @@ public void setUp() { @Test public void testFlushLevelConfigUpdatesLoggingFlushSeverity() { + Map jsonContent = new HashMap<>(); + jsonContent.put("message", "this is a test"); + JsonPayload payload = JsonPayload.of(jsonContent); LogEntry logEntry = - LogEntry.newBuilder(StringPayload.of("this is a test")) + LogEntry.newBuilder(payload) .setTimestamp(100000L) .setSeverity(Severity.WARNING) .setLabels( @@ -110,8 +114,14 @@ public void testFlushLevelConfigUpdatesLoggingFlushSeverity() { @Test public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { + Map jsonContent = new HashMap<>(); + jsonContent.put("message", "this is a test"); + jsonContent.put( + "@type", + "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent"); + JsonPayload payload = JsonPayload.of(jsonContent); LogEntry logEntry = - LogEntry.newBuilder(StringPayload.of("this is a test")) + LogEntry.newBuilder(payload) .setTimestamp(100000L) .setSeverity(Severity.ERROR) .setLabels( @@ -145,8 +155,11 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { @Test public void testEnhancersAddCorrectLabelsToLogEntries() { + Map jsonContent = new HashMap<>(); + jsonContent.put("message", "this is a test"); + JsonPayload payload = JsonPayload.of(jsonContent); LogEntry logEntry = - LogEntry.newBuilder(StringPayload.of("this is a test")) + LogEntry.newBuilder(payload) .setTimestamp(100000L) .setSeverity(Severity.WARNING) .setLabels( @@ -194,8 +207,11 @@ public void testDefaultWriteOptionsHasExpectedDefaults() { @Test public void testMdcValuesAreConvertedToLabels() { + Map jsonContent = new HashMap<>(); + jsonContent.put("message", "this is a test"); + JsonPayload payload = JsonPayload.of(jsonContent); LogEntry logEntry = - LogEntry.newBuilder(StringPayload.of("this is a test")) + LogEntry.newBuilder(payload) .setTimestamp(100000L) .setSeverity(Severity.INFO) .setLabels( From 2df607e0072e58a8a3bfd9350b1d7e73f203a4b2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Apr 2020 04:00:10 +0000 Subject: [PATCH 45/45] chore: release 0.117.0 (#64) :robot: I have created a release \*beep\* \*boop\* --- ## [0.117.0](https://www.github.com/googleapis/java-logging-logback/compare/0.116.0...v0.117.0) (2020-04-02) ### Features * expose flush() method in LoggingAppender ([#62](https://www.github.com/googleapis/java-logging-logback/issues/62)) ([70375e1](https://www.github.com/googleapis/java-logging-logback/commit/70375e14c9c1e0c76906c87c923e23cd7f6118e8)) ### Bug Fixes * logback error show in error reporting console ([#43](https://www.github.com/googleapis/java-logging-logback/issues/43)) ([1baab89](https://www.github.com/googleapis/java-logging-logback/commit/1baab895770144febcab3384dcfb6e7bfa896787)) ### Dependencies * update core dependencies ([#11](https://www.github.com/googleapis/java-logging-logback/issues/11)) ([8c06e9a](https://www.github.com/googleapis/java-logging-logback/commit/8c06e9ab3fc44bd738e80fc966e739e8cb9f70bb)) * update core dependencies ([#18](https://www.github.com/googleapis/java-logging-logback/issues/18)) ([58f36de](https://www.github.com/googleapis/java-logging-logback/commit/58f36dec1a48f5d2a68b1327251350265941b438)) * update dependency com.google.api:api-common to v1.9.0 ([#56](https://www.github.com/googleapis/java-logging-logback/issues/56)) ([e68627a](https://www.github.com/googleapis/java-logging-logback/commit/e68627aff308f83406cd6f83fcd4c121e9d15e5c)) * update dependency com.google.cloud:google-cloud-core to v1.92.4 ([#32](https://www.github.com/googleapis/java-logging-logback/issues/32)) ([8b9574d](https://www.github.com/googleapis/java-logging-logback/commit/8b9574de2a70a5672cbfa13c3d13684066f8be05)) * update dependency com.google.cloud:google-cloud-core to v1.92.5 ([dd8b483](https://www.github.com/googleapis/java-logging-logback/commit/dd8b48348c5a04f42e963bf1cc5d427aa6e56d3a)) * update dependency com.google.cloud:google-cloud-core to v1.93.1 ([#44](https://www.github.com/googleapis/java-logging-logback/issues/44)) ([ba71ed8](https://www.github.com/googleapis/java-logging-logback/commit/ba71ed8c018b837ffd526228541f87c8ac6207f9)) * update dependency com.google.cloud:google-cloud-core to v1.93.3 ([#45](https://www.github.com/googleapis/java-logging-logback/issues/45)) ([7c30736](https://www.github.com/googleapis/java-logging-logback/commit/7c3073662bc4537c8f6a08325d52d2f1ce3dee22)) * update dependency com.google.cloud:google-cloud-logging to v1.101.0 ([#47](https://www.github.com/googleapis/java-logging-logback/issues/47)) ([585d442](https://www.github.com/googleapis/java-logging-logback/commit/585d44214e8564d8eef6f545110d244148a5f1c9)) * update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#55](https://www.github.com/googleapis/java-logging-logback/issues/55)) ([13eb882](https://www.github.com/googleapis/java-logging-logback/commit/13eb882573a0ae91f1875b1f554809d0682e1b64)) * update dependency com.google.guava:guava-bom to v28.2-android ([#15](https://www.github.com/googleapis/java-logging-logback/issues/15)) ([2b7877d](https://www.github.com/googleapis/java-logging-logback/commit/2b7877dc4978043609a47fe0f7dfa8914c9e2622)) * update dependency org.slf4j:slf4j-api to v1.7.30 ([#12](https://www.github.com/googleapis/java-logging-logback/issues/12)) ([ce949a0](https://www.github.com/googleapis/java-logging-logback/commit/ce949a0ee0f10d1276ce3da94230c6e5f57e7b4b)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ pom.xml | 2 +- versions.txt | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..b4005ea0f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,28 @@ +# Changelog + +## [0.117.0](https://www.github.com/googleapis/java-logging-logback/compare/0.116.0...v0.117.0) (2020-04-02) + + +### Features + +* expose flush() method in LoggingAppender ([#62](https://www.github.com/googleapis/java-logging-logback/issues/62)) ([70375e1](https://www.github.com/googleapis/java-logging-logback/commit/70375e14c9c1e0c76906c87c923e23cd7f6118e8)) + + +### Bug Fixes + +* logback error show in error reporting console ([#43](https://www.github.com/googleapis/java-logging-logback/issues/43)) ([1baab89](https://www.github.com/googleapis/java-logging-logback/commit/1baab895770144febcab3384dcfb6e7bfa896787)) + + +### Dependencies + +* update core dependencies ([#11](https://www.github.com/googleapis/java-logging-logback/issues/11)) ([8c06e9a](https://www.github.com/googleapis/java-logging-logback/commit/8c06e9ab3fc44bd738e80fc966e739e8cb9f70bb)) +* update core dependencies ([#18](https://www.github.com/googleapis/java-logging-logback/issues/18)) ([58f36de](https://www.github.com/googleapis/java-logging-logback/commit/58f36dec1a48f5d2a68b1327251350265941b438)) +* update dependency com.google.api:api-common to v1.9.0 ([#56](https://www.github.com/googleapis/java-logging-logback/issues/56)) ([e68627a](https://www.github.com/googleapis/java-logging-logback/commit/e68627aff308f83406cd6f83fcd4c121e9d15e5c)) +* update dependency com.google.cloud:google-cloud-core to v1.92.4 ([#32](https://www.github.com/googleapis/java-logging-logback/issues/32)) ([8b9574d](https://www.github.com/googleapis/java-logging-logback/commit/8b9574de2a70a5672cbfa13c3d13684066f8be05)) +* update dependency com.google.cloud:google-cloud-core to v1.92.5 ([dd8b483](https://www.github.com/googleapis/java-logging-logback/commit/dd8b48348c5a04f42e963bf1cc5d427aa6e56d3a)) +* update dependency com.google.cloud:google-cloud-core to v1.93.1 ([#44](https://www.github.com/googleapis/java-logging-logback/issues/44)) ([ba71ed8](https://www.github.com/googleapis/java-logging-logback/commit/ba71ed8c018b837ffd526228541f87c8ac6207f9)) +* update dependency com.google.cloud:google-cloud-core to v1.93.3 ([#45](https://www.github.com/googleapis/java-logging-logback/issues/45)) ([7c30736](https://www.github.com/googleapis/java-logging-logback/commit/7c3073662bc4537c8f6a08325d52d2f1ce3dee22)) +* update dependency com.google.cloud:google-cloud-logging to v1.101.0 ([#47](https://www.github.com/googleapis/java-logging-logback/issues/47)) ([585d442](https://www.github.com/googleapis/java-logging-logback/commit/585d44214e8564d8eef6f545110d244148a5f1c9)) +* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#55](https://www.github.com/googleapis/java-logging-logback/issues/55)) ([13eb882](https://www.github.com/googleapis/java-logging-logback/commit/13eb882573a0ae91f1875b1f554809d0682e1b64)) +* update dependency com.google.guava:guava-bom to v28.2-android ([#15](https://www.github.com/googleapis/java-logging-logback/issues/15)) ([2b7877d](https://www.github.com/googleapis/java-logging-logback/commit/2b7877dc4978043609a47fe0f7dfa8914c9e2622)) +* update dependency org.slf4j:slf4j-api to v1.7.30 ([#12](https://www.github.com/googleapis/java-logging-logback/issues/12)) ([ce949a0](https://www.github.com/googleapis/java-logging-logback/commit/ce949a0ee0f10d1276ce3da94230c6e5f57e7b4b)) diff --git a/pom.xml b/pom.xml index 564ea13ae..f810d30da 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.116.1-alpha-SNAPSHOT + 0.117.0-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/versions.txt b/versions.txt index afaa8a5f3..36cad6c74 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.116.0-alpha:0.116.1-alpha-SNAPSHOT +google-cloud-logging-logback:0.117.0-alpha:0.117.0-alpha