From 124a80278a662c804f4cf95aeba94bbc12ba514d Mon Sep 17 00:00:00 2001
From: Tyler Bertrand <tbertrand@gradle.com>
Date: Fri, 28 Apr 2023 14:52:02 -0500
Subject: [PATCH] Create settings.xml with remote cache auth

---
 .github/workflows/build-verification.yml | 6 +++++-
 .mvn/gradle-enterprise.xml               | 7 ++++++-
 .mvn/maven-build-cache-config.xml        | 5 ++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-verification.yml b/.github/workflows/build-verification.yml
index a8ff740..03fe530 100644
--- a/.github/workflows/build-verification.yml
+++ b/.github/workflows/build-verification.yml
@@ -14,7 +14,11 @@ jobs:
         with:
           java-version: '8'
           distribution: 'temurin'
+          server-id: cache
+          server-username: GRADLE_ENTERPRISE_REMOTE_CACHE_USER
+          server-password: GRADLE_ENTERPRISE_ACCESS_KEY
       - name: Build with Maven
-        run: ./mvnw clean verify -B -Dmaven.build.cache.remote.save.enabled=true -Daether.connector.http.preemptiveAuth=true
+        run: cat ~/.m2/settings.xml && ./mvnw clean verify -B -Dmaven.build.cache.remote.save.enabled=true
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
+          GRADLE_ENTERPRISE_REMOTE_CACHE_USER: '' # Required to be empty when using access token to authenticate
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
index 3b21a55..328c64f 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/gradle-enterprise.xml
@@ -4,7 +4,7 @@
     xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
   <server>
-    <url>https://ge.solutions-team.gradle.com</url>
+    <url>https://ge.solutions-team.gradle.com/</url>
     <allowUntrusted>false</allowUntrusted>
   </server>
   <buildScan>
@@ -18,4 +18,9 @@
       <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
     </obfuscation>
   </buildScan>
+    <buildCache>
+        <remote>
+            <enabled>true</enabled>
+        </remote>
+    </buildCache>
 </gradleEnterprise>
diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
index 161d58f..fb51063 100644
--- a/.mvn/maven-build-cache-config.xml
+++ b/.mvn/maven-build-cache-config.xml
@@ -1,8 +1,7 @@
-<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
+<cache>
     <configuration>
         <enabled>true</enabled>
-        <remote enabled="true" saveToRemote="false" id="cache">
+        <remote enabled="true" saveToRemote="true" id="cache">
             <url>https://ge.solutions-team.gradle.com/cache-maven</url>
         </remote>
     </configuration>