Add SONAR_ORGANIZATION

The SONAR_ORGANIZATION variable has been added to support
the use of personal organization for analysis.

Author: edewata

.github/workflows/code-analysis-pull.yml

@@ -6,6 +6,9 @@ on:
     types:
       - completed
 
+env:
+  SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION || github.repository_owner }}
+
 jobs:
   retrieve-pr:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
@@ -115,14 +118,16 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      # https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-for-maven/
       - name: Build and analyze with SonarCloud
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: >
           mvn
           -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-          -Dsonar.projectKey=dogtagpki_jss
+          -Dsonar.organization=${SONAR_ORGANIZATION}
+          -Dsonar.projectKey=${SONAR_ORGANIZATION}_jss
           -pl '!native,!symkey'
           -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }}
           -Dsonar.pullrequest.key=${{ needs.retrieve-pr.outputs.pr-number }}

.github/workflows/code-analysis.yml

@@ -2,6 +2,9 @@ name: Code Analysis
 
 on: [push, pull_request]
 
+env:
+  SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION || github.repository_owner }}
+
 jobs:
   build:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
@@ -38,14 +41,16 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      # https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-for-maven/
       - name: Build and analyze with SonarCloud
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: >
           mvn
           -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-          -Dsonar.projectKey=dogtagpki_jss
+          -Dsonar.organization=${SONAR_ORGANIZATION}
+          -Dsonar.projectKey=${SONAR_ORGANIZATION}_jss
           -pl '!native,!symkey'
 
   get-pr-ref:

pom.xml

@@ -10,7 +10,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <sonar.organization>dogtagpki</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.c.file.suffixes>-</sonar.c.file.suffixes>
         <sonar.cpp.file.suffixes>-</sonar.cpp.file.suffixes>