From 32714e4e2ccc5c497252b8d76c5519f433615789 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 16:29:00 +0100
Subject: [PATCH 01/15] Adding sonar-maven-plugin to pluginManagement to have
 short usages (sonar:sonar) possible

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 891cb79bfa9..27ffa4080c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,11 @@
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>3.6.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>4.0.0.4121</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

From 95f86e4a84d08c557fe0ed45be5da507fd855e2f Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 16:33:00 +0100
Subject: [PATCH 02/15] Optimization of action configuration

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afbd146d6e0..43d0da61add 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,8 @@ jobs:
         java: [11, 25]
     steps:
       - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0  # SonarQube needs full git history
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v5
         with:
@@ -35,7 +37,7 @@ jobs:
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
         if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25
-        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=${{secrets.SONAR_TOKEN}} -fprimefaces/pom.xml
+        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this

From f17e6cb592d8dcc2566391d370b8c36591839e15 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 16:45:04 +0100
Subject: [PATCH 03/15] Optimization of sonarQube configuration via pom.xml
 properties

---
 .github/workflows/build.yml | 2 +-
 pom.xml                     | 1 -
 primefaces/pom.xml          | 7 +++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43d0da61add..2068a22ed58 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
         if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25
-        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick
+        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this
diff --git a/pom.xml b/pom.xml
index 27ffa4080c1..eb0fe03fd05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
         <slf4j.version>2.0.17</slf4j.version>
 
         <sonar.skip>true</sonar.skip>
-        <sonar.coverage.jacoco.xmlReportPaths>../primefaces-coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
         <npm.token/>
         <npm.username/>
diff --git a/primefaces/pom.xml b/primefaces/pom.xml
index ca9afa4e24f..92179c01982 100644
--- a/primefaces/pom.xml
+++ b/primefaces/pom.xml
@@ -26,7 +26,14 @@
         <yarn.version>v1.22.22</yarn.version>
         <frontend.directory>${basedir}/src/main/frontend</frontend.directory>
         <frontend.node.env>development</frontend.node.env>
+
+        <!-- SonarQube configuration -->
         <sonar.skip>false</sonar.skip>
+        <sonar.projectKey>java-helpers:primefaces</sonar.projectKey>
+        <sonar.projectName>PrimeFaces</sonar.projectName>
+        <sonar.organization>java-helpers</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <sonar.coverage.jacoco.xmlReportPaths>../primefaces-coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <dependencies>

From 5147b2097ebc1be32ef527c45273dfa1dac9ffa7 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 16:45:56 +0100
Subject: [PATCH 04/15] Removing focus to primefaces-repository, because need
 to check it in my pipeline

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2068a22ed58..3a3ac5e479b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25
+        if: github.ref == 'refs/heads/master' && matrix.java == 25
         run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"

From 4f0070361797c724a53c07cea3f4e708bcac6eea Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 17:30:33 +0100
Subject: [PATCH 05/15] Removing more conditions on repository

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a3ac5e479b..c6fd9d9c8b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,6 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: github.repository == 'primefaces/primefaces'
     name: Build
     strategy:
       fail-fast: false
@@ -49,7 +48,6 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
-    if: github.repository == 'primefaces/primefaces'
     name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
     strategy:
       fail-fast: false

From 6145f1f0d1a8cb1567e681045b107a2c327206b3 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 17:43:08 +0100
Subject: [PATCH 06/15] Adepting if-condition and extending command to have
 sonar-pullrequest decoration

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6fd9d9c8b2..4f3a11080b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,8 +35,8 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: github.ref == 'refs/heads/master' && matrix.java == 25
-        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25
+        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml -Dsonar.pullRequest.key=${{ github.event.number }} -Dsonar.pullRequest.branch=${{ github.head_ref }} -Dsonar.pullRequest.base=${{ github.base_ref }}
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this

From 76bc23a79fe99429f2d05f3e573702eeb88759d6 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 17:43:59 +0100
Subject: [PATCH 07/15] Modifying integration tests to run only for onw

---
 .github/workflows/build.yml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f3a11080b0..2ef0298225c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,30 +48,15 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
+    if: false  # Disabled - only one integration test run for Java 25
     name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
     strategy:
       fail-fast: false
       matrix:
         include:
-          # Java 11 with Faces 4.0
-          - java: 11
-            facesimpl: 'mojarra-4.0'
-          - java: 11
-            facesimpl: 'myfaces-4.0'
-          # Java 17 with Faces 4.1
-          - java: 17
-            facesimpl: 'mojarra-4.1'
-          - java: 17
-            facesimpl: 'myfaces-4.1'
-          # Java 25 with both Faces 4.0 and 4.1
-          - java: 25
-            facesimpl: 'mojarra-4.0'
-          - java: 25
-            facesimpl: 'myfaces-4.0'
+          # Only Java 25 with Mojarra 4.1
           - java: 25
             facesimpl: 'mojarra-4.1'
-          - java: 25
-            facesimpl: 'myfaces-4.1'
     steps:
       - uses: actions/checkout@v6
       - name: Set up JDK ${{ matrix.java }}

From 4143c444a5d036e078408dec32fe541595c9d821 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 18:05:59 +0100
Subject: [PATCH 08/15] Extending logging to verify what is going wrong

---
 .github/workflows/build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2ef0298225c..9766dff1d2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,14 @@ jobs:
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
         if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25
-        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml -Dsonar.pullRequest.key=${{ github.event.number }} -Dsonar.pullRequest.branch=${{ github.head_ref }} -Dsonar.pullRequest.base=${{ github.base_ref }}
+        run: |
+          echo "Debug: SonarCloud Configuration"
+          echo "Project Key: java-helpers:primefaces"
+          echo "Organization: java-helpers"
+          echo "Host URL: https://sonarcloud.io"
+          echo "Token check: ${SONAR_TOKEN:0:10}..."
+          echo "Testing basic SonarCloud connectivity..."
+          mvn sonar:sonar -Dsonar.projectKey=java-helpers:primefaces -Dsonar.organization=java-helpers -Dsonar.host.url=https://sonarcloud.io --file primefaces/pom.xml -X
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this

From 342750e8d1e0a2a42df0e384d54879298de938ca Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 18:08:05 +0100
Subject: [PATCH 09/15] Cancel on java 11 builds for easier debugging

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9766dff1d2e..572bae15049 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 25]
+        java: [25]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -35,7 +35,7 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25
+        if: github.ref == 'refs/heads/master' || github.event_name == 'pull_request'
         run: |
           echo "Debug: SonarCloud Configuration"
           echo "Project Key: java-helpers:primefaces"

From 1be5ba9473174b1e782468153cd062e34c99c252 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 18:32:18 +0100
Subject: [PATCH 10/15] Undoing changes, which have been done for debugging

---
 .github/workflows/build.yml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 572bae15049..8d1257edd16 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [25]
+        java: [11, 25]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -35,15 +35,8 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: github.ref == 'refs/heads/master' || github.event_name == 'pull_request'
-        run: |
-          echo "Debug: SonarCloud Configuration"
-          echo "Project Key: java-helpers:primefaces"
-          echo "Organization: java-helpers"
-          echo "Host URL: https://sonarcloud.io"
-          echo "Token check: ${SONAR_TOKEN:0:10}..."
-          echo "Testing basic SonarCloud connectivity..."
-          mvn sonar:sonar -Dsonar.projectKey=java-helpers:primefaces -Dsonar.organization=java-helpers -Dsonar.host.url=https://sonarcloud.io --file primefaces/pom.xml -X
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25
+        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this
@@ -55,15 +48,30 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
-    if: false  # Disabled - only one integration test run for Java 25
     name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
     strategy:
       fail-fast: false
       matrix:
         include:
-          # Only Java 25 with Mojarra 4.1
+          # Java 11 with Faces 4.0
+          - java: 11
+            facesimpl: 'mojarra-4.0'
+          - java: 11
+            facesimpl: 'myfaces-4.0'
+          # Java 17 with Faces 4.1
+          - java: 17
+            facesimpl: 'mojarra-4.1'
+          - java: 17
+            facesimpl: 'myfaces-4.1'
+          # Java 25 with both Faces 4.0 and 4.1
+          - java: 25
+            facesimpl: 'mojarra-4.0'
+          - java: 25
+            facesimpl: 'myfaces-4.0'
           - java: 25
             facesimpl: 'mojarra-4.1'
+          - java: 25
+            facesimpl: 'myfaces-4.1'
     steps:
       - uses: actions/checkout@v6
       - name: Set up JDK ${{ matrix.java }}

From 8b6a96c5041945b0a15f141d107b57925ac603f7 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 18:44:34 +0100
Subject: [PATCH 11/15] Reenabling checks, which are specific for
 primefaces-repository

---
 .github/workflows/build.yml | 8 +++++---
 primefaces/pom.xml          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d1257edd16..abb178fef76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: github.repository == 'primefaces/primefaces'
     name: Build
     strategy:
       fail-fast: false
@@ -35,12 +36,12 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25
-        run: mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
+        if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25
+        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"
         # setting sonar.skip=true in the parent-pom.xml does not work either because this results in skipping the whole project, setting sonar.skip=false for modules does not compensate for this
-        # run: mvn clean install sonar:sonar -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-4.0 -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=${{secrets.SONAR_TOKEN}}
+        # run: mvn clean install sonar:sonar -Pintegration-tests,parallel-execution,headless,chrome,theme-saga,csp,mojarra-4.0 -Dsonar.organization=primefaces -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=******
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -48,6 +49,7 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
+    if: github.repository == 'primefaces/primefaces'
     name: Integration Tests (Java ${{ matrix.java }} - ${{ matrix.facesimpl }})
     strategy:
       fail-fast: false
diff --git a/primefaces/pom.xml b/primefaces/pom.xml
index 92179c01982..ad6ef9bf772 100644
--- a/primefaces/pom.xml
+++ b/primefaces/pom.xml
@@ -31,7 +31,7 @@
         <sonar.skip>false</sonar.skip>
         <sonar.projectKey>java-helpers:primefaces</sonar.projectKey>
         <sonar.projectName>PrimeFaces</sonar.projectName>
-        <sonar.organization>java-helpers</sonar.organization>
+        <sonar.organization>org.primefaces</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.coverage.jacoco.xmlReportPaths>../primefaces-coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>

From 7eca8af3679d21c013bbf06020caa1e91d370acd Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 18:45:30 +0100
Subject: [PATCH 12/15] Disabling sonar scanning for dependabot (this kind of
 actions do not have access to secrets)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index abb178fef76..60e070378b8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25
+        if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25 && github.actor != 'dependabot[bot]'
         run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"

From 9918715dc5754b44ee973dacc47c6c17c38c5209 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 20:57:54 +0100
Subject: [PATCH 13/15] Adding condition for pull-requests (github.ref is for
 merge-backs of forks not 'refs/heads/master')

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60e070378b8..162092156ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: mvn clean install -T1C -Pminify --batch-mode --show-version
       - name: Sonar Cloud
-        if: github.repository == 'primefaces/primefaces' && github.ref == 'refs/heads/master' && matrix.java == 25 && github.actor != 'dependabot[bot]'
+        if: github.repository == 'primefaces/primefaces' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request') && matrix.java == 25 && github.actor != 'dependabot[bot]'
         run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pquick --file primefaces/pom.xml
         # new approach with code-coverage does not work as of 2024/12 because
         # "Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar (default-cli) on project primefaces-parent: Could not find a default branch for project with key 'org.primefaces:primefaces-parent'. Make sure project exists. -> [Help 1]"

From 6b5445b7ce0909590fade3e5fc7c7e966364dfe2 Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 21:43:42 +0100
Subject: [PATCH 14/15] Fixing project key (missed on switching back to
 primefaces)

---
 primefaces/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/primefaces/pom.xml b/primefaces/pom.xml
index ad6ef9bf772..35fc93ecbbf 100644
--- a/primefaces/pom.xml
+++ b/primefaces/pom.xml
@@ -29,7 +29,7 @@
 
         <!-- SonarQube configuration -->
         <sonar.skip>false</sonar.skip>
-        <sonar.projectKey>java-helpers:primefaces</sonar.projectKey>
+        <sonar.projectKey>org.primefaces:primefaces</sonar.projectKey>
         <sonar.projectName>PrimeFaces</sonar.projectName>
         <sonar.organization>org.primefaces</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

From 01c2726c7e74dc37ef895367b392dffdedba963f Mon Sep 17 00:00:00 2001
From: AndreasIgel <AndreasIgel82@gmail.com>
Date: Sun, 25 Jan 2026 23:18:57 +0100
Subject: [PATCH 15/15] Updating to latest version of sonar-maven-plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb0fe03fd05..ca55fcd09fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>4.0.0.4121</version>
+                    <version>5.5.0.6356</version>
                 </plugin>
             </plugins>
         </pluginManagement>