From c14663416886a2179dce60ac52d77d3ea2559f7a Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 12:30:49 +0000 Subject: [PATCH 1/6] Refactor Sonar scan step in Maven workflow Updated Sonar scan command to include build verification and fixed formatting. --- .github/workflows/maven_pull_request.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index 3afc373c..9a55812e 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.github/workflows/maven_pull_request.yml @@ -21,12 +21,13 @@ jobs: - name: Build with Maven run: mvn -B verify --file pom.xml - name: Scan with Sonar + env: + FORK: ${{ github.event.pull_request.head.repo.fork }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | if [ $FORK = false ] then - mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud -Dsonar.host.url=https://sonarcloud.io --file pom.xml + mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java + mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java --file pom.xml fi - env: - FORK: ${{ github.event.pull_request.head.repo.fork }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From f5303db8eaa4ea7300fe38f3173b950e6eff1c90 Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 12:35:04 +0000 Subject: [PATCH 2/6] Add sonar.organization parameter to Maven commands --- .github/workflows/maven_pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index 9a55812e..ca19dbc9 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.github/workflows/maven_pull_request.yml @@ -28,6 +28,6 @@ jobs: run: | if [ $FORK = false ] then - mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java - mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java --file pom.xml + mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud + mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml fi From f084f9155ea8c953c94343fcb8e192ae6e606ed7 Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 14:12:15 +0000 Subject: [PATCH 3/6] Fix Maven command for sonar analysis in workflow --- .github/workflows/maven_pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index ca19dbc9..cd706827 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.github/workflows/maven_pull_request.yml @@ -28,6 +28,6 @@ jobs: run: | if [ $FORK = false ] then - mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud + mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml fi From 03b5bc8b286ec267a8fbfc5ac8b0ff9960afb071 Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 14:36:11 +0000 Subject: [PATCH 4/6] Remove redundant sonar command in workflow --- .github/workflows/maven_pull_request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index cd706827..90deb6fc 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.github/workflows/maven_pull_request.yml @@ -28,6 +28,5 @@ jobs: run: | if [ $FORK = false ] then - mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml fi From 86353567bc3dba619331e349263ffcbc5c35d74c Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 14:42:56 +0000 Subject: [PATCH 5/6] Fix Sonar scan environment variable setup --- .github/workflows/maven_pull_request.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven_pull_request.yml b/.github/workflows/maven_pull_request.yml index 90deb6fc..954662a4 100644 --- a/.github/workflows/maven_pull_request.yml +++ b/.github/workflows/maven_pull_request.yml @@ -21,12 +21,12 @@ jobs: - name: Build with Maven run: mvn -B verify --file pom.xml - name: Scan with Sonar - env: - FORK: ${{ github.event.pull_request.head.repo.fork }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | if [ $FORK = false ] then mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml fi + env: + FORK: ${{ github.event.pull_request.head.repo.fork }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From a40da34c7aae8c7202ebf5b9d311b305d9931dff Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Wed, 12 Nov 2025 14:51:12 +0000 Subject: [PATCH 6/6] Update Sonar scan command in Maven workflow Removed sonar.host.url parameter from Sonar scan command. --- .github/workflows/maven_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven_push.yml b/.github/workflows/maven_push.yml index 91154dfa..16e2da79 100644 --- a/.github/workflows/maven_push.yml +++ b/.github/workflows/maven_push.yml @@ -21,7 +21,7 @@ jobs: - name: Build with Maven run: mvn -B verify --file pom.xml - name: Scan with Sonar - run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud -Dsonar.host.url=https://sonarcloud.io --file pom.xml + run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}