Merge pull request #10756 from suztomo/BEAM-9246

[BEAM-9246] Introducing google-http-client.version property in Java archetype

Author: lukecwik

sdks/java/maven-archetypes/examples/build.gradle

@@ -27,7 +27,8 @@ processResources {
   filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
     'project.version':  version,
     'bigquery.version': dependencies.create(project.library.java.google_api_services_bigquery).getVersion(),
-    'google-clients.version': dependencies.create(project.library.java.google_api_client).getVersion(),
+    'google-api-client.version': dependencies.create(project.library.java.google_api_client).getVersion(),
+    'google-http-client.version': dependencies.create(project.library.java.google_http_client).getVersion(),
     'hamcrest.version': dependencies.create(project.library.java.hamcrest_library).getVersion(),
     'jackson.version': dependencies.create(project.library.java.jackson_core).getVersion(),
     'joda.version': dependencies.create(project.library.java.joda_time).getVersion(),

sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml

@@ -30,7 +30,8 @@
     <beam.version>@project.version@</beam.version>
 
     <bigquery.version>@bigquery.version@</bigquery.version>
-    <google-clients.version>@google-clients.version@</google-clients.version>
+    <google-api-client.version>@google-api-client.version@</google-api-client.version>
+    <google-http-client.version>@google-http-client.version@</google-http-client.version>
     <hamcrest.version>@hamcrest.version@</hamcrest.version>
     <jackson.version>@jackson.version@</jackson.version>
     <joda.version>@joda.version@</joda.version>
@@ -396,7 +397,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
-      <version>${google-clients.version}</version>
+      <version>${google-api-client.version}</version>
       <exclusions>
         <!-- Exclude an old version of guava that is being pulled
              in by a transitive dependency of google-api-client -->
@@ -424,7 +425,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>${google-clients.version}</version>
+      <version>${google-http-client.version}</version>
       <exclusions>
         <!-- Exclude an old version of guava that is being pulled
              in by a transitive dependency of google-api-client -->