Merge branch 'main' into dependabot/maven/io.opentelemetry.instrument…

…ation-opentelemetry-instrumentation-api-2.2.0

.github/workflows/call-buildimage.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   build-publish-image:
-    uses: felleslosninger/github-workflows/.github/workflows/ci-spring-boot-build-publish-image.yml@main
+    uses: felleslosninger/github-workflows/.github/workflows/ci-spring-boot-build-publish-image.yml@pf-1101-add-multi-module-support
     with:
       image-name: idporten-user-service
       java-version: 21

.trivyignore

@@ -1 +1,2 @@
-CVE-2022-45868    # h2
+CVE-2024-22257 # Broken Access Control in Spring Security. fixed 6.2.2
+CVE-2024-22259 # spring-web. fixed 6.1.4. Brukar ikkje AuthenticatedVoter.

pom.xml

@@ -26,7 +26,7 @@
         <idporten-actuator-starter.version>1.2.0</idporten-actuator-starter.version>
         <open.telemetry.version>2.2.0</open.telemetry.version>
         <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
-        <idporten-metric-constants.version>1.0.0</idporten-metric-constants.version>
+        <idporten-metric-constants.version>1.1.0</idporten-metric-constants.version>
     </properties>
     <dependencies>
         <dependency>