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..7e7eb303 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,19 +37,23 @@ 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 - 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 +63,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-dns +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_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/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/CHANGELOG.md b/CHANGELOG.md index e69e1271..a813623a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [0.117.5](https://www.github.com/googleapis/java-dns/compare/v0.117.4...v0.117.5) (2020-03-09) + + +### Dependencies + +* update core dependencies ([#77](https://www.github.com/googleapis/java-dns/issues/77)) ([728e621](https://www.github.com/googleapis/java-dns/commit/728e621f48963e24ec207d4f183f978911d18d6e)) +* update core dependencies to v1.92.5 ([#67](https://www.github.com/googleapis/java-dns/issues/67)) ([e24352c](https://www.github.com/googleapis/java-dns/commit/e24352c4f6e278060a8c519d49b62cf926da7b8b)) +* update core dependencies to v1.93.1 ([#79](https://www.github.com/googleapis/java-dns/issues/79)) ([34d5b80](https://www.github.com/googleapis/java-dns/commit/34d5b80e17fcf7199fcfbfa6bfd6282c2669d3bf)) +* update dependency com.google.api-client:google-api-client-bom to v1.30.9 ([#78](https://www.github.com/googleapis/java-dns/issues/78)) ([be62767](https://www.github.com/googleapis/java-dns/commit/be62767359b5c1bdb7653ff67ff7722787c95aa6)) +* update dependency com.google.apis:google-api-services-dns to v1-rev20191205-1.30.8 ([#70](https://www.github.com/googleapis/java-dns/issues/70)) ([48095c8](https://www.github.com/googleapis/java-dns/commit/48095c877ba1e69446797e648710de68a069e6de)) +* update dependency com.google.apis:google-api-services-dns to v1-rev20191205-1.30.9 ([#80](https://www.github.com/googleapis/java-dns/issues/80)) ([05cc1df](https://www.github.com/googleapis/java-dns/commit/05cc1dff78cab80fc0ff84d9e64c0bcd67c35fc4)) +* update dependency com.google.http-client:google-http-client-bom to v1.34.2 ([cc62e72](https://www.github.com/googleapis/java-dns/commit/cc62e72fe39e692333f7279816f3084e7a341114)) + ### [0.117.4](https://www.github.com/googleapis/java-dns/compare/v0.117.3...v0.117.4) (2020-02-04) diff --git a/README.md b/README.md index aa1bcde0..5cd0272c 100644 --- a/README.md +++ b/README.md @@ -40,16 +40,16 @@ If you are using Maven without a BOM, add this to your dependencies. com.google.cloud google-cloud-dns - 0.117.4-alpha + 0.117.5-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dns:0.117.4-alpha' +compile 'com.google.cloud:google-cloud-dns:0.117.5-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.117.4-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.117.5-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/pom.xml b/pom.xml index b59342ca..adeaf726 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dns jar - 0.117.4-alpha + 0.117.5-alpha Google Cloud DNS Parent https://github.com/googleapis/java-dns @@ -63,11 +63,11 @@ UTF-8 github google-cloud-dns-parent - 1.92.4 + 1.93.1 1.8.1 1.17.0 0.20.0 - 1.53.1 + 1.54.0 4.13 28.2-android 1.4.1 @@ -95,14 +95,14 @@ com.google.http-client google-http-client-bom - 1.34.1 + 1.34.2 pom import com.google.api-client google-api-client-bom - 1.30.8 + 1.30.9 pom import @@ -132,7 +132,7 @@ com.google.apis google-api-services-dns - v1-rev20191205-1.30.3 + v1-rev20191205-1.30.9 com.google.api-client diff --git a/renovate.json b/renovate.json index 268a4669..fc641270 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 e7aad9af..0131e892 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,11 +1,11 @@ { - "updateTime": "2020-02-01T08:48:08.674168Z", + "updateTime": "2020-02-24T22:52:05.608802Z", "sources": [ { "template": { "name": "java_library", "origin": "synthtool.gcp", - "version": "2019.10.17" + "version": "2020.2.4" } } ] diff --git a/versions.txt b/versions.txt index 149dadcb..248581c3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-dns:0.117.4-alpha:0.117.4-alpha \ No newline at end of file +google-cloud-dns:0.117.5-alpha:0.117.5-alpha \ No newline at end of file