From 088922490c15dd9591f91903ceb468a9a4c88c45 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Tue, 10 Jul 2018 15:16:37 -0700 Subject: [PATCH 1/3] bump gax versions to 1.29.0/0.46.0 --- google-cloud-bom/pom.xml | 12 ++++++------ google-cloud-clients/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 763d741ad4b0..91c70d308375 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -150,34 +150,34 @@ com.google.api gax - 1.28.0 + 1.29.0 com.google.api gax - 1.28.0 + 1.29.0 testlib com.google.api gax-grpc - 1.28.0 + 1.29.0 com.google.api gax-grpc - 1.28.0 + 1.29.0 testlib com.google.api gax-httpjson - 0.45.0 + 0.46.0 com.google.api gax-httpjson - 0.45.0 + 0.46.0 testlib diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index d3216e9d554c..ecdad53aa7d7 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -156,7 +156,7 @@ google-cloud-clients 0.53.1-alpha-SNAPSHOT 1.23.0 - 1.28.0 + 1.29.0 0.9.1 1.12.0 2.0.7.Final From 9ffb63771e784bb5e609e0327187344163e6ceec Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Tue, 10 Jul 2018 15:32:27 -0700 Subject: [PATCH 2/3] use TLS 1.2 in appveyor --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f397db649714..c8448b074227 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,14 +35,15 @@ install: - cmd: IF DEFINED API_KEY_SECRET (secure-file\tools\secure-file -decrypt appveyor\api_key.enc -secret %API_KEY_SECRET% -out appveyor\api_key) - cmd: IF DEFINED API_KEY_SECRET (SET /P GOOGLE_API_KEY=<%APPVEYOR_BUILD_FOLDER%\appveyor\api_key) - cmd: ECHO GOOGLE_API_KEY defined + - cmd: SET JAVA_OPTS=-Dhttps.protocols=TLSv1.2 # build and install artifacts build_script: - - mvn clean install -DskipTests + - mvn clean install -DskipTests -Dhttps.protocols=TLSv1.2 # verify artifacts test_script: - - mvn verify -B -DtrimStackTrace=false -fae --quiet -DskipITs + - mvn verify -B -DtrimStackTrace=false -fae --quiet -DskipITs -Dhttps.protocols=TLSv1.2 # preserve dependencies between builds cache: From ceb7d58c60f714b07117c5aa39c5b42343ef8ac2 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Tue, 10 Jul 2018 15:34:05 -0700 Subject: [PATCH 3/3] revert everything but appveyor changes --- google-cloud-bom/pom.xml | 12 ++++++------ google-cloud-clients/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 91c70d308375..763d741ad4b0 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -150,34 +150,34 @@ com.google.api gax - 1.29.0 + 1.28.0 com.google.api gax - 1.29.0 + 1.28.0 testlib com.google.api gax-grpc - 1.29.0 + 1.28.0 com.google.api gax-grpc - 1.29.0 + 1.28.0 testlib com.google.api gax-httpjson - 0.46.0 + 0.45.0 com.google.api gax-httpjson - 0.46.0 + 0.45.0 testlib diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index ecdad53aa7d7..d3216e9d554c 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -156,7 +156,7 @@ google-cloud-clients 0.53.1-alpha-SNAPSHOT 1.23.0 - 1.29.0 + 1.28.0 0.9.1 1.12.0 2.0.7.Final