From df609838f708603575086eee0d1fd53f40283e43 Mon Sep 17 00:00:00 2001 From: vam Date: Fri, 27 Apr 2018 10:23:05 -0700 Subject: [PATCH 1/6] Cleanup pom.xml's, remove google-cloud-util module --- google-cloud-bigquerydatatransfer/pom.xml | 58 --- google-cloud-bigtable/pom.xml | 42 -- google-cloud-bom/pom.xml | 481 ++++++++---------- google-cloud-container/pom.xml | 58 --- google-cloud-dataproc/pom.xml | 58 --- google-cloud-dialogflow/pom.xml | 61 --- google-cloud-dlp/pom.xml | 61 --- google-cloud-errorreporting/pom.xml | 61 --- google-cloud-firestore/pom.xml | 60 --- google-cloud-language/pom.xml | 68 +-- google-cloud-logging/pom.xml | 61 --- google-cloud-monitoring/pom.xml | 61 --- google-cloud-notification/pom.xml | 62 +-- google-cloud-os-login/pom.xml | 58 --- google-cloud-pubsub/pom.xml | 58 --- google-cloud-spanner/pom.xml | 2 +- google-cloud-speech/pom.xml | 61 --- google-cloud-texttospeech/pom.xml | 61 --- google-cloud-trace/pom.xml | 61 --- google-cloud-util/README.md | 5 - .../google-cloud-compat-checker/README.md | 41 -- .../google-cloud-compat-checker/pom.xml | 99 ---- .../GoogleCloudCompatChecker.java | 134 ----- google-cloud-util/pom.xml | 21 - google-cloud-video-intelligence/pom.xml | 61 --- google-cloud-vision/pom.xml | 61 --- pom.xml | 31 +- utilities/replace_versions.py | 5 +- versions.txt | 91 +++- 29 files changed, 346 insertions(+), 1696 deletions(-) delete mode 100644 google-cloud-util/README.md delete mode 100644 google-cloud-util/google-cloud-compat-checker/README.md delete mode 100644 google-cloud-util/google-cloud-compat-checker/pom.xml delete mode 100644 google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java delete mode 100644 google-cloud-util/pom.xml diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-bigquerydatatransfer/pom.xml index 213c673dc723..90f317699f2e 100644 --- a/google-cloud-bigquerydatatransfer/pom.xml +++ b/google-cloud-bigquerydatatransfer/pom.xml @@ -85,62 +85,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 795e57c3c3f5..3c5048bfb8f6 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -111,22 +111,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - org.apache.maven.plugins maven-failsafe-plugin @@ -145,32 +129,6 @@ 2 - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index f6262e24a299..870533c59781 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -92,6 +92,22 @@ Developer + + andreamlin + Andrea Lin + andrealin@google.com + + Developer + + + + hzyi-google + Hanzhen Yi + hzyi@google.com + + Developer + + Google @@ -123,817 +139,766 @@ https://raw.githubusercontent.com/GoogleCloudPlatform/google-cloud-java/master/LICENSE - - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 1.27.1-SNAPSHOT - 1.27.1-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 1.27.1-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 1.27.1-SNAPSHOT - 0.45.1-beta-SNAPSHOT - 1.27.1-SNAPSHOT - - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - 0.45.1-alpha-SNAPSHOT - - 1.5.0 - 1.23.0 - 1.23.0 - 0.40.0 - 0.10.0 - 1.9.0 - + + + com.google.api + api-common + 1.5.0 + + + com.google.api + gax + 1.23.0 + + + com.google.api + gax-grpc + 1.23.0 + + + com.google.api + gax-grpc + 1.23.0 + testlib + + + com.google.api + gax-httpjson + 0.40.0 + + + com.google.api + gax-httpjson + 0.40.0 + testlib + + + com.google.api.grpc + proto-google-common-protos + 1.9.0 + + + com.google.api.grpc + grpc-google-common-protos + 1.9.0 + + + com.google.api.grpc + proto-google-iam-v1 + 0.10.0 + + + com.google.api.grpc + grpc-google-iam-v1 + 0.10.0 + + + com.google.cloud google-cloud - ${cloud.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud - ${cloud.version} + 0.45.1-alpha-SNAPSHOT test-jar - com.google.cloud google-cloud-bigtable - ${bigtable.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-bigtable - ${bigtable.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigtable-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-bigquery - ${bigquery.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-bigquery - ${bigquery.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-bigquerydatatransfer - ${bigquerydatatransfer.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-bigquerydatatransfer - ${bigquerydatatransfer.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-compute - ${compute.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-compute - ${compute.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-container - ${container.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-container - ${container.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-container-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-contrib - ${contrib.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-contrib - ${contrib.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-nio - ${contrib.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-nio - ${contrib.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-core - ${core.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-core - ${core.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-grpc - ${core-grpc.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - ${core-grpc.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-http - ${core-http.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-core-http - ${core-http.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-dataproc - ${dataproc.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-dataproc - ${dataproc.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dataproc-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dataproc-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-datastore - ${datastore.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-datastore - ${datastore.version} + 1.27.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-datastore-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-dlp - ${dlp.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-dlp - ${dlp.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dlp-v2beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dlp-v2beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dlp-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dlp-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-dialogflow - ${dialogflow.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-dialogflow - ${dialogflow.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dialogflow-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-dns - ${dns.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-dns - ${dns.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-errorreporting - ${errorreporting.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-errorreporting - ${errorreporting.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-examples - ${examples.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-examples - ${examples.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-firestore - ${firestore.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-firestore - ${firestore.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-firestore-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-language - ${language.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-language - ${language.version} + 1.27.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-language-v1 - ${generated-proto-ga.version} + 1.9.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-language-v1beta2 - ${generated-proto-beta.version} + grpc-google-cloud-language-v1 + 1.9.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-language-v1 - ${generated-proto-ga.version} + proto-google-cloud-language-v1beta2 + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1beta2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-logging - ${logging.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-logging - ${logging.version} + 1.27.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-logging-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-logging-logback - ${logging-logback.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-monitoring - ${monitoring.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-monitoring - ${monitoring.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-monitoring-v3 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-monitoring-v3 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-os-login - ${os-login.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-os-login - ${os-login.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-os-login-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-os-login-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-pubsub - ${pubsub.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-pubsub - ${pubsub.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-pubsub-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-resourcemanager - ${resourcemanager.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-resourcemanager - ${resourcemanager.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-spanner - ${spanner.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-spanner - ${spanner.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-spanner-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-spanner-admin-database-v1 - ${generated-proto-beta.version} + grpc-google-cloud-spanner-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-spanner-admin-instance-v1 - ${generated-proto-beta.version} + proto-google-cloud-spanner-admin-database-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-spanner-v1 - ${generated-proto-beta.version} + grpc-google-cloud-spanner-admin-database-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-spanner-admin-database-v1 - ${generated-proto-beta.version} + proto-google-cloud-spanner-admin-instance-v1 + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-speech - ${speech.version} + 0.45.1-alpha-SNAPSHOT com.google.cloud google-cloud-speech - ${speech.version} + 0.45.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-speech-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-speech-v1p1beta1 - ${generated-proto-beta.version} + grpc-google-cloud-speech-v1beta1 + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-speech-v1 - ${generated-proto-beta.version} + proto-google-cloud-speech-v1p1beta1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-speech-v1beta1 - ${generated-proto-beta.version} + grpc-google-cloud-speech-v1p1beta1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-speech-v1p1beta1 - ${generated-proto-beta.version} + proto-google-cloud-speech-v1 + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-storage - ${storage.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-storage - ${storage.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-texttospeech - ${texttospeech.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-texttospeech - ${texttospeech.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-trace - ${trace.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-trace - ${trace.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-trace-v1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-cloud-trace-v2 - ${generated-proto-beta.version} + grpc-google-cloud-trace-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-trace-v1 - ${generated-proto-beta.version} + proto-google-cloud-trace-v2 + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-trace-v2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.cloud google-cloud-translate - ${translate.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-translate - ${translate.version} + 1.27.1-SNAPSHOT test-jar com.google.cloud google-cloud-vision - ${vision.version} + 1.27.1-SNAPSHOT com.google.cloud google-cloud-vision - ${vision.version} + 1.27.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-vision-v1 - ${generated-proto-ga.version} + 1.9.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1 - ${generated-proto-ga.version} + 1.9.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - ${generated-proto-ga.version} + 1.9.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - ${generated-proto-ga.version} + 1.9.1-SNAPSHOT com.google.cloud google-cloud-video-intelligence - ${video-intelligence.version} + 0.45.1-beta-SNAPSHOT com.google.cloud google-cloud-video-intelligence - ${video-intelligence.version} + 0.45.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-video-intelligence-v1beta1 - ${generated-proto-beta.version} - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1beta2 - ${generated-proto-beta.version} - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1 - ${generated-proto-beta.version} - - - com.google.api.grpc - proto-google-cloud-video-intelligence-v1p1beta1 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta1 - ${generated-proto-beta.version} - - - com.google.api.grpc - grpc-google-cloud-video-intelligence-v1beta2 - ${generated-proto-beta.version} + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-video-intelligence-v1 - ${generated-proto-beta.version} + proto-google-cloud-video-intelligence-v1beta2 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-cloud-video-intelligence-v1p1beta1 - ${generated-proto-beta.version} + grpc-google-cloud-video-intelligence-v1beta2 + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-common-protos - ${generated-proto-ga.version} + proto-google-cloud-video-intelligence-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-common-protos - ${generated-proto-ga.version} + grpc-google-cloud-video-intelligence-v1 + 0.10.1-SNAPSHOT com.google.api.grpc - proto-google-iam-v1 - ${generated-proto-beta.version} + proto-google-cloud-video-intelligence-v1p1beta1 + 0.10.1-SNAPSHOT com.google.api.grpc - grpc-google-iam-v1 - ${generated-proto-beta.version} - - - com.google.api - api-common - ${api-common.version} - - - com.google.api - gax - ${gax.version} - - - com.google.api - gax-grpc - ${gax-grpc.version} - - - com.google.api - gax-grpc - ${gax-grpc.version} - testlib - - - com.google.api - gax-httpjson - ${gax-httpjson.version} - - - com.google.api - gax-httpjson - ${gax-httpjson.version} - testlib + grpc-google-cloud-video-intelligence-v1p1beta1 + 0.10.1-SNAPSHOT diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index df42cb032cae..22a450a1221c 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -85,62 +85,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml index 996c686212b7..a1ffa73a0645 100644 --- a/google-cloud-dataproc/pom.xml +++ b/google-cloud-dataproc/pom.xml @@ -84,62 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index 00caa39345d3..2f996a1a7c50 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -84,65 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-dlp/pom.xml b/google-cloud-dlp/pom.xml index ceb5e76c9378..95e291cbc5e2 100644 --- a/google-cloud-dlp/pom.xml +++ b/google-cloud-dlp/pom.xml @@ -84,65 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 738f01af2503..dda38f247539 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -75,65 +75,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index bf9fcf9e706f..c80ada697a62 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -94,64 +94,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - - add-source - - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 8489ffdb98a3..febb5e1f8c79 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -1,11 +1,14 @@ - + 4.0.0 google-cloud-language 1.27.1-SNAPSHOT jar Google Cloud Natural Language - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language + Java idiomatic client for Google Cloud Natural Language. @@ -84,65 +87,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index e2bfd0132095..e257888b061f 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -84,65 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index ed5fdca04cd2..62728fe66281 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -75,65 +75,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-notification/pom.xml b/google-cloud-notification/pom.xml index 70dd6b1db517..a5d060f92b7b 100644 --- a/google-cloud-notification/pom.xml +++ b/google-cloud-notification/pom.xml @@ -6,7 +6,7 @@ google-cloud-notification 0.45.1-beta-SNAPSHOT jar - Google Cloud Pub/Sub Notifications for Google Cloud Storage + Google Cloud Pub/Sub Notifications for GCS https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification @@ -83,64 +83,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - - add-source - - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml index b39f4c2da512..b919cf10a9a7 100644 --- a/google-cloud-os-login/pom.xml +++ b/google-cloud-os-login/pom.xml @@ -84,62 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 0d0a9b266858..a615e0b3cedc 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -89,62 +89,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index eeb62f39fe4a..e76e1bd470b9 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -32,7 +32,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.18.1 + 2.19.1 com.google.cloud.spanner.GceTestEnvConfig diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index a9cb36a1f0d9..e918cdd04795 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -98,65 +98,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-texttospeech/pom.xml index f97b08053ac4..12297d923e0c 100644 --- a/google-cloud-texttospeech/pom.xml +++ b/google-cloud-texttospeech/pom.xml @@ -75,65 +75,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 5cf30a399fe2..1ed194189c49 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -84,65 +84,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-util/README.md b/google-cloud-util/README.md deleted file mode 100644 index da7275636606..000000000000 --- a/google-cloud-util/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Google Cloud Java Utils -========================== - -Google Cloud Java Utils is a module containing other modules with -utilities for use with Google Cloud Java. diff --git a/google-cloud-util/google-cloud-compat-checker/README.md b/google-cloud-util/google-cloud-compat-checker/README.md deleted file mode 100644 index 9150d3941377..000000000000 --- a/google-cloud-util/google-cloud-compat-checker/README.md +++ /dev/null @@ -1,41 +0,0 @@ -Google Cloud Java Compatibility Checker -========================== - -The Google Cloud Java Compatibility Checker is a utility to check -compatibility of your environment with grpc-based clients in Google -Cloud Java (e.g. Pub/Sub, Vision, Speech, and others). - -Usage: - -``` -git clone https://github.com/GoogleCloudPlatform/google-cloud-java.git -cd google-cloud-java/google-cloud-util/google-cloud-compat-checker -mvn install -mvn exec:java -``` - -The output should look something like this: - -``` -OS details: - os.detected.name: linux - os.detected.arch: x86_64 - os.detected.classifier: linux-x86_64 - os.detected.release: ubuntu - os.detected.release.version: 14.04 -JVM details: - Java version: 1.8.0_144-b01 - Java specification version: 1.8 - JVM bit mode: 64 -OpenSSL details: - open ssl is available: true - ALPN is supported: true -Checking compatibility... - [PASS] This OS + architecture is supported. - [PASS] 64-bit JVM is supported. - [PASS] Open SSL is available - [PASS] Open SSL ALPN is supported -Result: UNKNOWN (checker implementation not complete) - Based on what was checked, nothing was identified that would - prevent you from using grpc-based APIs. -``` diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml deleted file mode 100644 index c9f8951a1241..000000000000 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - 4.0.0 - google-cloud-compat-checker - 0.45.1-alpha-SNAPSHOT - jar - Google Cloud Java Compatibility Checker - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker - - Compatibility checker for Google Cloud Java. - - - com.google.cloud - google-cloud-util - 0.45.1-alpha-SNAPSHOT - - - google-cloud-compat-checker - - - - io.netty - netty-tcnative-boringssl-static - - - - kr.motd.maven - os-maven-plugin - 1.4.0.Final - - - org.codehaus.plexus - plexus-utils - - - io.netty - netty-handler - 4.1.11.Final - - - - - - org.codehaus.plexus - plexus-utils - 3.0.17 - - - - - - - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - - java - - - - - com.google.cloud.compatchecker.GoogleCloudCompatChecker - false - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - checkstyle - validate - - check - - - true - - - - - - - diff --git a/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java b/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java deleted file mode 100644 index b86f53cd3035..000000000000 --- a/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright 2017 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. - */ -package com.google.cloud.compatchecker; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import io.netty.handler.ssl.OpenSsl; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import kr.motd.maven.os.Detector; - -public class GoogleCloudCompatChecker { - private static Set supportedClassifiers = - ImmutableSet.of("linux-x86_64", "osx-x86_64", "windows-x86_64"); - - private static class OsDetector extends Detector { - public void detect(Properties props, List classifierWithLikes) { - super.detect(props, classifierWithLikes); - } - - @Override - protected void log(String s) { - // meh - } - - @Override - protected void logProperty(String s, String s1) { - // meh - } - } - - public static void main(String[] args) { - if (!check()) { - System.exit(1); - } - } - - public static boolean check() { - Properties osProperties = new Properties(); - new OsDetector().detect(osProperties, Lists.newArrayList()); - - String bitMode = System.getProperty("sun.arch.data.model"); - - boolean openSslIsAvailable = OpenSsl.isAvailable(); - boolean openSslAlpnIsSupported = OpenSsl.isAlpnSupported(); - String javaVersion = Runtime.class.getPackage().getImplementationVersion(); - String javaSpecificationVersion = System.getProperty("java.specification.version"); - - System.out.println("OS details:"); - System.out.println(" " + Detector.DETECTED_NAME + ": " + osProperties.get(Detector.DETECTED_NAME)); - System.out.println(" " + Detector.DETECTED_ARCH + ": " + osProperties.get(Detector.DETECTED_ARCH)); - System.out.println(" " + Detector.DETECTED_CLASSIFIER + ": " + osProperties.get(Detector.DETECTED_CLASSIFIER)); - System.out.println(" " + Detector.DETECTED_RELEASE + ": " + osProperties.get(Detector.DETECTED_RELEASE)); - System.out.println(" " + Detector.DETECTED_RELEASE_VERSION + ": " + osProperties.get(Detector.DETECTED_RELEASE_VERSION)); - System.out.println("JVM details:"); - System.out.println(" Java version: " + javaVersion); - System.out.println(" Java specification version: " + javaSpecificationVersion); - System.out.println(" JVM bit mode: " + bitMode); - System.out.println("OpenSSL details:"); - System.out.println(" open ssl is available: " + openSslIsAvailable); - System.out.println(" ALPN is supported: " + openSslAlpnIsSupported); - - String osClassifier = (String)osProperties.get(Detector.DETECTED_CLASSIFIER); - - boolean compatible = true; - boolean warnings = false; - System.out.println("Checking compatibility..."); - if (supportedClassifiers.contains(osClassifier)) { - System.out.println(" [PASS] This OS + architecture is supported."); - } else { - System.out.println(" [FAIL] This OS + architecture is NOT supported."); - compatible = false; - } - if (bitMode.equals("64")) { - System.out.println(" [PASS] 64-bit JVM is supported."); - } else { - System.out.println(" [FAIL] " + bitMode + "-bit JVM is NOT supported."); - compatible = false; - } - if (openSslIsAvailable) { - System.out.println(" [PASS] Open SSL is available"); - } else { - System.out.println(" [FAIL] Open SSL is NOT available"); - if (OpenSsl.unavailabilityCause() != null) { - System.out.println(" Open SSL Unavailability cause:"); - OpenSsl.unavailabilityCause().printStackTrace(System.out); - } - compatible = false; - } - if (openSslAlpnIsSupported) { - System.out.println(" [PASS] Open SSL ALPN is supported"); - } else { - System.out.println(" [FAIL] Open SSL ALPN is NOT supported"); - compatible = false; - } - if (javaSpecificationVersion == null) { - System.out.println(" [WARN] Couldn't detect java specification version."); - warnings = true; - } else if (javaSpecificationVersion.equals("1.7")) { - System.out.println(" [WARN] gRPC doesn't work on Google App Engine Standard under Java 1.7"); - warnings = true; - } - if (!compatible) { - System.out.println("Result: FAIL"); - System.out.println(" Your environment is not supported by Forked Tomcat Native."); - System.out.println(" See http://netty.io/wiki/forked-tomcat-native.html for details."); - System.out.println(" This means that you won't be able to use grpc-based APIs, but"); - System.out.println(" http1-based APIs should still work."); - } else { - System.out.println("Result: UNKNOWN (checker implementation not complete)"); - System.out.println(" Based on what was checked, nothing was identified that would"); - System.out.println(" prevent you from using grpc-based APIs."); - if (warnings) { - System.out.println(" However, there were some warnings to watch out for."); - } - } - - return compatible; - } -} diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml deleted file mode 100644 index ac492dfc05ef..000000000000 --- a/google-cloud-util/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-util - 0.45.1-alpha-SNAPSHOT - pom - Google Cloud Util - https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util - - Package that contains utility modules for Google Cloud Java. - - - com.google.cloud - google-cloud-pom - 0.45.1-alpha-SNAPSHOT - - - google-cloud-compat-checker - - diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-video-intelligence/pom.xml index 2f84a33dc42d..9254c48e642f 100644 --- a/google-cloud-video-intelligence/pom.xml +++ b/google-cloud-video-intelligence/pom.xml @@ -102,65 +102,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index 1f43c69f5293..1a9dfac08edc 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -93,65 +93,4 @@ test - - - doclint-java8-disable - - [1.8,) - - - - -Xdoclint:none - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - generate-sources - add-source - - - generated/src/main/java - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - ${javadoc.opts} - - - - - - maven-compiler-plugin - - - - 3.1 - - 1.7 - 1.7 - UTF-8 - -Xlint:unchecked - - - - diff --git a/pom.xml b/pom.xml index 4379b2b7dcef..4aa02782c8af 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.google.cloud google-cloud-pom @@ -92,10 +94,25 @@ Developer + + andreamlin + Andrea Lin + andrealin@google.com + + Developer + + + + hzyi-google + Hanzhen Yi + hzyi@google.com + + Developer + + - - Google + Google LLC scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git @@ -128,8 +145,8 @@ - Google Cloud Software License - https://raw.githubusercontent.com/GoogleCloudPlatform/google-cloud-java/master/LICENSE + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt @@ -428,8 +445,6 @@ google-cloud-translate google-cloud-vision google-cloud-video-intelligence - - google-cloud-util google-cloud + jar + Google Cloud Java Compatibility Checker + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker + + Compatibility checker for Google Cloud Java. + + + com.google.cloud + google-cloud-util + 0.45.1-alpha-SNAPSHOT + + + google-cloud-compat-checker + + + + io.netty + netty-tcnative-boringssl-static + + + + kr.motd.maven + os-maven-plugin + 1.4.0.Final + + + org.codehaus.plexus + plexus-utils + + + io.netty + netty-handler + 4.1.11.Final + + + + + + org.codehaus.plexus + plexus-utils + 3.0.17 + + + + + + + maven-compiler-plugin + 3.5.1 + + 1.7 + 1.7 + UTF-8 + -Xlint:unchecked + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + java + + + + + com.google.cloud.compatchecker.GoogleCloudCompatChecker + false + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + checkstyle + validate + + check + + + true + + + + + + + diff --git a/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java b/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java new file mode 100644 index 000000000000..b86f53cd3035 --- /dev/null +++ b/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java @@ -0,0 +1,134 @@ +/* + * Copyright 2017 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. + */ +package com.google.cloud.compatchecker; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import io.netty.handler.ssl.OpenSsl; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import kr.motd.maven.os.Detector; + +public class GoogleCloudCompatChecker { + private static Set supportedClassifiers = + ImmutableSet.of("linux-x86_64", "osx-x86_64", "windows-x86_64"); + + private static class OsDetector extends Detector { + public void detect(Properties props, List classifierWithLikes) { + super.detect(props, classifierWithLikes); + } + + @Override + protected void log(String s) { + // meh + } + + @Override + protected void logProperty(String s, String s1) { + // meh + } + } + + public static void main(String[] args) { + if (!check()) { + System.exit(1); + } + } + + public static boolean check() { + Properties osProperties = new Properties(); + new OsDetector().detect(osProperties, Lists.newArrayList()); + + String bitMode = System.getProperty("sun.arch.data.model"); + + boolean openSslIsAvailable = OpenSsl.isAvailable(); + boolean openSslAlpnIsSupported = OpenSsl.isAlpnSupported(); + String javaVersion = Runtime.class.getPackage().getImplementationVersion(); + String javaSpecificationVersion = System.getProperty("java.specification.version"); + + System.out.println("OS details:"); + System.out.println(" " + Detector.DETECTED_NAME + ": " + osProperties.get(Detector.DETECTED_NAME)); + System.out.println(" " + Detector.DETECTED_ARCH + ": " + osProperties.get(Detector.DETECTED_ARCH)); + System.out.println(" " + Detector.DETECTED_CLASSIFIER + ": " + osProperties.get(Detector.DETECTED_CLASSIFIER)); + System.out.println(" " + Detector.DETECTED_RELEASE + ": " + osProperties.get(Detector.DETECTED_RELEASE)); + System.out.println(" " + Detector.DETECTED_RELEASE_VERSION + ": " + osProperties.get(Detector.DETECTED_RELEASE_VERSION)); + System.out.println("JVM details:"); + System.out.println(" Java version: " + javaVersion); + System.out.println(" Java specification version: " + javaSpecificationVersion); + System.out.println(" JVM bit mode: " + bitMode); + System.out.println("OpenSSL details:"); + System.out.println(" open ssl is available: " + openSslIsAvailable); + System.out.println(" ALPN is supported: " + openSslAlpnIsSupported); + + String osClassifier = (String)osProperties.get(Detector.DETECTED_CLASSIFIER); + + boolean compatible = true; + boolean warnings = false; + System.out.println("Checking compatibility..."); + if (supportedClassifiers.contains(osClassifier)) { + System.out.println(" [PASS] This OS + architecture is supported."); + } else { + System.out.println(" [FAIL] This OS + architecture is NOT supported."); + compatible = false; + } + if (bitMode.equals("64")) { + System.out.println(" [PASS] 64-bit JVM is supported."); + } else { + System.out.println(" [FAIL] " + bitMode + "-bit JVM is NOT supported."); + compatible = false; + } + if (openSslIsAvailable) { + System.out.println(" [PASS] Open SSL is available"); + } else { + System.out.println(" [FAIL] Open SSL is NOT available"); + if (OpenSsl.unavailabilityCause() != null) { + System.out.println(" Open SSL Unavailability cause:"); + OpenSsl.unavailabilityCause().printStackTrace(System.out); + } + compatible = false; + } + if (openSslAlpnIsSupported) { + System.out.println(" [PASS] Open SSL ALPN is supported"); + } else { + System.out.println(" [FAIL] Open SSL ALPN is NOT supported"); + compatible = false; + } + if (javaSpecificationVersion == null) { + System.out.println(" [WARN] Couldn't detect java specification version."); + warnings = true; + } else if (javaSpecificationVersion.equals("1.7")) { + System.out.println(" [WARN] gRPC doesn't work on Google App Engine Standard under Java 1.7"); + warnings = true; + } + if (!compatible) { + System.out.println("Result: FAIL"); + System.out.println(" Your environment is not supported by Forked Tomcat Native."); + System.out.println(" See http://netty.io/wiki/forked-tomcat-native.html for details."); + System.out.println(" This means that you won't be able to use grpc-based APIs, but"); + System.out.println(" http1-based APIs should still work."); + } else { + System.out.println("Result: UNKNOWN (checker implementation not complete)"); + System.out.println(" Based on what was checked, nothing was identified that would"); + System.out.println(" prevent you from using grpc-based APIs."); + if (warnings) { + System.out.println(" However, there were some warnings to watch out for."); + } + } + + return compatible; + } +} diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml new file mode 100644 index 000000000000..ac492dfc05ef --- /dev/null +++ b/google-cloud-util/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + com.google.cloud + google-cloud-util + 0.45.1-alpha-SNAPSHOT + pom + Google Cloud Util + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util + + Package that contains utility modules for Google Cloud Java. + + + com.google.cloud + google-cloud-pom + 0.45.1-alpha-SNAPSHOT + + + google-cloud-compat-checker + + From 2031a2e9dcbe8aaf3fcbfdfa0b0d57950d01020c Mon Sep 17 00:00:00 2001 From: vam Date: Fri, 27 Apr 2018 13:11:32 -0700 Subject: [PATCH 4/6] Fix versions --- google-cloud-bom/pom.xml | 134 +++++++++++++++++++-------------------- versions.txt | 92 +++++++++++++-------------- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 870533c59781..b91d6c034213 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -221,22 +221,22 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -263,12 +263,12 @@ com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -295,12 +295,12 @@ com.google.api.grpc proto-google-cloud-container-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-container-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -371,12 +371,12 @@ com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -392,7 +392,7 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -408,22 +408,22 @@ com.google.api.grpc proto-google-cloud-dlp-v2beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-dlp-v2beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-dlp-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-dlp-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -439,22 +439,22 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-dialogflow-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -481,12 +481,12 @@ com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -513,12 +513,12 @@ com.google.api.grpc proto-google-cloud-firestore-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-firestore-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -534,22 +534,22 @@ com.google.api.grpc proto-google-cloud-language-v1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.api.grpc grpc-google-cloud-language-v1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -565,12 +565,12 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -592,12 +592,12 @@ com.google.api.grpc proto-google-cloud-monitoring-v3 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-monitoring-v3 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -613,12 +613,12 @@ com.google.api.grpc proto-google-cloud-os-login-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-os-login-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -634,12 +634,12 @@ com.google.api.grpc proto-google-cloud-pubsub-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-pubsub-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -666,32 +666,32 @@ com.google.api.grpc proto-google-cloud-spanner-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -707,32 +707,32 @@ com.google.api.grpc proto-google-cloud-speech-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-speech-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-speech-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-speech-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-speech-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-speech-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -759,12 +759,12 @@ com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -780,22 +780,22 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-trace-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-trace-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-trace-v2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.cloud @@ -822,32 +822,32 @@ com.google.api.grpc proto-google-cloud-vision-v1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.9.1-SNAPSHOT + 1.10.0 com.google.cloud @@ -863,42 +863,42 @@ com.google.api.grpc proto-google-cloud-video-intelligence-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-video-intelligence-v1beta2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta2 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-video-intelligence-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-video-intelligence-v1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc proto-google-cloud-video-intelligence-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 com.google.api.grpc grpc-google-cloud-video-intelligence-v1p1beta1 - 0.10.1-SNAPSHOT + 0.11.0 diff --git a/versions.txt b/versions.txt index d3ab7a70133f..efffc85b2377 100644 --- a/versions.txt +++ b/versions.txt @@ -88,50 +88,50 @@ proto-google-cloud-vision-v1p2beta1:1.10.0:1.10.0 # google-cloud-pom versions # # parent -google-cloud-pom:0.46.0-alpha:0.46.0-alpha +google-cloud-pom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT # children -google-cloud-appengineflexcompat:0.46.0-alpha:0.46.0-alpha -google-cloud-appengineflexcustom:0.46.0-alpha:0.46.0-alpha -google-cloud-appengineflexjava:0.46.0-alpha:0.46.0-alpha -google-cloud-appenginejava8:0.46.0-alpha:0.46.0-alpha -google-cloud:0.46.0-alpha:0.46.0-alpha -google-cloud-bigquery:1.28.0:1.28.0 -google-cloud-bigquerydatatransfer:0.46.0-beta:0.46.0-beta -google-cloud-bigtable:0.46.0-alpha:0.46.0-alpha -google-cloud-bom:0.46.0-alpha:0.46.0-alpha -google-cloud-compat-checker:0.46.0-alpha:0.46.0-alpha -google-cloud-compute:0.46.0-alpha:0.46.0-alpha -google-cloud-container:0.46.0-beta:0.46.0-beta -google-cloud-contrib:0.46.0-alpha:0.46.0-alpha -google-cloud-core:1.28.0:1.28.0 -google-cloud-core-grpc:1.28.0:1.28.0 -google-cloud-core-http:1.28.0:1.28.0 -google-cloud-dataproc:0.46.0-alpha:0.46.0-alpha -google-cloud-datastore:1.28.0:1.28.0 -google-cloud-dialogflow:0.46.0-alpha:0.46.0-alpha -google-cloud-dlp:0.46.0-beta:0.46.0-beta -google-cloud-dns:0.46.0-alpha:0.46.0-alpha -google-cloud-errorreporting:0.46.0-beta:0.46.0-beta -google-cloud-examples:0.46.0-alpha:0.46.0-alpha -google-cloud-firestore:0.46.0-beta:0.46.0-beta -google-cloud-language:1.28.0:1.28.0 -google-cloud-logging:1.28.0:1.28.0 -google-cloud-logging-logback:0.46.0-alpha:0.46.0-alpha -google-cloud-managedtest:0.46.0-alpha:0.46.0-alpha -google-cloud-monitoring:0.46.0-beta:0.46.0-beta -google-cloud-nio:0.46.0-alpha:0.46.0-alpha -google-cloud-nio-examples:0.46.0-alpha:0.46.0-alpha -google-cloud-notification:0.46.0-beta:0.46.0-beta -google-cloud-os-login:0.46.0-alpha:0.46.0-alpha -google-cloud-pubsub:0.46.0-beta:0.46.0-beta -google-cloud-resourcemanager:0.46.0-alpha:0.46.0-alpha -google-cloud-spanner:0.46.0-beta:0.46.0-beta -google-cloud-speech:0.46.0-alpha:0.46.0-alpha -google-cloud-storage:1.28.0:1.28.0 -google-cloud-texttospeech:0.46.0-beta:0.46.0-beta -google-cloud-testing:0.46.0-alpha:0.46.0-alpha -google-cloud-trace:0.46.0-beta:0.46.0-beta -google-cloud-translate:1.28.0:1.28.0 -google-cloud-util:0.46.0-alpha:0.46.0-alpha -google-cloud-video-intelligence:0.46.0-beta:0.46.0-beta -google-cloud-vision:1.28.0:1.28.0 +google-cloud-appengineflexcompat:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-appengineflexcustom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-appengineflexjava:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-appenginejava8:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-bigquery:1.27.0:1.27.1-SNAPSHOT +google-cloud-bigquerydatatransfer:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-bigtable:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-bom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-compat-checker:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-compute:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-container:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-contrib:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-core:1.27.0:1.27.1-SNAPSHOT +google-cloud-core-grpc:1.27.0:1.27.1-SNAPSHOT +google-cloud-core-http:1.27.0:1.27.1-SNAPSHOT +google-cloud-dataproc:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-datastore:1.27.0:1.27.1-SNAPSHOT +google-cloud-dialogflow:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-dlp:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-dns:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-errorreporting:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-examples:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-firestore:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-language:1.27.0:1.27.1-SNAPSHOT +google-cloud-logging:1.27.0:1.27.1-SNAPSHOT +google-cloud-logging-logback:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-managedtest:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-monitoring:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-nio:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-nio-examples:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-notification:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-os-login:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-pubsub:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-resourcemanager:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-spanner:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-speech:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-storage:1.27.0:1.27.1-SNAPSHOT +google-cloud-texttospeech:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-testing:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-trace:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-translate:1.27.0:1.27.1-SNAPSHOT +google-cloud-util:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-video-intelligence:0.45.0-beta:0.45.1-beta-SNAPSHOT +google-cloud-vision:1.27.0:1.27.1-SNAPSHOT From dc011cccc89ccc5679154003f7367b2edda64e67 Mon Sep 17 00:00:00 2001 From: vam Date: Fri, 27 Apr 2018 13:30:19 -0700 Subject: [PATCH 5/6] Fix versions --- google-cloud-bom/pom.xml | 8 ++++---- versions.txt | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index b91d6c034213..07ee03ec7ead 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -177,22 +177,22 @@ com.google.api.grpc proto-google-common-protos - 1.9.0 + 1.10.0 com.google.api.grpc grpc-google-common-protos - 1.9.0 + 1.10.0 com.google.api.grpc proto-google-iam-v1 - 0.10.0 + 0.11.0 com.google.api.grpc grpc-google-iam-v1 - 0.10.0 + 0.11.0 diff --git a/versions.txt b/versions.txt index efffc85b2377..45257d403d06 100644 --- a/versions.txt +++ b/versions.txt @@ -4,10 +4,11 @@ # # common versions # -#grpc-google-common-protos:1.9.0:1.9.0 -#grpc-google-iam-v1:0.10.0:0.10.0 -#proto-google-common-protos:1.9.0:1.9.0 -#proto-google-iam-v1:0.10.0:0.10.0 +grpc-google-common-protos:1.10.0:1.10.0 +grpc-google-common-protos:1.10.0:1.10.0 +grpc-google-iam-v1:0.11.0:0.11.0 +proto-google-common-protos:1.10.0:1.10.0 +proto-google-iam-v1:0.11.0:0.11.0 # # google-api-pom versions From b68d04506ea21a99c1c1c7d588066e87ed45e819 Mon Sep 17 00:00:00 2001 From: vam Date: Fri, 27 Apr 2018 16:55:58 -0700 Subject: [PATCH 6/6] Merge recent version bump changes --- google-cloud-bom/pom.xml | 144 +++++++++++++++++++-------------------- versions.txt | 102 +++++++++++++-------------- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 5632db44c1a8..5d1a866f99ee 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bom pom - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT Google Cloud Java BOM https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom @@ -177,45 +177,45 @@ com.google.api.grpc proto-google-common-protos - 1.10.0 + 1.10.0 com.google.api.grpc grpc-google-common-protos - 1.10.0 + 1.10.0 com.google.api.grpc proto-google-iam-v1 - 0.11.0 + 0.11.0 com.google.api.grpc grpc-google-iam-v1 - 0.11.0 + 0.11.0 com.google.cloud google-cloud - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-bigtable - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-bigtable - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar @@ -241,23 +241,23 @@ com.google.cloud google-cloud-bigquery - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-bigquery - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-bigquerydatatransfer - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-bigquerydatatransfer - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -273,23 +273,23 @@ com.google.cloud google-cloud-compute - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-compute - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-container - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-container - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -305,67 +305,67 @@ com.google.cloud google-cloud-contrib - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-contrib - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-nio - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-nio - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-core - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-core - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-grpc - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-http - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-core-http - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-dataproc - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-dataproc - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar @@ -381,12 +381,12 @@ com.google.cloud google-cloud-datastore - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-datastore - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar @@ -397,12 +397,12 @@ com.google.cloud google-cloud-dlp - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-dlp - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -428,12 +428,12 @@ com.google.cloud google-cloud-dialogflow - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-dialogflow - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar @@ -459,23 +459,23 @@ com.google.cloud google-cloud-dns - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-dns - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-errorreporting - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-errorreporting - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -491,23 +491,23 @@ com.google.cloud google-cloud-examples - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-examples - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-firestore - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-firestore - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -523,12 +523,12 @@ com.google.cloud google-cloud-language - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-language - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar @@ -554,12 +554,12 @@ com.google.cloud google-cloud-logging - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-logging - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar @@ -575,18 +575,18 @@ com.google.cloud google-cloud-logging-logback - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -602,12 +602,12 @@ com.google.cloud google-cloud-os-login - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-os-login - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar @@ -623,12 +623,12 @@ com.google.cloud google-cloud-pubsub - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-pubsub - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -644,23 +644,23 @@ com.google.cloud google-cloud-resourcemanager - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-resourcemanager - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-spanner - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-spanner - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -696,12 +696,12 @@ com.google.cloud google-cloud-speech - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT com.google.cloud google-cloud-speech - 0.45.1-alpha-SNAPSHOT + 0.46.1-alpha-SNAPSHOT test-jar @@ -737,23 +737,23 @@ com.google.cloud google-cloud-storage - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-storage - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-texttospeech - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-texttospeech - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -769,12 +769,12 @@ com.google.cloud google-cloud-trace - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-trace - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar @@ -800,23 +800,23 @@ com.google.cloud google-cloud-translate - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-translate - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar com.google.cloud google-cloud-vision - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT com.google.cloud google-cloud-vision - 1.27.1-SNAPSHOT + 1.28.1-SNAPSHOT test-jar @@ -852,12 +852,12 @@ com.google.cloud google-cloud-video-intelligence - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT com.google.cloud google-cloud-video-intelligence - 0.45.1-beta-SNAPSHOT + 0.46.1-beta-SNAPSHOT test-jar diff --git a/versions.txt b/versions.txt index 45257d403d06..0b018b4c9193 100644 --- a/versions.txt +++ b/versions.txt @@ -4,11 +4,11 @@ # # common versions # -grpc-google-common-protos:1.10.0:1.10.0 -grpc-google-common-protos:1.10.0:1.10.0 -grpc-google-iam-v1:0.11.0:0.11.0 -proto-google-common-protos:1.10.0:1.10.0 -proto-google-iam-v1:0.11.0:0.11.0 +#grpc-google-common-protos:1.10.0:1.10.0 +#grpc-google-common-protos:1.10.0:1.10.0 +#grpc-google-iam-v1:0.11.0:0.11.0 +#proto-google-common-protos:1.10.0:1.10.0 +#proto-google-iam-v1:0.11.0:0.11.0 # # google-api-pom versions @@ -89,50 +89,50 @@ proto-google-cloud-vision-v1p2beta1:1.10.0:1.10.0 # google-cloud-pom versions # # parent -google-cloud-pom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT +google-cloud-pom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT # children -google-cloud-appengineflexcompat:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-appengineflexcustom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-appengineflexjava:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-appenginejava8:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-bigquery:1.27.0:1.27.1-SNAPSHOT -google-cloud-bigquerydatatransfer:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-bigtable:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-bom:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-compat-checker:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-compute:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-container:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-contrib:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-core:1.27.0:1.27.1-SNAPSHOT -google-cloud-core-grpc:1.27.0:1.27.1-SNAPSHOT -google-cloud-core-http:1.27.0:1.27.1-SNAPSHOT -google-cloud-dataproc:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-datastore:1.27.0:1.27.1-SNAPSHOT -google-cloud-dialogflow:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-dlp:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-dns:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-errorreporting:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-examples:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-firestore:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-language:1.27.0:1.27.1-SNAPSHOT -google-cloud-logging:1.27.0:1.27.1-SNAPSHOT -google-cloud-logging-logback:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-managedtest:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-monitoring:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-nio:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-nio-examples:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-notification:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-os-login:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-pubsub:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-resourcemanager:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-spanner:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-speech:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-storage:1.27.0:1.27.1-SNAPSHOT -google-cloud-texttospeech:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-testing:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-trace:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-translate:1.27.0:1.27.1-SNAPSHOT -google-cloud-util:0.45.0-alpha:0.45.1-alpha-SNAPSHOT -google-cloud-video-intelligence:0.45.0-beta:0.45.1-beta-SNAPSHOT -google-cloud-vision:1.27.0:1.27.1-SNAPSHOT +google-cloud-appengineflexcompat:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-appengineflexcustom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-appengineflexjava:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-appenginejava8:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-bigquery:1.28.0:1.28.1-SNAPSHOT +google-cloud-bigquerydatatransfer:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-bigtable:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-bom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-compat-checker:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-compute:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-container:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-contrib:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-core:1.28.0:1.28.1-SNAPSHOT +google-cloud-core-grpc:1.28.0:1.28.1-SNAPSHOT +google-cloud-core-http:1.28.0:1.28.1-SNAPSHOT +google-cloud-dataproc:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-datastore:1.28.0:1.28.1-SNAPSHOT +google-cloud-dialogflow:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-dlp:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-dns:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-errorreporting:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-examples:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-firestore:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-language:1.28.0:1.28.1-SNAPSHOT +google-cloud-logging:1.28.0:1.28.1-SNAPSHOT +google-cloud-logging-logback:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-managedtest:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-monitoring:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-nio:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-nio-examples:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-notification:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-os-login:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-pubsub:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-resourcemanager:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-spanner:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-speech:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-storage:1.28.0:1.28.1-SNAPSHOT +google-cloud-texttospeech:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-testing:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-trace:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-translate:1.28.0:1.28.1-SNAPSHOT +google-cloud-util:0.46.0-alpha:0.46.1-alpha-SNAPSHOT +google-cloud-video-intelligence:0.46.0-beta:0.46.1-beta-SNAPSHOT +google-cloud-vision:1.28.0:1.28.1-SNAPSHOT