From c387b5579af4546fdc076e3da06fbac21b9a1c24 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 11 May 2018 11:22:04 -0700 Subject: [PATCH 1/3] move resource names --- google-api-grpc/pom.xml | 6 ++++++ .../pom.xml | 2 +- google-api-grpc/resource-name-common/pom.xml | 21 +++++++++++++++++++ .../java/com/google/cloud/BillingName.java | 0 .../java/com/google/cloud/FolderName.java | 0 .../com/google/cloud/OrganizationName.java | 0 .../java/com/google/cloud/ParentName.java | 0 .../java/com/google/cloud/ParentNames.java | 0 .../java/com/google/cloud/ProjectName.java | 0 .../com/google/cloud/UntypedParentName.java | 0 versions.txt | 8 +++---- 11 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 google-api-grpc/resource-name-common/pom.xml rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/BillingName.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/FolderName.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/OrganizationName.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/ParentName.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/ParentNames.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/ProjectName.java (100%) rename {google-cloud-clients/google-cloud-core => google-api-grpc/resource-name-common}/src/main/java/com/google/cloud/UntypedParentName.java (100%) diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 3b398f94ab71..11c2984172f8 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -496,6 +496,11 @@ grpc-google-cloud-websecurityscanner-v1alpha 0.12.1-SNAPSHOT + + com.google.api.grpc + resource-name-common + 0.12.1-SNAPSHOT + @@ -573,6 +578,7 @@ proto-google-cloud-cloudiot-v1 proto-google-cloud-redis-v1beta1 proto-google-cloud-websecurityscanner-v1alpha + resource-name-common diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml index 14661ebff117..6d21909cbe79 100644 --- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml +++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml @@ -28,4 +28,4 @@ compile - \ No newline at end of file + diff --git a/google-api-grpc/resource-name-common/pom.xml b/google-api-grpc/resource-name-common/pom.xml new file mode 100644 index 000000000000..f329d4f011e9 --- /dev/null +++ b/google-api-grpc/resource-name-common/pom.xml @@ -0,0 +1,21 @@ + + 4.0.0 + resource-name-common + 0.12.1-SNAPSHOT + proto-google-cloud-websecurityscanner-v1alpha + PROTO library for proto-google-cloud-websecurityscanner-v1alpha + + com.google.api.grpc + google-api-grpc + 0.12.1-SNAPSHOT + + + + com.google.api + api-common + compile + + + diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/BillingName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/BillingName.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/FolderName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/FolderName.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/OrganizationName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/OrganizationName.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentName.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentNames.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentNames.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ProjectName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ProjectName.java diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java b/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java similarity index 100% rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java rename to google-api-grpc/resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java diff --git a/versions.txt b/versions.txt index c884da50ec35..18d5f232c70c 100644 --- a/versions.txt +++ b/versions.txt @@ -42,8 +42,8 @@ grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT grpc-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT -grpc-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT -grpc-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT +grpc-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT +grpc-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT @@ -79,8 +79,8 @@ proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT -proto-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT -proto-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT +proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT +proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT # # google-cloud-clients versions From eb7c7d05ba45b3d32ad0da6f15775a1998766c0f Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 11 May 2018 14:30:32 -0700 Subject: [PATCH 2/3] pr comment --- .../pom.xml | 4 ++-- .../src/main/java/com/google/cloud/BillingName.java | 0 .../src/main/java/com/google/cloud/FolderName.java | 0 .../src/main/java/com/google/cloud/OrganizationName.java | 0 .../src/main/java/com/google/cloud/ParentName.java | 0 .../src/main/java/com/google/cloud/ParentNames.java | 0 .../src/main/java/com/google/cloud/ProjectName.java | 0 .../main/java/com/google/cloud/UntypedParentName.java | 0 google-api-grpc/pom.xml | 6 +++--- versions.txt | 9 +++++---- 10 files changed, 10 insertions(+), 9 deletions(-) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/pom.xml (82%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/BillingName.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/FolderName.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/OrganizationName.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/ParentName.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/ParentNames.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/ProjectName.java (100%) rename google-api-grpc/{resource-name-common => google-cloud-resource-name-common}/src/main/java/com/google/cloud/UntypedParentName.java (100%) diff --git a/google-api-grpc/resource-name-common/pom.xml b/google-api-grpc/google-cloud-resource-name-common/pom.xml similarity index 82% rename from google-api-grpc/resource-name-common/pom.xml rename to google-api-grpc/google-cloud-resource-name-common/pom.xml index f329d4f011e9..28d2c29360ae 100644 --- a/google-api-grpc/resource-name-common/pom.xml +++ b/google-api-grpc/google-cloud-resource-name-common/pom.xml @@ -2,8 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - resource-name-common - 0.12.1-SNAPSHOT + google-cloud-resource-name-common + 0.12.1-SNAPSHOT proto-google-cloud-websecurityscanner-v1alpha PROTO library for proto-google-cloud-websecurityscanner-v1alpha diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/BillingName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/BillingName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/FolderName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/FolderName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/OrganizationName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/OrganizationName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentNames.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ParentNames.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ProjectName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/ProjectName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java diff --git a/google-api-grpc/resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java similarity index 100% rename from google-api-grpc/resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 11c2984172f8..ea837b37140f 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -498,8 +498,8 @@ com.google.api.grpc - resource-name-common - 0.12.1-SNAPSHOT + google-cloud-resource-name-common + 0.12.1-SNAPSHOT @@ -578,7 +578,7 @@ proto-google-cloud-cloudiot-v1 proto-google-cloud-redis-v1beta1 proto-google-cloud-websecurityscanner-v1alpha - resource-name-common + google-cloud-resource-name-common diff --git a/versions.txt b/versions.txt index 18d5f232c70c..c0dbb9ae69bc 100644 --- a/versions.txt +++ b/versions.txt @@ -42,8 +42,8 @@ grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT grpc-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT -grpc-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT -grpc-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT +grpc-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT +grpc-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT @@ -79,8 +79,9 @@ proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT -proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT -proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT +proto-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT +proto-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT +google-cloud-resource-name-common:0.12.0:0.12.1-SNAPSHOT # # google-cloud-clients versions From b0238164305f5d4bc9f71718770d436fa5ec2270 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 11 May 2018 14:48:56 -0700 Subject: [PATCH 3/3] pr comment --- google-api-grpc/google-cloud-resource-name-common/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/google-api-grpc/google-cloud-resource-name-common/pom.xml b/google-api-grpc/google-cloud-resource-name-common/pom.xml index 28d2c29360ae..d40ef408bb09 100644 --- a/google-api-grpc/google-cloud-resource-name-common/pom.xml +++ b/google-api-grpc/google-cloud-resource-name-common/pom.xml @@ -4,8 +4,8 @@ 4.0.0 google-cloud-resource-name-common 0.12.1-SNAPSHOT - proto-google-cloud-websecurityscanner-v1alpha - PROTO library for proto-google-cloud-websecurityscanner-v1alpha + Google Cloud Common Resource Name + Common resource names used by Google Cloud libraries com.google.api.grpc google-api-grpc @@ -15,7 +15,6 @@ com.google.api api-common - compile