From b3ba3b0894388a1760b77838604a7da64b4a90dd Mon Sep 17 00:00:00 2001 From: Praful Makani Date: Thu, 25 Oct 2018 11:26:51 +0530 Subject: [PATCH] #3707, #3708, #3728 Fixes * test-jar in google-cloud-bom * Don't include multiple versions of same API in BOM * Don't bundle tests in jars --- .gitignore | 2 + google-cloud-bom/pom.xml | 211 ------------------ .../google-cloud-tasks/pom.xml | 4 - .../google-cloud-managedtest/pom.xml | 88 +------- 4 files changed, 3 insertions(+), 302 deletions(-) diff --git a/.gitignore b/.gitignore index 6f6fa035a9d4..7380f3d12c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ nosetests.xml .settings .DS_Store .classpath +.factorypath +logging.properties # Built documentation docs/ diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 36b336077758..7c784ccd1709 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -229,12 +229,6 @@ google-cloud-bigtable 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-bigtable - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-bigtable-v2 @@ -250,12 +244,6 @@ google-cloud-bigtable-admin 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-bigtable-admin - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-bigtable-admin-v2 @@ -271,23 +259,11 @@ google-cloud-bigquery 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-bigquery - 1.49.1-SNAPSHOT - test-jar - com.google.cloud google-cloud-bigquerydatatransfer 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-bigquerydatatransfer - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 @@ -303,23 +279,11 @@ google-cloud-compute 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-compute - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.cloud google-cloud-container 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-container - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-container-v1 @@ -335,12 +299,6 @@ google-cloud-containeranalysis 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-containeranalysis - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 @@ -356,22 +314,10 @@ google-cloud-contrib 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-contrib - 0.67.1-alpha-SNAPSHOT - test-jar - - - com.google.cloud - google-cloud-nio - 0.67.1-alpha-SNAPSHOT - com.google.cloud google-cloud-nio 0.67.1-alpha-SNAPSHOT - test-jar com.google.cloud @@ -389,34 +335,16 @@ google-cloud-core-grpc 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-core-grpc - 1.49.1-SNAPSHOT - test-jar - com.google.cloud google-cloud-core-http 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-core-http - 1.49.1-SNAPSHOT - test-jar - com.google.cloud google-cloud-dataproc 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-dataproc - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-dataproc-v1 @@ -442,12 +370,6 @@ google-cloud-datastore 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-datastore - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-datastore-v1 @@ -458,12 +380,6 @@ google-cloud-dlp 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-dlp - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-dlp-v2 @@ -479,12 +395,6 @@ google-cloud-dialogflow 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-dialogflow - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 @@ -510,23 +420,11 @@ google-cloud-dns 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-dns - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.cloud google-cloud-errorreporting 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-errorreporting - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 @@ -542,12 +440,6 @@ google-cloud-firestore 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-firestore - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-firestore-v1beta1 @@ -563,12 +455,6 @@ google-cloud-kms 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-kms - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-kms-v1 @@ -584,12 +470,6 @@ google-cloud-language 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-language - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-language-v1 @@ -615,12 +495,6 @@ google-cloud-logging 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-logging - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-logging-v2 @@ -636,18 +510,11 @@ google-cloud-logging-logback 0.67.1-alpha-SNAPSHOT - com.google.cloud google-cloud-monitoring 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-monitoring - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-monitoring-v3 @@ -663,12 +530,6 @@ google-cloud-os-login 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-os-login - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-os-login-v1 @@ -684,12 +545,6 @@ google-cloud-pubsub 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-pubsub - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-pubsub-v1 @@ -705,12 +560,6 @@ google-cloud-redis 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-redis - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-redis-v1beta1 @@ -736,23 +585,11 @@ google-cloud-resourcemanager 0.67.1-alpha-SNAPSHOT - - com.google.cloud - google-cloud-resourcemanager - 0.67.1-alpha-SNAPSHOT - test-jar - com.google.cloud google-cloud-spanner 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-spanner - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-spanner-v1 @@ -788,12 +625,6 @@ google-cloud-speech 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-speech - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-speech-v1beta1 @@ -829,23 +660,11 @@ google-cloud-storage 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-storage - 1.49.1-SNAPSHOT - test-jar - com.google.cloud google-cloud-tasks 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-tasks - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-tasks-v2beta2 @@ -871,12 +690,6 @@ google-cloud-texttospeech 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-texttospeech - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 @@ -902,12 +715,6 @@ google-cloud-trace 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-trace - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-trace-v1 @@ -933,23 +740,11 @@ google-cloud-translate 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-translate - 1.49.1-SNAPSHOT - test-jar - com.google.cloud google-cloud-vision 1.49.1-SNAPSHOT - - com.google.cloud - google-cloud-vision - 1.49.1-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-vision-v1 @@ -995,12 +790,6 @@ google-cloud-video-intelligence 0.67.1-beta-SNAPSHOT - - com.google.cloud - google-cloud-video-intelligence - 0.67.1-beta-SNAPSHOT - test-jar - com.google.api.grpc proto-google-cloud-video-intelligence-v1beta1 diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml index e89dcba7157a..dee591fde093 100644 --- a/google-cloud-clients/google-cloud-tasks/pom.xml +++ b/google-cloud-clients/google-cloud-tasks/pom.xml @@ -26,10 +26,6 @@ ${project.groupId} google-cloud-core-grpc - - com.google.api.grpc - proto-google-cloud-tasks-v2beta2 - com.google.api.grpc proto-google-cloud-tasks-v2beta3 diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml index 381d646d62bb..b2b131dae594 100644 --- a/google-cloud-testing/google-cloud-managedtest/pom.xml +++ b/google-cloud-testing/google-cloud-managedtest/pom.xml @@ -13,36 +13,21 @@ 0.67.1-alpha-SNAPSHOT - + ${project.groupId} google-cloud-bigquery - - ${project.groupId} - google-cloud-bigquery - test-jar - ${project.groupId} google-cloud-compute - - ${project.groupId} - google-cloud-compute - test-jar - ${project.groupId} google-cloud-nio - - ${project.groupId} - google-cloud-nio - test-jar - ${project.groupId} @@ -58,142 +43,71 @@ ${project.groupId} google-cloud-datastore - - ${project.groupId} - google-cloud-datastore - test-jar - ${project.groupId} google-cloud-dns - - ${project.groupId} - google-cloud-dns - test-jar - ${project.groupId} google-cloud-errorreporting - - ${project.groupId} - google-cloud-errorreporting - test-jar - ${project.groupId} google-cloud-language - - ${project.groupId} - google-cloud-language - test-jar - ${project.groupId} google-cloud-logging - - ${project.groupId} - google-cloud-logging - test-jar - ${project.groupId} google-cloud-monitoring - - ${project.groupId} - google-cloud-monitoring - test-jar - ${project.groupId} google-cloud-pubsub - - ${project.groupId} - google-cloud-pubsub - test-jar - ${project.groupId} google-cloud-resourcemanager - - ${project.groupId} - google-cloud-resourcemanager - test-jar - - ${project.groupId} google-cloud-speech - - ${project.groupId} - google-cloud-speech - test-jar - ${project.groupId} google-cloud-spanner - - ${project.groupId} - google-cloud-spanner - test-jar - ${project.groupId} google-cloud-storage - - ${project.groupId} - google-cloud-storage - test-jar - ${project.groupId} google-cloud-trace - - ${project.groupId} - google-cloud-trace - test-jar - ${project.groupId} google-cloud-translate - - ${project.groupId} - google-cloud-translate - test-jar - ${project.groupId} google-cloud-vision - - ${project.groupId} - google-cloud-vision - test-jar - javax.servlet