Merge branch 'main' into dependabot/maven/org.apache.wss4j-wss4j-ws-s…

…ecurity-common-3.0.3

common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domain/pom.xml

@@ -2,7 +2,7 @@
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

freg-gateway-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kontakt-reservasjonsregister-client/pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kontakt-reservasjonsregister-client</artifactId>
-    <version>1.100.0-SNAPSHOT</version>
+    <version>2.22.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

ks-fiks/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>no.difi.meldingsutveksling</groupId>
     <artifactId>serviceregistry-parent</artifactId>
-    <version>1.100.0-SNAPSHOT</version>
+    <version>2.22.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>
@@ -58,8 +58,9 @@
         <maven.compiler.target>11</maven.compiler.target>
         <move-common.version>1.21.0-SNAPSHOT</move-common.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <kotlin.version>1.9.20</kotlin.version>
         <virksert.version>1.100.0-SNAPSHOT</virksert.version>
-        <kotlin.version>1.9.20</kotlin.version> 
+
         <bouncycastle.version>1.70</bouncycastle.version>
         <micrometer-registry-prometheus.version>1.12.0</micrometer-registry-prometheus.version>
         <org.apache.ws.commons.axiom.version>1.4.0</org.apache.ws.commons.axiom.version>
@@ -254,15 +255,6 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.10.0.2594</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -352,10 +344,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.sonarsource.scanner.maven</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>

serviceregistry-server/pom.xml

@@ -3,14 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>serviceregistry-server</artifactId>
-    <version>1.100.0-SNAPSHOT</version>
+    <version>2.22.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>serviceregistry-server</name>
 
     <parent>
         <artifactId>serviceregistry-parent</artifactId>
         <groupId>no.difi.meldingsutveksling</groupId>
-        <version>1.100.0-SNAPSHOT</version>
+        <version>2.22.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -137,6 +137,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.6</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>

serviceregistry-server/src/main/resources/application-dev-local.yml

@@ -0,0 +1,50 @@
+spring:
+  cloud:
+    config:
+      uri: https://test-meldingsutveksling.dificloud.net/discovery/config
+  eureka:
+    client:
+      serviceUrl:
+        defaultZone: https://test-meldingsutveksling.dificloud.net/discovery/eureka
+  datasource:
+    url: jdbc:mysql://localhost:3306/sr?serverTimezone=Europe/Oslo
+    username: root
+    password:
+  jpa:
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+
+difi:
+  move:
+    auth:
+      sas-token: changeit
+    sign:
+      keystore:
+        path: changeit
+        alias: changeit
+        password: changeit
+    virksert:
+      endpointURL: https://test-meldingsutveksling.dificloud.net/virksomhetssertifikat/
+    dpv:
+      endpointURL: https://tt02.altinn.no/ServiceEngineExternal/CorrespondenceAgencyExternal.svc
+    dpi:
+      endpointURL: https://qaoffentlig.meldingsformidler.digipost.no/api/ebms
+    krr:
+      mp-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/personer
+      mp-dsf-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/mf/personer
+    fiks:
+      svarut:
+        user: changeit
+        password: changeit
+
+app:
+  logger:
+    destination: test-stream-meldingsutveksling.dificloud.net:443
+
+logging:
+  level:
+    org.springframework.ws.client.MessageTracing: TRACE
+    org.springframework.ws.server.MessageTracing: TRACE

serviceregistry-server/src/main/resources/application-production.yml

@@ -74,3 +74,5 @@ difi:
         alias: ${KEYSTORE_ALIAS}
         password: ${KEYSTORE_PASSWORD}
         type: JKS
+    freg:
+      endpoint-u-rL: http://efm-freg-gateway-service:8080/

serviceregistry-server/src/main/resources/application-test.yml

@@ -56,4 +56,6 @@ difi:
     dpo:
       endpointURL: https://www.altinn.no
       serviceCode: ${ALTINN_SRR_SERVICECODE}
-      serviceEditionCode: ${ALTINN_SRR_SERVICE_EDITION_CODE}
+      serviceEditionCode: ${ALTINN_SRR_SERVICE_EDITION_CODE}
+    freg:
+      endpoint-u-rL: http://efm-freg-gateway-service:8080/

serviceregistry-server/src/main/resources/application.yml

@@ -75,6 +75,8 @@ difi:
       maskinporten-issuer: https://test.maskinporten.no/
     feature:
       enableDpfDpv: true
+    freg:
+      endpoint-u-rL: http://localhost:8082/
 logging:
   level:
     org.springframework.web: INFO