From b65e7f7c59af005de0d72ae8e0a761d87b0a8afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Endre=C3=9F?= <laura.endress@syntaxphoenix.com>
Date: Sat, 24 Oct 2020 00:08:51 +0200
Subject: [PATCH] Fix?

---
 .github/workflows/maven-publish.yml |  6 +++---
 settings.xml                        | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 settings.xml

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index c83dbe6..96bfee2 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -20,8 +20,8 @@ jobs:
         java-version: 1.8
         settings-path: ${{ github.workspace }} # location for the settings.xml file
         server-id: ossrh
-        server-username: MAVEN_USERNAME
-        server-password: MAVEN_PASSWORD
+        server-username: ${{ secrets.MAVEN_USER }}
+        server-password: ${{ secrets.MAVEN_PASSWORD }}
 
     - name: Build with Maven
       run: mvn -B package -P ossrh
@@ -36,7 +36,7 @@ jobs:
         GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
 
     - name: Publish to GitHub Packages Apache Maven
-      run: mvn --batch-mode -s $GITHUB_WORKSPACE/settings.xml deploy -P ossrh -Dmaven.test.skip -Dmaven.main.skip -Dmaven.install.skip -Dgpg.passphrase=$GPG_PASSPHRASE
+      run: mvn --batch-mode -s $GITHUB_WORKSPACE/.m2/settings.xml deploy -P ossrh -Dmaven.test.skip -Dmaven.main.skip -Dmaven.install.skip -Dgpg.passphrase=$GPG_PASSPHRASE
       env:
         MAVEN_USER: ${{ secrets.MAVEN_USER }}
         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index 1b4cad7..0000000
--- a/settings.xml
+++ /dev/null
@@ -1,11 +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 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-	<servers>
-		<server>
-			<id>ossrh</id>
-			<username>${env.MAVEN_USER}</username>
-			<password>${env.MAVEN_PASSWORD}</password>
-		</server>
-	</servers>
-</settings>