From 4d7deb3f2c51d2b0623ed36b7b017a5dd4c25314 Mon Sep 17 00:00:00 2001
From: Thilo Schwarz <osp@thischwa.codes>
Date: Sun, 8 Mar 2026 10:50:21 +0100
Subject: [PATCH] Simplify Maven setup by removing unused settings
 configuration and improving readability of SonarCloud scan step.

---
 .github/actions/setup-java-maven/action.yml | 16 +---------------
 .github/workflow/build-and-analyse.yml      |  5 +++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/actions/setup-java-maven/action.yml b/.github/actions/setup-java-maven/action.yml
index 06dbe9f..fe1d914 100644
--- a/.github/actions/setup-java-maven/action.yml
+++ b/.github/actions/setup-java-maven/action.yml
@@ -26,18 +26,4 @@ runs:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-maven-      
-
-    - name: Set up Maven with GitHub Packages
-      run: |
-        echo "<settings>
-          <servers>
-            <server>
-              <id>github-cloudflaredns</id>
-              <username>th-schwarz</username>
-              <password>${{ secrets.GITHUB_TOKEN }}</password>
-            </server>
-          </servers>
-        </settings>" > ~/.m2/settings.xml
-      shell:
-        bash
\ No newline at end of file
+          ${{ runner.os }}-maven-
\ No newline at end of file
diff --git a/.github/workflow/build-and-analyse.yml b/.github/workflow/build-and-analyse.yml
index 04640df..8e19316 100644
--- a/.github/workflow/build-and-analyse.yml
+++ b/.github/workflow/build-and-analyse.yml
@@ -21,7 +21,6 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-
       - name: Setup Java and Maven
         uses: ./.github/actions/setup-java-maven
 
@@ -30,7 +29,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
-        run: mvn -B -DtestClasspath=src/test/ verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=th-schwarz_CloudflareDNS-java
+        run:
+          - echo "Running SonarCloud analysis..."
+          - mvn -B -DtestClasspath=src/test/ verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=th-schwarz_CloudflareDNS-java
 
       - name: Publish Test Report
         uses: ./.github/actions/publish-report/