From db2f779ff3df1c4978d7ffdb50bf8ef45da519a1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 2 Jun 2026 09:21:52 +0200
Subject: [PATCH] Refine GitHub Actions workflows.

See #3277
---
 .github/workflows/ci.yml        |  2 ++
 .github/workflows/snapshots.yml |  4 ++++
 settings.xml                    | 29 -----------------------------
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 settings.xml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d90d741dd..a6f73319c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,3 +25,5 @@ jobs:
         uses: spring-projects/spring-data-build/actions/maven-build@main
         env:
           TESTCONTAINERS_REUSE_ENABLE: true
+        with:
+          settings-xml: '${{ vars.SETTINGS_XML }}'
diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml
index 45c45e599..dd1d4d2d1 100644
--- a/.github/workflows/snapshots.yml
+++ b/.github/workflows/snapshots.yml
@@ -26,3 +26,7 @@ jobs:
           build-name: 'spring-data-elasticsearch'
           username: '${{ secrets.ARTIFACTORY_USERNAME }}'
           password: '${{ secrets.ARTIFACTORY_PASSWORD }}'
+          context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}'
+          repository: '${{ vars.ARTIFACTORY_REPOSITORY }}'
+          project: '${{ vars.ARTIFACTORY_PROJECT }}'
+          settings-xml: '${{ vars.SETTINGS_XML }}'
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index b3227cc11..000000000
--- a/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-	<servers>
-		<server>
-			<id>spring-plugins-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-snapshot</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-milestone</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-	</servers>
-
-</settings>
\ No newline at end of file