This is an automated email from the ASF dual-hosted git repository.

aromanenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f60832b  [BEAM-6854] Update amazon-web-services aws-sdk dependency to 
version 1.11.519
     new 1d08260  Merge pull request #8083: [BEAM-6854] Update 
amazon-web-services aws-sdk dependency to version 1.11.519
f60832b is described below

commit f60832b368b9bb6bd98a13069a265a82bf32655b
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Mon Mar 18 18:46:35 2019 +0100

    [BEAM-6854] Update amazon-web-services aws-sdk dependency to version 
1.11.519
    
    It also unifies AWS SDK versions for the kinesis and amazon-web-services 
modules
---
 .../org/apache/beam/gradle/BeamModulePlugin.groovy | 33 +++++++++++++---------
 sdks/java/io/amazon-web-services/build.gradle      | 12 ++++----
 .../org/apache/beam/sdk/io/aws/sqs/SqsIOTest.java  |  1 -
 sdks/java/io/kinesis/build.gradle                  |  8 ++----
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git 
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy 
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 8ef5246..df2ff37 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -340,30 +340,31 @@ class BeamModulePlugin implements Plugin<Project> {
     // These versions are defined here because they represent
     // a dependency version which should match across multiple
     // Maven artifacts.
+    def apex_core_version = "3.7.0"
+    def apex_malhar_version = "3.4.0"
+    def aws_java_sdk_version = "1.11.519"
+    def cassandra_driver_version = "3.6.0"
     def generated_grpc_beta_version = "0.44.0"
     def generated_grpc_ga_version = "1.43.0"
+    def google_auth_version = "0.12.0"
+    def google_clients_version = "1.27.0"
     def google_cloud_bigdataoss_version = "1.9.16"
+    def google_cloud_core_version = "1.61.0"
     def google_cloud_spanner_version = "1.6.0"
-    def google_clients_version = "1.27.0"
-    def google_auth_version = "0.12.0"
     def grpc_version = "1.17.1"
-    def protobuf_version = "3.6.0"
     def guava_version = "20.0"
-    def netty_version = "4.1.30.Final"
-    def proto_google_common_protos_version = "1.12.0"
-    def hamcrest_version = "1.3"
     def hadoop_version = "2.7.3"
+    def hamcrest_version = "1.3"
     def jackson_version = "2.9.8"
-    def spark_version = "2.4.0"
-    def nemo_version = "0.1"
-    def apex_core_version = "3.7.0"
-    def apex_malhar_version = "3.4.0"
-    def postgres_version = "42.2.2"
     def jaxb_api_version = "2.2.12"
     def kafka_version = "1.0.0"
+    def nemo_version = "0.1"
+    def netty_version = "4.1.30.Final"
+    def postgres_version = "42.2.2"
+    def proto_google_common_protos_version = "1.12.0"
+    def protobuf_version = "3.6.0"
     def quickcheck_version = "0.8"
-    def google_cloud_core_version = "1.61.0"
-    def cassandra_driver_version = "3.6.0"
+    def spark_version = "2.4.0"
 
     // A map of maps containing common libraries used per language. To use:
     // dependencies {
@@ -385,6 +386,12 @@ class BeamModulePlugin implements Plugin<Project> {
         args4j                                      : "args4j:args4j:2.33",
         avro                                        : 
"org.apache.avro:avro:1.8.2",
         avro_tests                                  : 
"org.apache.avro:avro:1.8.2:tests",
+        aws_java_sdk_cloudwatch                     : 
"com.amazonaws:aws-java-sdk-cloudwatch:$aws_java_sdk_version",
+        aws_java_sdk_core                           : 
"com.amazonaws:aws-java-sdk-core:$aws_java_sdk_version",
+        aws_java_sdk_kinesis                        : 
"com.amazonaws:aws-java-sdk-kinesis:$aws_java_sdk_version",
+        aws_java_sdk_s3                             : 
"com.amazonaws:aws-java-sdk-s3:$aws_java_sdk_version",
+        aws_java_sdk_sns                            : 
"com.amazonaws:aws-java-sdk-sns:$aws_java_sdk_version",
+        aws_java_sdk_sqs                            : 
"com.amazonaws:aws-java-sdk-sqs:$aws_java_sdk_version",
         bigdataoss_gcsio                            : 
"com.google.cloud.bigdataoss:gcsio:$google_cloud_bigdataoss_version",
         bigdataoss_util                             : 
"com.google.cloud.bigdataoss:util:$google_cloud_bigdataoss_version",
         bigtable_client_core                        : 
"com.google.cloud.bigtable:bigtable-client-core:1.8.0",
diff --git a/sdks/java/io/amazon-web-services/build.gradle 
b/sdks/java/io/amazon-web-services/build.gradle
index cfe0d19..c16dfd5 100644
--- a/sdks/java/io/amazon-web-services/build.gradle
+++ b/sdks/java/io/amazon-web-services/build.gradle
@@ -24,16 +24,14 @@ applyJavaNature()
 description = "Apache Beam :: SDKs :: Java :: IO :: Amazon Web Services"
 ext.summary = "IO library to read and write Amazon Web Services services from 
Beam."
 
-def aws_java_sdk_version = "1.11.319"
-
 dependencies {
   shadow library.java.vendored_guava_20_0
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
-  shadow "com.amazonaws:aws-java-sdk-core:$aws_java_sdk_version"
-  shadow "com.amazonaws:aws-java-sdk-cloudwatch:$aws_java_sdk_version"
-  shadow "com.amazonaws:aws-java-sdk-s3:$aws_java_sdk_version"
-  shadow "com.amazonaws:aws-java-sdk-sqs:$aws_java_sdk_version"
-  shadow "com.amazonaws:aws-java-sdk-sns:$aws_java_sdk_version"
+  shadow library.java.aws_java_sdk_cloudwatch
+  shadow library.java.aws_java_sdk_core
+  shadow library.java.aws_java_sdk_s3
+  shadow library.java.aws_java_sdk_sns
+  shadow library.java.aws_java_sdk_sqs
   shadow "commons-lang:commons-lang:2.6"
   shadow library.java.jackson_core
   shadow library.java.jackson_annotations
diff --git 
a/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/sqs/SqsIOTest.java
 
b/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/sqs/SqsIOTest.java
index 327cc9e..5ce832d 100644
--- 
a/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/sqs/SqsIOTest.java
+++ 
b/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/sqs/SqsIOTest.java
@@ -117,7 +117,6 @@ public class SqsIOTest {
                   new AWSStaticCredentialsProvider(new 
BasicAWSCredentials(accessKey, secretKey)))
               .withEndpointConfiguration(
                   new AwsClientBuilder.EndpointConfiguration(endpoint, region))
-              .withRegion(region)
               .build();
       final CreateQueueResult queue = client.createQueue("test");
       queueUrl = queue.getQueueUrl();
diff --git a/sdks/java/io/kinesis/build.gradle 
b/sdks/java/io/kinesis/build.gradle
index 8c5cee3..d5f8f85 100644
--- a/sdks/java/io/kinesis/build.gradle
+++ b/sdks/java/io/kinesis/build.gradle
@@ -37,17 +37,15 @@ test {
   forkEvery 1
 }
 
-def aws_version = "1.11.519"
-
 dependencies {
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
   shadow library.java.guava
   shadow library.java.slf4j_api
   shadow library.java.joda_time
   shadow library.java.jackson_dataformat_cbor
-  shadow "com.amazonaws:aws-java-sdk-core:$aws_version"
-  shadow "com.amazonaws:aws-java-sdk-kinesis:$aws_version"
-  shadow "com.amazonaws:aws-java-sdk-cloudwatch:$aws_version"
+  shadow library.java.aws_java_sdk_cloudwatch
+  shadow library.java.aws_java_sdk_core
+  shadow library.java.aws_java_sdk_kinesis
   shadow "com.amazonaws:amazon-kinesis-client:1.8.8"
   shadow "com.amazonaws:amazon-kinesis-producer:0.12.8"
   shadow "commons-lang:commons-lang:2.6"

Reply via email to