From 5722fba1e9e621644b3d9765f412c41b3de4024e 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 ca7496b..6211014 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@5e13dcb03778dc9a47bd0adbd84c48392b32cd46
+    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
-      sonarOrganization: gridsuite
-      sonarProjectKey: org.gridsuite:gateway
       dockerImage: docker.io/gridsuite/gateway
       dockerUsername: gridsuiteci
       eventType: gateway_updated
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index 4e37e43..50a1cb7 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@5e13dcb03778dc9a47bd0adbd84c48392b32cd46
+    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
-      sonarOrganization: gridsuite
-      sonarProjectKey: org.gridsuite:gateway
       dockerImage: docker.io/gridsuite/gateway
       dockerUsername: gridsuiteci
       releaseVersion: ${{ github.event.inputs.releaseVersion }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 04d46f2..c5ef644 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@5e13dcb03778dc9a47bd0adbd84c48392b32cd46
+    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@39565de6fd7d394ed76fa09e5197ffb1350ff1e6
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
-      sonarOrganization: gridsuite
-      sonarProjectKey: org.gridsuite:gateway
       dockerImage: docker.io/gridsuite/gateway
       dockerUsername: gridsuiteci
       releaseVersion: ${{ github.event.inputs.releaseVersion }}
diff --git a/pom.xml b/pom.xml
index f4f9dee..e45a184 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,8 @@
 
         <nimbus-jose-jwt.version>8.14</nimbus-jose-jwt.version>
         <oauth2-oidc-sdk.version>7.3</oauth2-oidc-sdk.version>
+        <sonar.organization>gridsuite</sonar.organization>
+        <sonar.projectKey>org.gridsuite:gateway</sonar.projectKey>
     </properties>
 
     <build>