diff --git a/.gitignore b/.gitignore index 53f53a3c..8072b73d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target/ __pycache__ +.flattened-pom.xml \ No newline at end of file diff --git a/.kokoro/common.sh b/.kokoro/common.sh index 8f09de5d..a8d0ea04 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -52,3 +52,8 @@ function retry_with_backoff { return $exit_code } + +## Helper functionss +function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } +function msg() { println "$*" >&2; } +function println() { printf '%s\n' "$(now) $*"; } \ No newline at end of file diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0aade871..cf3bb434 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -36,3 +36,51 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true + +echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" +## Run dependency list completeness check +function completenessCheck() { + # Output dep list with compile scope generated using the original pom + msg "Generating dependency list using original pom..." + mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt + + # Output dep list generated using the flattened pom (test scope deps are ommitted) + msg "Generating dependency list using flattened pom..." + mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + + # Compare two dependency lists + msg "Comparing dependency lists..." + diff .org-list.txt .new-list.txt >.diff.txt + if [[ $? == 0 ]] + then + msg "Success. No diff!" + else + msg "Diff found. See below: " + msg "You can also check .diff.txt file located in $1." + cat .diff.txt + return 1 + fi +} + +# Allow failures to continue running the script +set +e + +error_count=0 +for path in $(find -name ".flattened-pom.xml") +do + # Check flattened pom in each dir that contains it for completeness + dir=$(dirname "$path") + pushd "$dir" + completenessCheck "$dir" + error_count=$(($error_count + $?)) + popd +done + +if [[ $error_count == 0 ]] +then + msg "All checks passed." + exit 0 +else + msg "Errors found. See log statements above." + exit 1 +fi diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index ca027480..40c4abb7 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -10,20 +10,25 @@ env_vars: { key: "JOB_TYPE" value: "integration" } - +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" value: "gcloud-devel" } +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "ENABLE_BUILD_COP" value: "true" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index b4b051cd..20aabd55 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -11,9 +11,15 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index 141f90c1..522e5b10 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -11,14 +11,20 @@ env_vars: { value: "integration" } +# TODO: remove this after we've migrated all tests and scripts 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_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg index fa7b493d..1171aead 100644 --- a/.kokoro/presubmit/samples.cfg +++ b/.kokoro/presubmit/samples.cfg @@ -11,14 +11,20 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/CHANGELOG.md b/CHANGELOG.md index b84273ce..1cecfd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.127.0](https://www.github.com/googleapis/java-bigquerydatatransfer/compare/v0.126.1...v0.127.0) (2020-04-22) + + +### Features + +* implement flatten plugin in client, grpc, and proto modules ([#134](https://www.github.com/googleapis/java-bigquerydatatransfer/issues/134)) ([f63619e](https://www.github.com/googleapis/java-bigquerydatatransfer/commit/f63619e34f33845cbe14a8c23873e08f76c3add6)) +* replace parent pom deps with shared-deps ([#137](https://www.github.com/googleapis/java-bigquerydatatransfer/issues/137)) ([74ae665](https://www.github.com/googleapis/java-bigquerydatatransfer/commit/74ae6650a7ac2e24c1d8809db2531e63e99b0c86)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.2.0 ([#138](https://www.github.com/googleapis/java-bigquerydatatransfer/issues/138)) ([aae6297](https://www.github.com/googleapis/java-bigquerydatatransfer/commit/aae62971c9a90942b18df7fa67c00b6bf0931c7f)) + ## [0.126.0](https://www.github.com/googleapis/java-bigquerydatatransfer/compare/v0.125.2...v0.126.0) (2020-04-05) diff --git a/README.md b/README.md index 97730e5b..3a641486 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 4.4.1 + 5.1.0 pom import @@ -50,11 +50,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.126.0-beta' +compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.127.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.126.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.127.0-beta" ``` [//]: # ({x-version-update-end}) @@ -104,13 +104,13 @@ Java 7 or above is required for using this client. ## Versioning + This library follows [Semantic Versioning](http://semver.org/). It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable. - ## Contributing diff --git a/google-cloud-bigquerydatatransfer-bom/pom.xml b/google-cloud-bigquerydatatransfer-bom/pom.xml index 640eb7c2..e6fadb5f 100644 --- a/google-cloud-bigquerydatatransfer-bom/pom.xml +++ b/google-cloud-bigquerydatatransfer-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerydatatransfer-bom - 0.126.1-beta-SNAPSHOT + 0.127.0-beta pom com.google.cloud @@ -64,17 +64,17 @@ com.google.cloud google-cloud-bigquerydatatransfer - 0.126.1-beta-SNAPSHOT + 0.127.0-beta com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT + 0.92.0 com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT + 0.92.0 diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-bigquerydatatransfer/pom.xml index 4f05b9c7..5bd077de 100644 --- a/google-cloud-bigquerydatatransfer/pom.xml +++ b/google-cloud-bigquerydatatransfer/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerydatatransfer - 0.126.1-beta-SNAPSHOT + 0.127.0-beta jar BigQuery DataTransfer https://github.com/googleapis/java-bigquerydatatransfer @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerydatatransfer-parent - 0.126.1-beta-SNAPSHOT + 0.127.0-beta google-cloud-bigquerydatatransfer @@ -84,6 +84,15 @@ + + + + org.codehaus.mojo + flatten-maven-plugin + + + + java9 diff --git a/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml index b92d0cae..6de70d1d 100644 --- a/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml +++ b/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT + 0.92.0 grpc-google-cloud-bigquerydatatransfer-v1 GRPC library for grpc-google-cloud-bigquerydatatransfer-v1 com.google.cloud google-cloud-bigquerydatatransfer-parent - 0.126.1-beta-SNAPSHOT + 0.127.0-beta @@ -39,6 +39,15 @@ + + + + org.codehaus.mojo + flatten-maven-plugin + + + + java9 diff --git a/pom.xml b/pom.xml index 3456c95f..1f4c56b9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerydatatransfer-parent pom - 0.126.1-beta-SNAPSHOT + 0.127.0-beta BigQuery DataTransfer Parent https://github.com/googleapis/java-bigquerydatatransfer @@ -63,102 +63,31 @@ UTF-8 github google-cloud-bigquerydatatransfer-parent - 1.93.0 - 1.9.0 - 1.17.0 - 1.56.0 - 1.28.1 - 3.11.4 - 4.13 - 29.0-android - 1.4.3 - 1.3.2 - 1.18 - - com.google.api.grpc - proto-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT - - - com.google.api.grpc - grpc-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT - com.google.cloud - google-cloud-bigquerydatatransfer - 0.126.1-beta-SNAPSHOT - - - - io.grpc - grpc-bom - ${grpc.version} + google-cloud-shared-dependencies + 0.2.0 pom import - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} - pom - import - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.api - api-common - ${google.api-common.version} - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} + proto-google-cloud-bigquerydatatransfer-v1 + 0.92.0 - - junit - junit - ${junit.version} - test + com.google.api.grpc + grpc-google-cloud-bigquerydatatransfer-v1 + 0.92.0 - com.google.api - gax-grpc - ${gax.version} - testlib - test + com.google.cloud + google-cloud-bigquerydatatransfer + 0.127.0-beta diff --git a/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/proto-google-cloud-bigquerydatatransfer-v1/pom.xml index beae6d45..738909a9 100644 --- a/proto-google-cloud-bigquerydatatransfer-v1/pom.xml +++ b/proto-google-cloud-bigquerydatatransfer-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - 0.91.1-SNAPSHOT + 0.92.0 proto-google-cloud-bigquerydatatransfer-v1 PROTO library for proto-google-cloud-bigquerydatatransfer-v1 com.google.cloud google-cloud-bigquerydatatransfer-parent - 0.126.1-beta-SNAPSHOT + 0.127.0-beta @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a01f0561..2780e46b 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.15 + 1.0.17 diff --git a/samples/pom.xml b/samples/pom.xml index c1945161..33f6773e 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index bff5e45d..7734079f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 @@ -23,13 +23,14 @@ UTF-8 - + com.google.cloud google-cloud-bigquerydatatransfer - 0.126.0-beta + 0.127.0-beta + junit @@ -44,7 +45,6 @@ test - diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 842c71ff..cc0e1e54 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 4.4.1 + 5.1.0 pom import diff --git a/synth.metadata b/synth.metadata index d65a9cb7..080e934b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,18 +1,17 @@ { - "updateTime": "2020-04-09T08:52:14.384853Z", "sources": [ { "generator": { "name": "artman", - "version": "1.2.0", - "dockerImage": "googleapis/artman@sha256:ef1a5b367dbe1e37cea1c7c814c801a638473e8dd66f87f4a2b8c2a146013673" + "version": "2.0.0", + "dockerImage": "googleapis/artman@sha256:b3b47805231a305d0f40c4bf069df20f6a2635574e6d4259fac651d3f9f6e098" } }, { "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigquerydatatransfer.git", - "sha": "0d92b46c6bb022d0f7c58c13a1d5f4483713888d" + "sha": "f8205c363b8967096e178548eaccfc430c432e63" } }, { @@ -27,7 +26,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7f8e62aa3edd225f76347a16f92e400661fdfb52" + "sha": "f8a9933e5e98202b04ef427f28d1d79221190fa4" } } ], diff --git a/versions.txt b/versions.txt index 824cef1d..546636db 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-bigquerydatatransfer-v1:0.91.0:0.91.1-SNAPSHOT -grpc-google-cloud-bigquerydatatransfer-v1:0.91.0:0.91.1-SNAPSHOT -google-cloud-bigquerydatatransfer:0.126.0-beta:0.126.1-beta-SNAPSHOT +proto-google-cloud-bigquerydatatransfer-v1:0.92.0:0.92.0 +grpc-google-cloud-bigquerydatatransfer-v1:0.92.0:0.92.0 +google-cloud-bigquerydatatransfer:0.127.0-beta:0.127.0-beta