Skip to content

Commit 84a7da2

Browse files
authored
Use common settings.xml for both snapshot and release (#3182)
1 parent 91bdd4c commit 84a7da2

File tree

3 files changed

+4
-34
lines changed

3 files changed

+4
-34
lines changed

.ci/settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
3-
<localRepository>/var/lib/jenkins/.m2/repository</localRepository>
43
<pluginGroups>
54
<pluginGroup>org.apache.maven.plugins</pluginGroup>
65
<pluginGroup>org.codehaus.mojo</pluginGroup>
@@ -23,7 +22,8 @@
2322
<activeByDefault>true</activeByDefault>
2423
</activation>
2524
<properties>
26-
<gpg.passphrase>${env.KEYPASS}</gpg.passphrase>
25+
<!-- this env variable is defined in .buildkite/hooks/pre-command -->
26+
<gpg.passphrase>${env.KEYPASS_SECRET}</gpg.passphrase>
2727
</properties>
2828
</profile>
2929
</profiles>

.ci/snapshot-settings.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.ci/snapshot.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java -version
2626
set +x
2727
echo "--- Deploy the snapshot :package:"
2828
if [[ "$dry_run" == "true" ]] ; then
29-
echo './mvnw -V -s .ci/snapshot-settings.xml -Pgpg clean deploy -DskipTests --batch-mode'
29+
echo './mvnw -V -s .ci/settings.xml -Pgpg clean deploy -DskipTests --batch-mode'
3030
else
31-
./mvnw -V -s .ci/snapshot-settings.xml -Pgpg clean deploy -DskipTests --batch-mode | tee snapshot.txt
31+
./mvnw -V -s .ci/settings.xml -Pgpg clean deploy -DskipTests --batch-mode | tee snapshot.txt
3232
fi

0 commit comments

Comments
 (0)