From e17786f1e6053ec35e2d626f9f1709d0da3b1b56 Mon Sep 17 00:00:00 2001
From: HARPER Jon <jon.harper87@gmail.com>
Date: Wed, 9 Apr 2025 10:45:54 +0200
Subject: [PATCH] Move sonar properties from workflow to pom.xml and upgrade to
 newer sonarscanner

mvn sonar:sonar -> mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
---
 .github/workflows/build.yml   | 4 +---
 .github/workflows/patch.yml   | 4 +---
 .github/workflows/release.yml | 4 +---
 pom.xml                       | 2 ++
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab343a5..57db3a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,10 +8,8 @@ on:
 
 jobs:
   build:
-    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
+    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
-      sonarOrganization: powsybl-ci-github
-      sonarProjectKey: com.powsybl:powsybl-single-line-diagram-server
       dockerImage: docker.io/powsybl/single-line-diagram-server
       dockerUsername: powsyblci
       eventOrganizations: gridsuite
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index e8be368..86d2ec6 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -9,11 +9,9 @@ on:
 
 jobs:
   run-patch:
-    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
+    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
       githubappId: ${{ vars.POWSYBL_ACTIONS_APPID }}
-      sonarOrganization: powsybl-ci-github
-      sonarProjectKey: com.powsybl:powsybl-single-line-diagram-server
       dockerImage: docker.io/powsybl/single-line-diagram-server
       dockerUsername: powsyblci
       releaseVersion: ${{ github.event.inputs.releaseVersion }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 833d9d0..a7161a7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,11 +12,9 @@ on:
 
 jobs:
   run-release:
-    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
+    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
       githubappId: ${{ vars.POWSYBL_ACTIONS_APPID }}
-      sonarOrganization: powsybl-ci-github
-      sonarProjectKey: com.powsybl:powsybl-single-line-diagram-server
       dockerImage: docker.io/powsybl/single-line-diagram-server
       dockerUsername: powsyblci
       releaseVersion: ${{ github.event.inputs.releaseVersion }}
diff --git a/pom.xml b/pom.xml
index 8e1169f..29b7c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <liquibase-hibernate-package>com.powsybl.sld.server</liquibase-hibernate-package>
         <powsybl-ws-dependencies.version>2.20.0</powsybl-ws-dependencies.version>
+        <sonar.organization>powsybl-ci-github</sonar.organization>
+        <sonar.projectKey>com.powsybl:powsybl-single-line-diagram-server</sonar.projectKey>
     </properties>
 
     <build>