oppgrader kafka manager (#1319)

Author: stigebil

.github/kafka-manager/familie-tilbake-kafka-manager-dev.yml

@@ -6,7 +6,7 @@ metadata:
   labels:
     team: teamfamilie
 spec:
-  image: europe-north1-docker.pkg.dev/nais-management-233d/poao/kafka-manager:2023.12.13-06.32-bd9f953 # See https://github.com/navikt/kafka-manager/packages
+  image: europe-north1-docker.pkg.dev/nais-management-233d/poao/kafka-manager:2024.02.06-12.20-dabf3e1 # See https://github.com/navikt/kafka-manager/actions
   port: 8080
   ingresses:
     - https://familie-tilbake-kafka-manager.intern.dev.nav.no

.github/kafka-manager/familie-tilbake-kafka-manager-prod.yml

@@ -6,7 +6,7 @@ metadata:
   labels:
     team: teamfamilie
 spec:
-  image: europe-north1-docker.pkg.dev/nais-management-233d/poao/kafka-manager:2023.12.13-06.32-bd9f953 # See https://github.com/navikt/kafka-manager/packages
+  image: europe-north1-docker.pkg.dev/nais-management-233d/poao/kafka-manager:2024.02.06-12.20-dabf3e1 # See https://github.com/navikt/kafka-manager/actions
   port: 8080
   ingresses:
     - https://familie-tilbake-kafka-manager.intern.nav.no

.github/workflows/build.yml

@@ -58,21 +58,11 @@ jobs:
         with:
           java-version: 21
           distribution: 'temurin'
-          cache: 'maven'
-      - name: Bygg (dependabot)
-        if: github.actor == 'dependabot[bot]'
-        env:
-          GITHUB_USERNAME: x-access-token
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn verify --settings .m2/maven-settings.xml --file pom.xml
-      - name: Bygg med maven + sonar
-        if: github.actor != 'dependabot[bot]'
+      - 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 --settings .m2/maven-settings.xml -DtrimStackTrace=false --file pom.xml -Dchangelist= -Dsha1=-$TIMESTAMP-$(echo $GITHUB_SHA | cut -c1-7)
+        run: mvn --version && mvn -B --no-transfer-progress verify --settings .m2/maven-settings.xml --file pom.xml
 
   run-e2e:
     if: github.event.pull_request.draft == false && github.actor != 'dependabot[bot]'

pom.xml

@@ -314,6 +314,11 @@
             <artifactId>pooled-jms</artifactId>
             <version>3.1.5</version>
         </dependency>
+        <dependency> <!-- Overstyrer versjon default i spring pga sikkerhetshull https://security.snyk.io/package/maven/org.yaml:snakeyaml -->
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.2</version>
+        </dependency>
         <!-- Test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>