From 312a0b014cf00760b5e1db2783c8219785095f70 Mon Sep 17 00:00:00 2001 From: Shin Fan Date: Tue, 25 Apr 2017 20:52:15 -0700 Subject: [PATCH 1/2] Fix build setup of project.properties --- google-cloud-bigquery/pom.xml | 34 +++++++++++++++++++--------- google-cloud-compute/pom.xml | 34 +++++++++++++++++++--------- google-cloud-core-grpc/pom.xml | 34 +++++++++++++++++++--------- google-cloud-core-http/pom.xml | 34 +++++++++++++++++++--------- google-cloud-core/pom.xml | 34 +++++++++++++++++++--------- google-cloud-datastore/pom.xml | 34 +++++++++++++++++++--------- google-cloud-dns/pom.xml | 34 +++++++++++++++++++--------- google-cloud-errorreporting/pom.xml | 34 +++++++++++++++++++--------- google-cloud-language/pom.xml | 34 +++++++++++++++++++--------- google-cloud-logging/pom.xml | 34 +++++++++++++++++++--------- google-cloud-monitoring/pom.xml | 34 +++++++++++++++++++--------- google-cloud-pubsub/pom.xml | 34 +++++++++++++++++++--------- google-cloud-resourcemanager/pom.xml | 34 +++++++++++++++++++--------- google-cloud-spanner/pom.xml | 34 +++++++++++++++++++--------- google-cloud-speech/pom.xml | 34 +++++++++++++++++++--------- google-cloud-storage/pom.xml | 34 +++++++++++++++++++--------- google-cloud-trace/pom.xml | 34 +++++++++++++++++++--------- google-cloud-translate/pom.xml | 34 +++++++++++++++++++--------- google-cloud-vision/pom.xml | 34 +++++++++++++++++++--------- project.properties | 1 + 20 files changed, 438 insertions(+), 209 deletions(-) create mode 100644 project.properties diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml index 72d97e719c33..638ac0079452 100644 --- a/google-cloud-bigquery/pom.xml +++ b/google-cloud-bigquery/pom.xml @@ -67,22 +67,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/bigquery/project.properties + + + + + run + - + diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 162248b4f274..f857498657c6 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -61,22 +61,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/compute/project.properties + + + + + run + - + diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index bc607eb6d6cb..3eaa02951373 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -70,22 +70,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/project.properties + + + + + run + - + diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index 3aff85b2976a..87005287ccc1 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -110,22 +110,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/project.properties + + + + + run + - + diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 838f70b2a696..878d4ba5007c 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -80,22 +80,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/project.properties + + + + + run + - + diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index d1ea868ce9ef..c25b0c22e72e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -65,22 +65,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/datastore/project.properties + + + + + run + - + diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml index f825faa70f1f..38dce7b690bd 100644 --- a/google-cloud-dns/pom.xml +++ b/google-cloud-dns/pom.xml @@ -72,22 +72,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/dns/project.properties + + + + + run + - + diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 98f0912fd9e9..7259249f4391 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -92,22 +92,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/errorreporting/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 1bee260390d0..66ca4281c4ed 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -103,22 +103,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/language/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 457f0094c32e..debf874265a7 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -96,22 +96,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/logging/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index af15c25a0c8d..5376cc3d5fbc 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -92,22 +92,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/monitoring/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 40df3c331b9f..8aae04545769 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -102,22 +102,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/pubsub/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml index 4db8b5f5035b..74dd684f1622 100644 --- a/google-cloud-resourcemanager/pom.xml +++ b/google-cloud-resourcemanager/pom.xml @@ -61,22 +61,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/resourcemanager/project.properties + + + + + run + - + diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 51a7efd1ed11..d06e57cc8124 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -21,22 +21,34 @@ ${project.version} + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/spanner/project.properties + + + + + run + - + org.apache.maven.plugins diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index 29c020618a45..73ee0420cc5e 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -103,22 +103,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/speech/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index b2bbc4e50a06..ede1befb584f 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -65,22 +65,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/storage/project.properties + + + + + run + - + diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 3903ab9f5c56..6e1db64f2914 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -92,22 +92,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/trace/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml index de2d84d967ca..aeea51a94864 100644 --- a/google-cloud-translate/pom.xml +++ b/google-cloud-translate/pom.xml @@ -65,22 +65,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/translate/project.properties + + + + + run + - + diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index b7d39c9f3d2e..1786cfcca91b 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -92,22 +92,34 @@ + + + ./.. + true + + project.properties + + + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - + + maven-antrun-plugin + 1.4 + - generate-resources - - write-project-properties - + process-resources - ${project.build.outputDirectory}/com/google/cloud/vision/project.properties + + + + + run + - + org.codehaus.mojo diff --git a/project.properties b/project.properties new file mode 100644 index 000000000000..0f370e40f539 --- /dev/null +++ b/project.properties @@ -0,0 +1 @@ +artifact.version=${artifact.version} \ No newline at end of file From 043efd08fe17b4179a2f0d8a324c939e249b0005 Mon Sep 17 00:00:00 2001 From: Shin Fan Date: Tue, 25 Apr 2017 21:21:41 -0700 Subject: [PATCH 2/2] Remove resource script --- google-cloud-core-grpc/pom.xml | 32 -------------------------------- google-cloud-core-http/pom.xml | 32 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index 3eaa02951373..ae292fbf429d 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -69,36 +69,4 @@ test - - - - ./.. - true - - project.properties - - - - - - maven-antrun-plugin - 1.4 - - - process-resources - - - - - - - run - - - - - - diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index 87005287ccc1..5273ab3c1719 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -109,36 +109,4 @@ test - - - - ./.. - true - - project.properties - - - - - - maven-antrun-plugin - 1.4 - - - process-resources - - - - - - - run - - - - - -