Merge branch '2.1.x' into 2.2.x

Closes gh-23416

Author: wilkinsona

.mvn/extensions.xml

@@ -2,7 +2,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.6.3</version>
+        <version>1.6.6</version>
     </extension>
     <extension>
         <groupId>io.spring.ge.conventions</groupId>

pom.xml

@@ -381,7 +381,7 @@
 				<plugin>
 					<groupId>com.gradle</groupId>
 					<artifactId>gradle-enterprise-maven-extension</artifactId>
-					<version>1.6.3</version>
+					<version>1.6.6</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>