From 60c1db7807d407b27ef2aca39d262ecd1a761159 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 10:40:45 +0000
Subject: [PATCH 1/2] Bump org.sonarsource.scanner.maven:sonar-maven-plugin

Bumps [org.sonarsource.scanner.maven:sonar-maven-plugin](https://github.com/SonarSource/sonar-scanner-maven) from 3.9.1.2184 to 3.10.0.2594.
- [Release notes](https://github.com/SonarSource/sonar-scanner-maven/releases)
- [Commits](https://github.com/SonarSource/sonar-scanner-maven/compare/3.9.1.2184...3.10.0.2594)

---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.maven:sonar-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1002e8a8..22053a06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,7 +450,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.1.2184</version>
+                    <version>3.10.0.2594</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>

From c733b5171e0b134623195ffe081c4ec4b99c5a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Helge=20Str=C3=B8m?= <stig.helge.strom@nav.no>
Date: Thu, 25 Jan 2024 11:49:45 +0100
Subject: [PATCH 2/2] Fjerner sonar

---
 .../workflows/build-and-deploy-preprod.yml    |  5 +---
 pom.xml                                       | 29 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
index 9c6c1290..85827556 100644
--- a/.github/workflows/build-and-deploy-preprod.yml
+++ b/.github/workflows/build-and-deploy-preprod.yml
@@ -22,13 +22,10 @@ jobs:
           java-version: 21
           distribution: 'temurin'
           cache: 'maven'
-      - name: Bygg med maven + sonar
+      - name: Bygg med maven
         env:
-          SONAR_PROJECTKEY: ${{ secrets.SONAR_PROJECTKEY }}
-          SONAR_LOGIN: ${{ secrets.SONAR_LOGIN }}
           GITHUB_USERNAME: x-access-token
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-       # run: mvn -B --no-transfer-progress package verify sonar:sonar --settings .m2/maven-settings.xml --file pom.xml
         run: mvn -B --no-transfer-progress package verify --settings .m2/maven-settings.xml --file pom.xml
       - name: Bygg Docker image
         run: |
diff --git a/pom.xml b/pom.xml
index 22053a06..74e0bda8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,14 +35,6 @@
         <cxf.version>4.0.2</cxf.version>
 
         <mockk.version>1.13.5</mockk.version>
-        <!--suppress UnresolvedMavenProperty  Ligger som secret i github-->
-        <sonar.projectKey>${SONAR_PROJECTKEY}</sonar.projectKey>
-        <sonar.organization>navit</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <sonar.coverage.exclusions>**/config/FlywayConfig.kt,**/OppdragServiceE2E.kt
-        </sonar.coverage.exclusions>
-        <!--suppress UnresolvedMavenProperty Ligger som secret i github-->
-        <sonar.login>${SONAR_LOGIN}</sonar.login>
         <spring-cloud.version>2023.0.0</spring-cloud.version>
         <testcontainers.version>1.19.3</testcontainers.version>
         <tjenestespesifikasjoner.version>1.0_20230718100517_1e1beb0</tjenestespesifikasjoner.version>
@@ -445,27 +437,6 @@
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <finalName>${project.artifactId}</finalName>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.10.0.2594</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.10</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>**/config/FlywayConfig.kt</exclude>
-                            <exclude>**/config/OppdragMQConfig.kt</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>