From 356fb8577e028673ea6436f7a762188f43311cd1 Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Tue, 13 Jun 2023 10:35:53 +0200
Subject: [PATCH] Use common settings.xml for both snapshot and release

---
 .ci/settings.xml          |  4 ++--
 .ci/snapshot-settings.xml | 30 ------------------------------
 .ci/snapshot.sh           |  4 ++--
 3 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 .ci/snapshot-settings.xml

diff --git a/.ci/settings.xml b/.ci/settings.xml
index e3634b21c6..3b6791abac 100644
--- a/.ci/settings.xml
+++ b/.ci/settings.xml
@@ -1,6 +1,5 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
-    <localRepository>/var/lib/jenkins/.m2/repository</localRepository>
     <pluginGroups>
         <pluginGroup>org.apache.maven.plugins</pluginGroup>
         <pluginGroup>org.codehaus.mojo</pluginGroup>
@@ -23,7 +22,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <gpg.passphrase>${env.KEYPASS}</gpg.passphrase>
+                <!-- this env variable is defined in .buildkite/hooks/pre-command -->
+                <gpg.passphrase>${env.KEYPASS_SECRET}</gpg.passphrase>
             </properties>
         </profile>
     </profiles>
diff --git a/.ci/snapshot-settings.xml b/.ci/snapshot-settings.xml
deleted file mode 100644
index 3b6791abac..0000000000
--- a/.ci/snapshot-settings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
-    <pluginGroups>
-        <pluginGroup>org.apache.maven.plugins</pluginGroup>
-        <pluginGroup>org.codehaus.mojo</pluginGroup>
-    </pluginGroups>
-    <servers>
-        <server>
-            <id>sonatype-nexus-snapshots</id>
-            <username>${env.SERVER_USERNAME}</username>
-            <password>${env.SERVER_PASSWORD}</password>
-        </server>
-        <server>
-            <id>sonatype-nexus-staging</id>
-            <username>${env.SERVER_USERNAME}</username>
-            <password>${env.SERVER_PASSWORD}</password>
-        </server>
-    </servers>
-    <profiles>
-        <profile>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <!-- this env variable is defined in .buildkite/hooks/pre-command -->
-                <gpg.passphrase>${env.KEYPASS_SECRET}</gpg.passphrase>
-            </properties>
-        </profile>
-    </profiles>
-</settings>
diff --git a/.ci/snapshot.sh b/.ci/snapshot.sh
index 49a84eac86..9c4cd2a916 100755
--- a/.ci/snapshot.sh
+++ b/.ci/snapshot.sh
@@ -26,7 +26,7 @@ java -version
 set +x
 echo "--- Deploy the snapshot :package:"
 if [[ "$dry_run" == "true" ]] ; then
-  echo './mvnw -V -s .ci/snapshot-settings.xml -Pgpg clean deploy -DskipTests --batch-mode'
+  echo './mvnw -V -s .ci/settings.xml -Pgpg clean deploy -DskipTests --batch-mode'
 else
-  ./mvnw -V -s .ci/snapshot-settings.xml -Pgpg clean deploy -DskipTests --batch-mode | tee snapshot.txt
+  ./mvnw -V -s .ci/settings.xml -Pgpg clean deploy -DskipTests --batch-mode | tee snapshot.txt
 fi