From 703c9375dbce960ec54ad4b35ad432b029dc5cb5 Mon Sep 17 00:00:00 2001
From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com>
Date: Fri, 4 Jun 2021 10:12:06 -0700
Subject: [PATCH 1/2] Test Wagon Changes to Determine Install Performance

---
 eng/pipelines/templates/variables/globals.yml        | 2 +-
 eng/versioning/external_dependencies.txt             | 2 +-
 sdk/core/azure-core-serializer-json-gson/pom.xml     | 4 ++--
 sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml  | 2 +-
 sdk/identity/azure-identity/pom.xml                  | 2 +-
 sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
index a40f373699a1..127395efbde8 100644
--- a/eng/pipelines/templates/variables/globals.yml
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -8,7 +8,7 @@ variables:
   # Maven build/test options
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
   # See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
-  WagonOptions: '-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
+  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
   DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
   LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
   MemoryOptions: '-Xmx3072m'
diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
index e31e72b2a46e..8ffd3649fe5c 100644
--- a/eng/versioning/external_dependencies.txt
+++ b/eng/versioning/external_dependencies.txt
@@ -18,7 +18,7 @@ com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.3
 com.github.spotbugs:spotbugs;4.2.0
 com.github.spotbugs:spotbugs-annotations;4.2.0
 com.github.spotbugs:spotbugs-maven-plugin;4.2.0
-com.google.code.gson:gson;2.8.6
+com.google.code.gson:gson;2.8.7
 com.google.guava:guava;30.1.1-jre
 com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0
 com.microsoft.azure:azure-annotations;1.7.0
diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml
index 81045734d602..c501f16a49a7 100644
--- a/sdk/core/azure-core-serializer-json-gson/pom.xml
+++ b/sdk/core/azure-core-serializer-json-gson/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -109,7 +109,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.google.code.gson:gson:[2.8.6]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
+                <include>com.google.code.gson:gson:[2.8.7]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
index 4ce512bfdf2c..a9ffff6dbeac 100644
--- a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
+++ b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index 7ce03e26f74f..db69c182bb33 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
index ffefb6c5b99c..1e516434e657 100644
--- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
@@ -64,7 +64,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.google.code.gson:gson:[2.8.6]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
+                <include>com.google.code.gson:gson:[2.8.7]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>

From 9654bc73db10a3757501aca817219d97ce828a4f Mon Sep 17 00:00:00 2001
From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com>
Date: Fri, 4 Jun 2021 12:04:45 -0700
Subject: [PATCH 2/2] Add comment to re-enable old configurations if Maven
 artifact retrieval failures happen more often, revert dependency update

---
 eng/pipelines/templates/variables/globals.yml        | 3 ++-
 eng/versioning/external_dependencies.txt             | 2 +-
 sdk/core/azure-core-serializer-json-gson/pom.xml     | 4 ++--
 sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml  | 2 +-
 sdk/identity/azure-identity/pom.xml                  | 2 +-
 sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
index 127395efbde8..4d3cb3037422 100644
--- a/eng/pipelines/templates/variables/globals.yml
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -8,7 +8,8 @@ variables:
   # Maven build/test options
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
   # See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
-  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
+  # If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
+  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
   DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
   LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
   MemoryOptions: '-Xmx3072m'
diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
index 8ffd3649fe5c..e31e72b2a46e 100644
--- a/eng/versioning/external_dependencies.txt
+++ b/eng/versioning/external_dependencies.txt
@@ -18,7 +18,7 @@ com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.3
 com.github.spotbugs:spotbugs;4.2.0
 com.github.spotbugs:spotbugs-annotations;4.2.0
 com.github.spotbugs:spotbugs-maven-plugin;4.2.0
-com.google.code.gson:gson;2.8.7
+com.google.code.gson:gson;2.8.6
 com.google.guava:guava;30.1.1-jre
 com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0
 com.microsoft.azure:azure-annotations;1.7.0
diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml
index c501f16a49a7..81045734d602 100644
--- a/sdk/core/azure-core-serializer-json-gson/pom.xml
+++ b/sdk/core/azure-core-serializer-json-gson/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -109,7 +109,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.google.code.gson:gson:[2.8.7]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
+                <include>com.google.code.gson:gson:[2.8.6]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
index a9ffff6dbeac..4ce512bfdf2c 100644
--- a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
+++ b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
index db69c182bb33..7ce03e26f74f 100644
--- a/sdk/identity/azure-identity/pom.xml
+++ b/sdk/identity/azure-identity/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
index 1e516434e657..ffefb6c5b99c 100644
--- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.7</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
+      <version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
@@ -64,7 +64,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.google.code.gson:gson:[2.8.7]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
+                <include>com.google.code.gson:gson:[2.8.6]</include> <!-- {x-include-update;com.google.code.gson:gson;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>