diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0bd0ee06..c0166817 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-shared-config/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/.github/trusted-contribution.yml b/.github/trusted-contribution.yml new file mode 100644 index 00000000..f247d5c7 --- /dev/null +++ b/.github/trusted-contribution.yml @@ -0,0 +1,2 @@ +trustedContributors: +- renovate-bot \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f1ae5840..7b0fd0b2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -20,36 +20,45 @@ 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 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 - bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; 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,21 +68,46 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; 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 + RETURN_CODE=$? + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + +# 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-shared-config +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/.kokoro/common.sh b/.kokoro/common.sh new file mode 100644 index 00000000..a3bbc5f6 --- /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/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 3b017fc8..495cc7ba 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/dependencies.sh b/.kokoro/dependencies.sh index cc836602..0aade871 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -15,7 +15,13 @@ set -eo pipefail -cd github/java-shared-config/ +## 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 56abc2c6..759ab4e2 100755 --- a/.kokoro/linkage-monitor.sh +++ b/.kokoro/linkage-monitor.sh @@ -17,13 +17,26 @@ set -eo pipefail # Display commands being run. set -x -cd github/java-shared-config/ +## 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 -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V +# 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/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 3b017fc8..8bf59c02 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 3b017fc8..495cc7ba 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 9a910249..b4b051cd 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 3b017fc8..495cc7ba 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/.repo-metadata.json b/.repo-metadata.json index 1553fb75..6eb837f1 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -5,5 +5,5 @@ "language": "java", "repo": "googleapis/java-shared-config", "repo_short": "java-shared-config", - "distribution_name": "google-cloud-shared-config" + "distribution_name": "com.google.cloud:google-cloud-shared-config" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb6db30..a2cb7a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [0.5.0](https://www.github.com/googleapis/java-shared-config/compare/v0.4.0...v0.5.0) (2020-04-07) + + +### Features + +* add ban duplicate classes rule ([#126](https://www.github.com/googleapis/java-shared-config/issues/126)) ([e38a7cc](https://www.github.com/googleapis/java-shared-config/commit/e38a7cc949396f8f5696e62cd060e0c076047b8d)) +* add devsite javadoc profile ([#121](https://www.github.com/googleapis/java-shared-config/issues/121)) ([7f452fb](https://www.github.com/googleapis/java-shared-config/commit/7f452fb6c5704f6ce0f731085479a28fb99ebcb9)) +* add maven flatten plugin ([#127](https://www.github.com/googleapis/java-shared-config/issues/127)) ([fb00799](https://www.github.com/googleapis/java-shared-config/commit/fb00799c416d324d68da5b660a26f7ef595c26d9)) + + +### Bug Fixes + +* declare com.coveo:fmt-maven-plugin version/configuration ([#90](https://www.github.com/googleapis/java-shared-config/issues/90)) ([5cf71a6](https://www.github.com/googleapis/java-shared-config/commit/5cf71a6ed699907082756e70c2fdee6ad3632f38)) + + +### Dependencies + +* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#118](https://www.github.com/googleapis/java-shared-config/issues/118)) ([58ae69e](https://www.github.com/googleapis/java-shared-config/commit/58ae69eb5ba037963cdaed0c2b0e30663bc873eb)) +* update dependency com.puppycrawl.tools:checkstyle to v8.29 ([f62292d](https://www.github.com/googleapis/java-shared-config/commit/f62292dab75699a75f8a7d499fe2ccfb7ee93783)) +* update dependency org.apache.maven.plugins:maven-antrun-plugin to v1.8 ([#124](https://www.github.com/googleapis/java-shared-config/issues/124)) ([a681536](https://www.github.com/googleapis/java-shared-config/commit/a68153643400c3f3b5c5959cda4dc3b552336427)) +* update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.1.2 ([#107](https://www.github.com/googleapis/java-shared-config/issues/107)) ([c9b096b](https://www.github.com/googleapis/java-shared-config/commit/c9b096b81b1f4f8dc2d1302f259f0321722e1ca5)) +* update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.0 ([#103](https://www.github.com/googleapis/java-shared-config/issues/103)) ([abe7140](https://www.github.com/googleapis/java-shared-config/commit/abe714060e858c70a83888fb34438c45d97b1168)) +* update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.1.0 ([#101](https://www.github.com/googleapis/java-shared-config/issues/101)) ([ac69572](https://www.github.com/googleapis/java-shared-config/commit/ac69572be76e4462fdf65fa6e7f0935c3d51d827)) + ## [0.4.0](https://www.github.com/googleapis/java-shared-config/compare/v0.3.1...v0.4.0) (2020-01-08) diff --git a/README.md b/README.md index 112982da..ae212a82 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.4.0 + 0.5.0 ``` diff --git a/pom.xml b/pom.xml index 42a2a252..196bd703 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.4.0 + 0.5.0 Google Cloud https://github.com/googleapis/java-shared-config @@ -101,6 +101,13 @@ org.apache.maven.plugins maven-enforcer-plugin 3.0.0-M3 + + + org.codehaus.mojo + extra-enforcer-rules + 1.2 + + org.codehaus.mojo @@ -170,7 +177,7 @@ org.apache.maven.plugins maven-site-plugin - 3.8.2 + 3.9.0 true @@ -183,18 +190,57 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.1.2 org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.1.0 org.codehaus.mojo clirr-maven-plugin 2.8 + + com.coveo + fmt-maven-plugin + 2.9 + + + true + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.2 + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + + oss + all + + remove + + + @@ -220,6 +266,14 @@ [1.7,) + + + compile + provided + + true + true + @@ -373,7 +427,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 html @@ -458,7 +512,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -520,12 +574,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.0 + 3.1.1 com.puppycrawl.tools checkstyle - 8.24 + 8.29 @@ -563,5 +617,100 @@ false + + devsite-apidocs + + + + devsite.template + + + + + + + maven-javadoc-plugin + + 3.1.1 + + + site + + aggregate + + + + + + com.google.doclava + doclava + 1.0.6 + + com.google.doclava.Doclava + ${sun.boot.class.path} + + + com.google.j2objc + j2objc-annotations + 1.3 + + + + -hdf + book.path + /java/_book.yaml + -hdf + project.path + /java/_project.yaml + -hdf + devsite.path + /java/reference/ + -d + ${project.build.directory}/devsite + -templatedir + ${devsite.template} + -toroot + /java/reference/ + -yaml + _toc.yaml + -warning + 101 + + false + + + + + maven-antrun-plugin + 1.8 + + + site + + run + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/renovate.json b/renovate.json index f3a70c97..03092819 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" }, @@ -53,12 +54,27 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-shared-config", + "^com.google.cloud:libraries-bom", + "^com.google.cloud.samples:shared-configuration" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" ], "ignoreUnstable": false + }, + { + "packagePatterns": [ + "^com.fasterxml.jackson.core" + ], + "groupName": "jackson dependencies" } ], "semanticCommits": true -} +} \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index b9c8a651..ea71b0e6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,509 +1,12 @@ { - "updateTime": "2020-01-07T09:14:19.430524Z", + "updateTime": "2020-03-25T23:36:14.700013Z", "sources": [ { - "template": { - "name": "java_library", - "origin": "synthtool.gcp", - "version": "2019.10.17" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } - ], - "newFiles": [ - { - "path": ".repo-metadata.json" - }, - { - "path": "renovate.json" - }, - { - "path": "license-checks.xml" - }, - { - "path": "synth.py" - }, - { - "path": "CHANGELOG.md" - }, - { - "path": "codecov.yaml" - }, - { - "path": "LICENSE" - }, - { - "path": ".gitignore" - }, - { - "path": "pom.xml" - }, - { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "synth.metadata" - }, - { - "path": "README.md" - }, - { - "path": "versions.txt" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": "java.header" - }, - { - "path": ".kokoro/build.bat" - }, - { - "path": ".kokoro/build.sh" - }, - { - "path": ".kokoro/dependencies.sh" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/coerce_logs.sh" - }, - { - "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/continuous/java11.cfg" - }, - { - "path": ".kokoro/continuous/common.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.cfg" - }, - { - "path": ".kokoro/continuous/java8.cfg" - }, - { - "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/presubmit/java8-win.cfg" - }, - { - "path": ".kokoro/presubmit/lint.cfg" - }, - { - "path": ".kokoro/presubmit/java11.cfg" - }, - { - "path": ".kokoro/presubmit/common.cfg" - }, - { - "path": ".kokoro/presubmit/clirr.cfg" - }, - { - "path": ".kokoro/presubmit/java8.cfg" - }, - { - "path": ".kokoro/presubmit/integration.cfg" - }, - { - "path": ".kokoro/nightly/dependencies.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" - }, - { - "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/description" - }, - { - "path": ".git/config" - }, - { - "path": ".git/shallow" - }, - { - "path": ".git/objects/9d/96c112a0c3d94a1f9ecbebe55601e4f831fd48" - }, - { - "path": ".git/objects/7f/f7c44d5bd90254d3cb8a27bf70cf96536e1522" - }, - { - "path": ".git/objects/7f/810ec7e8ea1917cce8e2aaef22568ec7f5b504" - }, - { - "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" - }, - { - "path": ".git/objects/b4/fe918239302fdbe75e0b2bd6c8b1690abf45df" - }, - { - "path": ".git/objects/1c/c91882b93da7fc5415bec586c39d7925d9d9ae" - }, - { - "path": ".git/objects/fa/dd6afc2dfdba6b3d35c169c9984ce1d5b58577" - }, - { - "path": ".git/objects/58/304f32127a995087a2a826d1786906321b13ca" - }, - { - "path": ".git/objects/87/efce51dfa359132d68c5932939de675d735699" - }, - { - "path": ".git/objects/86/efceb4f41f54ea29e3f03e9e0e23935de65ba7" - }, - { - "path": ".git/objects/80/6c23a2de9c7257d188e2c4810bcb1b5956f1e7" - }, - { - "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" - }, - { - "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" - }, - { - "path": ".git/objects/75/4446a93c59ffdd4d596ebaa06fc1e804993ee2" - }, - { - "path": ".git/objects/13/c74e459d6a9e58764c95e2e5915a5896bb3550" - }, - { - "path": ".git/objects/2a/c35459ecc11067adb615bf23bce3bbbc1fdeaf" - }, - { - "path": ".git/objects/42/7c14833e1ef4aa6885b691dffbfaf7a852dc62" - }, - { - "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" - }, - { - "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" - }, - { - "path": ".git/objects/cb/1ab503b7e35efde64bb3caa593e25d63c64a1d" - }, - { - "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" - }, - { - "path": ".git/objects/22/245df8165b6474dd8b5302a9dc89a7fa9b85c0" - }, - { - "path": ".git/objects/02/b713a06a557aa844f08472c8adf1a85d5c0b8e" - }, - { - "path": ".git/objects/c5/d99e7d09f1799f7f79e4082bb60265b3920235" - }, - { - "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" - }, - { - "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" - }, - { - "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" - }, - { - "path": ".git/objects/56/abc2c617b76bb3459b7aaba897a7fa3895f873" - }, - { - "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" - }, - { - "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" - }, - { - "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" - }, - { - "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" - }, - { - "path": ".git/objects/cc/8366024550d495ee4647c38c6a949749e3cb5c" - }, - { - "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" - }, - { - "path": ".git/objects/04/4a22c4fcbf96361549c7ef5ae1598665fc9297" - }, - { - "path": ".git/objects/8f/8965cb456479ec3bdf564ec09649f5b6ebd545" - }, - { - "path": ".git/objects/a9/39472e1c6b5ff7e2fc4598f93e817791af4ac3" - }, - { - "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" - }, - { - "path": ".git/objects/3b/7dd4b87832789f7ca852c05c5a8946a9a043ff" - }, - { - "path": ".git/objects/15/53fb75a8071df859400c4432ccaafe335dca95" - }, - { - "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" - }, - { - "path": ".git/objects/f5/9b9baf80e30bca82dece630058fc9ec0330edb" - }, - { - "path": ".git/objects/2c/137534ca56d41afd474eed8bb99d225a2ea99f" - }, - { - "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" - }, - { - "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" - }, - { - "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" - }, - { - "path": ".git/objects/5c/f31b784945c2dceba3bc4e3c65f1556a8772a2" - }, - { - "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" - }, - { - "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" - }, - { - "path": ".git/objects/6e/ec4f1b6242ecb08171565aa44df160bcb026f2" - }, - { - "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" - }, - { - "path": ".git/objects/14/f44ff859bbd675a7ca0d5627c1c30b636911fa" - }, - { - "path": ".git/objects/3e/124ff169a52928804ddf3bb4284feaafd120b5" - }, - { - "path": ".git/objects/23/aed64542bfda2f409508fc183c22b93db4d269" - }, - { - "path": ".git/objects/c2/2797880be8ef05daf57902c6cb9fa1161de820" - }, - { - "path": ".git/objects/ac/4f9feb31d02b11a085a18c6f0cb4041f9084f4" - }, - { - "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" - }, - { - "path": ".git/objects/9f/5a161066aedd679ec3a1c0ef5d56c835a3eb7e" - }, - { - "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" - }, - { - "path": ".git/objects/1e/0179ae282df70e05bab17db21e4abcd6426155" - }, - { - "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" - }, - { - "path": ".git/objects/27/f2c6306af5bcea9f358691f0b21f3cbb84ea35" - }, - { - "path": ".git/objects/fe/69c01c3931138d4ffdb4f02ee1370693703e7c" - }, - { - "path": ".git/objects/43/1f83037dcd18b9679e40ef0aac1297abdb21b2" - }, - { - "path": ".git/refs/remotes/origin/HEAD" - }, - { - "path": ".git/refs/heads/autosynth" - }, - { - "path": ".git/refs/heads/master" - }, - { - "path": ".git/hooks/pre-applypatch.sample" - }, - { - "path": ".git/hooks/pre-commit.sample" - }, - { - "path": ".git/hooks/fsmonitor-watchman.sample" - }, - { - "path": ".git/hooks/pre-rebase.sample" - }, - { - "path": ".git/hooks/update.sample" - }, - { - "path": ".git/hooks/pre-push.sample" - }, - { - "path": ".git/hooks/applypatch-msg.sample" - }, - { - "path": ".git/hooks/prepare-commit-msg.sample" - }, - { - "path": ".git/hooks/commit-msg.sample" - }, - { - "path": ".git/hooks/post-update.sample" - }, - { - "path": ".git/hooks/pre-receive.sample" - }, - { - "path": ".git/info/exclude" - }, - { - "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 diff --git a/synth.py b/synth.py index 2ac35459..d5717dc9 100644 --- a/synth.py +++ b/synth.py @@ -14,15 +14,13 @@ """This script is used to synthesize generated parts of this library.""" -import synthtool as s -import synthtool.gcp as gcp -import logging -logging.basicConfig(level=logging.DEBUG) -common_templates = gcp.CommonTemplates() -templates = common_templates.java_library() -s.copy(templates, excludes=[ - ".gitignore", +import synthtool.languages.java as java + +AUTOSYNTH_MULTIPLE_COMMITS = True + +java.common_templates(excludes=[ "README.md", ".github/release-please.yml", + "samples/*" ]) diff --git a/versions.txt b/versions.txt index f00d3627..62c14b0f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.4.0:0.4.0 +google-cloud-shared-config:0.5.0:0.5.0