From 26f669463b54cea48c70eb83ac8ed77e9f82b8d0 Mon Sep 17 00:00:00 2001
From: McCabe Coats <mc.coats13@gmail.com>
Date: Tue, 26 Oct 2021 15:19:11 -0600
Subject: [PATCH] Add `overwrite-settings` flag

Add the `setup-java` `overwrite-settings` flag and set it to `false` so that the action uses the `settings.xml` file that we create.
---
 .github/workflows/publish.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 33263ee..5e07812 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,6 +15,19 @@ jobs:
           distribution: 'adopt'
           java-version: '11'
 
+      - name: Set up Maven Central
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+          server-id: ossrh
+          settings-path: ${{ github.workspace }}
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+          overwrite-settings: false
+
       - name: Build settings file
         uses: whelk-io/maven-settings-xml-action@v20
         with:
@@ -39,20 +52,8 @@ jobs:
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 
-      - name: Set up Maven Central
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          server-id: ossrh
-          settings-path: ${{ github.workspace }}
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
       - name: Publish to Maven Central
-        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+        run: mvn clean deploy -s $GITHUB_WORKSPACE/.m2/settings.xml
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}