From 8dc39c1b7c3cbb372fac4d1695d3eefc2d5c4cec Mon Sep 17 00:00:00 2001 From: Romain Brenguier Date: Wed, 5 Aug 2026 15:04:19 +0200 Subject: [PATCH 1/2] Use branch version of the action --- .github/workflows/ruling-diff-comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruling-diff-comment.yml b/.github/workflows/ruling-diff-comment.yml index b68b9c87883..d6f763135fe 100644 --- a/.github/workflows/ruling-diff-comment.yml +++ b/.github/workflows/ruling-diff-comment.yml @@ -47,7 +47,7 @@ jobs: # Use the action from the branch we just pushed - name: Post ruling diff comment - uses: SonarSource/core-languages-tooling-public/ruling-diff-comment@master + uses: SonarSource/core-languages-tooling-public/ruling-diff-comment@romain/fix-sonar-server-source-override with: pr-number: ${{ inputs.pr-number || github.event.pull_request.number }} repository: ${{ github.repository }} From 9179be17a3ec221d29d3d5feee19405887826fb7 Mon Sep 17 00:00:00 2001 From: Romain Brenguier Date: Wed, 5 Aug 2026 15:04:48 +0200 Subject: [PATCH 2/2] Introduce changes to the expected ruling to test the diff. --- .../src/test/resources/commons-beanutils/java-S103.json | 5 +---- .../eclipse-jetty-similar-to-main-small/java-S103.json | 2 +- .../resources/eclipse-jetty-similar-to-main/java-S103.json | 2 +- its/ruling/src/test/resources/eclipse-jetty/java-S100.json | 2 +- its/ruling/src/test/resources/guava/java-S100.json | 2 +- .../src/test/resources/jboss-ejb3-tutorial/java-S103.json | 5 +---- its/ruling/src/test/resources/mall/java-S103.json | 2 +- its/ruling/src/test/resources/regex-examples/java-S1135.json | 2 +- its/ruling/src/test/resources/sonar-server/java-S107.json | 2 +- its/ruling/src/test/resources/vibebot/java-S1120.json | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/its/ruling/src/test/resources/commons-beanutils/java-S103.json b/its/ruling/src/test/resources/commons-beanutils/java-S103.json index 4e7e504411e..7a4ee447e15 100644 --- a/its/ruling/src/test/resources/commons-beanutils/java-S103.json +++ b/its/ruling/src/test/resources/commons-beanutils/java-S103.json @@ -2,14 +2,11 @@ "commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java": [ 134 ], -"commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java": [ -164 -], "commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/MethodUtils.java": [ 1319 ], "commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java": [ -236 +238 ], "commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java": [ 555 diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main-small/java-S103.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main-small/java-S103.json index 30002e79bc8..2dfafbacd26 100644 --- a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main-small/java-S103.json +++ b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main-small/java-S103.json @@ -1,5 +1,5 @@ { "org.eclipse.jetty:jetty-project:jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/AbstractPathSpec.java": [ -64 +66 ] } diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S103.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S103.json index 920a84ebe84..32db91bf4d4 100644 --- a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S103.json +++ b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S103.json @@ -6,7 +6,7 @@ "org.eclipse.jetty:jetty-project:jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java": [ 159, 169, -197, +199, 285, 331 ], diff --git a/its/ruling/src/test/resources/eclipse-jetty/java-S100.json b/its/ruling/src/test/resources/eclipse-jetty/java-S100.json index 7e833e08772..023931f2475 100644 --- a/its/ruling/src/test/resources/eclipse-jetty/java-S100.json +++ b/its/ruling/src/test/resources/eclipse-jetty/java-S100.json @@ -2,7 +2,7 @@ "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java": [ 340, 349, -395, +397, 415, 470 ] diff --git a/its/ruling/src/test/resources/guava/java-S100.json b/its/ruling/src/test/resources/guava/java-S100.json index 724249364f7..9c769e7b1b6 100644 --- a/its/ruling/src/test/resources/guava/java-S100.json +++ b/its/ruling/src/test/resources/guava/java-S100.json @@ -1,7 +1,7 @@ { "com.google.guava:guava:src/com/google/common/hash/Hashing.java": [ 101, -113, +115, 132, 144 ] diff --git a/its/ruling/src/test/resources/jboss-ejb3-tutorial/java-S103.json b/its/ruling/src/test/resources/jboss-ejb3-tutorial/java-S103.json index 055d73aec27..763dc80ee6c 100644 --- a/its/ruling/src/test/resources/jboss-ejb3-tutorial/java-S103.json +++ b/its/ruling/src/test/resources/jboss-ejb3-tutorial/java-S103.json @@ -1,10 +1,7 @@ { "jboss-ejb3-tutorial:blob/src/org/jboss/tutorial/blob/bean/LobTesterBean.java": [ -68, +66, 69, -70, -71, -72, 73, 74, 75, diff --git a/its/ruling/src/test/resources/mall/java-S103.json b/its/ruling/src/test/resources/mall/java-S103.json index c9c9d226a4a..4c7dc939f32 100644 --- a/its/ruling/src/test/resources/mall/java-S103.json +++ b/its/ruling/src/test/resources/mall/java-S103.json @@ -1,6 +1,6 @@ { "com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/config/MallSecurityConfig.java": [ -43 +45 ], "com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/controller/CmsSubjectController.java": [ 40, diff --git a/its/ruling/src/test/resources/regex-examples/java-S1135.json b/its/ruling/src/test/resources/regex-examples/java-S1135.json index 50a62569189..1b0698efd33 100644 --- a/its/ruling/src/test/resources/regex-examples/java-S1135.json +++ b/its/ruling/src/test/resources/regex-examples/java-S1135.json @@ -1,6 +1,6 @@ { "org.regex-examples:regex-examples:src/main/java/org/regex/examples/RegexDatabase5.java": [ -1234, +1232, 1236, 1238 ] diff --git a/its/ruling/src/test/resources/sonar-server/java-S107.json b/its/ruling/src/test/resources/sonar-server/java-S107.json index 54621e9ed3e..e36dade33b1 100644 --- a/its/ruling/src/test/resources/sonar-server/java-S107.json +++ b/its/ruling/src/test/resources/sonar-server/java-S107.json @@ -1,6 +1,6 @@ { "org.sonarsource.sonarqube:sonar-server:src/main/java/org/sonar/server/issue/IssueQueryFactory.java": [ -205, +207, 243 ], "org.sonarsource.sonarqube:sonar-server:src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java": [ diff --git a/its/ruling/src/test/resources/vibebot/java-S1120.json b/its/ruling/src/test/resources/vibebot/java-S1120.json index c191a05ccb1..68eaa738de2 100644 --- a/its/ruling/src/test/resources/vibebot/java-S1120.json +++ b/its/ruling/src/test/resources/vibebot/java-S1120.json @@ -1,6 +1,6 @@ { "org.vibebot:vibebot:src/main/java/org/vibebot/App.java": [ 7, -10 +9 ] }