v27.0.3

gematik · Apr 9, 2024 · e4d0b11 · e4d0b11
1 parent 77e825f
commit e4d0b11
Show file tree

Hide file tree

Showing 18 changed files with 760 additions and 751 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ or use docker compose:
 
 ```console
 $ mvn clean install -pl idp-server -am -Dskip.unittests -Dskip.inttests
-$ export appVersion=27.0.2
+$ export appVersion=27.0.3
 $ export serverLoglevel=info (default)
 $ docker-compose --project-name myidp -f docker-compose-ref.yml up -d
 ```

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,9 @@
+# Release 27.0.3
+
+- switch to docker base image eclipse-temurin:17-jre
+- rename docker image
+- update dependencies
+
 # Release 27.0.2
 
 - adapt idp-client login for ePA (wip)

diff --git a/doc/tokenFlowEgk.html b/doc/tokenFlowEgk.html
diff --git a/doc/tokenFlowPs.html b/doc/tokenFlowPs.html
diff --git a/doc/tokenFlowSso.html b/doc/tokenFlowSso.html
diff --git a/docker-compose-ref.yml b/docker-compose-ref.yml
@@ -45,7 +45,7 @@ services:
 
   # Idp-Server
   idpserver:
-    image: eu.gcr.io/gematik-all-infra-prod/idp/idp-server:${appVersion}
+    image: ${IDM_ARTIFACT_REGISTRY}/idm/idp-server:${appVersion}
     user: 10000:10000
     container_name: idp-server
     <<: [*service-network-ref, *service-setup-ref]

diff --git a/idp-client/pom.xml b/idp-client/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-client</artifactId>
 
-  <version>27.0.2</version>
+  <version>27.0.3</version>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/idp-commons/pom.xml b/idp-commons/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-commons</artifactId>
 
-  <version>27.0.2</version>
+  <version>27.0.3</version>
 
   <dependencies>
 

diff --git a/idp-crypto/pom.xml b/idp-crypto/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-crypto</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
 
   <dependencies>
     <dependency>

diff --git a/idp-report/pom.xml b/idp-report/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
   </parent>
   <artifactId>idp-report</artifactId>
 

diff --git a/idp-sektoral/pom.xml b/idp-sektoral/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-sektoral</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/idp-server/pom.xml b/idp-server/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-server</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>2.3.0</version>
+      <version>2.5.0</version>
     </dependency>
 
     <dependency>
@@ -140,7 +140,7 @@
     <dependency>
       <groupId>org.wiremock</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>3.4.2</version>
+      <version>3.5.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/idp-server/src/main/docker/Dockerfile b/idp-server/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.4.1_1-jre
+FROM eclipse-temurin:17-jre
 
 ARG COMMIT_HASH
 ARG VERSION

diff --git a/idp-server/src/main/resources/application.yml b/idp-server/src/main/resources/application.yml
@@ -56,6 +56,9 @@ idp:
       audienceUrl: "https://epa.audience.de"
       claimsToBeIncluded: [ ORGANIZATION_NAME, PROFESSION_OID, ID_NUMBER ]
   registeredClient:
+    ePA:
+      redirectUri: http://test-ps.gematik.de/ePA
+      returnSsoToken: false
     eRezeptApp:
       redirectUri: http://redirect.gematik.de/erezept
       returnSsoToken: true

diff --git a/idp-test/pom.xml b/idp-test/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-test</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
 
   <dependencies>
     <dependency>

diff --git a/idp-testsuite/pom.xml b/idp-testsuite/pom.xml
@@ -7,18 +7,18 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.2</version>
+    <version>27.0.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-testsuite</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
   <packaging>jar</packaging>
 
   <properties>
     <idp-server.spring.profile>idp</idp-server.spring.profile>
     <sektoral-idp.spring.profile>sektoralIdp</sektoral-idp.spring.profile>
-    <version.datatable>7.15.0</version.datatable>
+    <version.datatable>7.16.1</version.datatable>
   </properties>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-global</artifactId>
-  <version>27.0.2</version>
+  <version>27.0.3</version>
   <packaging>pom</packaging>
 
   <description>IDP</description>
@@ -67,10 +67,10 @@
 
   <properties>
 
-    <docker.registry.gematik>eu.gcr.io/gematik-all-infra-prod</docker.registry.gematik>
-    <docker.image.name.smartcard>${docker.registry.gematik}/idp/idp-server
+    <docker.registry.gematik>local</docker.registry.gematik>
+    <docker.image.name.smartcard>${docker.registry.gematik}/idm/idp-server
     </docker.image.name.smartcard>
-    <docker.image.name.sektoralidp>${docker.registry.gematik}/idp/idp-sektoral
+    <docker.image.name.sektoralidp>${docker.registry.gematik}/idm/idp-sektoral
     </docker.image.name.sektoralidp>
     <docker.image.name.fachdienst>${docker.registry.gematik}/idp/idp-fachdienst
     </docker.image.name.fachdienst>
@@ -91,7 +91,7 @@
     <version.aforeporter>1.2.1</version.aforeporter>
     <version.assertj>3.25.3</version.assertj>
     <version.bouncycastle.bcpkix>1.77</version.bouncycastle.bcpkix>
-    <version.commons-io>2.15.1</version.commons-io>
+    <version.commons-io>2.16.0</version.commons-io>
     <version.commons-lang3>3.14.0</version.commons-lang3>
     <version.gemLibPki>2.1.1</version.gemLibPki>
     <version.h2>2.2.224</version.h2>
@@ -110,12 +110,12 @@
     <version.jakarta.ws.rs-api>3.1.0</version.jakarta.ws.rs-api>
     <version.maven>3.8.6</version.maven>
     <version.maven-clean-plugin>3.3.2</version.maven-clean-plugin>
-    <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+    <version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
     <!-- Overwrite Version from Parent -->
     <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
     <version.maven-enforcer-plugin>3.4.1</version.maven-enforcer-plugin>
     <version.maven-failsafe-plugin>3.2.5</version.maven-failsafe-plugin>
-    <version.maven-gpg-plugin>3.2.0</version.maven-gpg-plugin>
+    <version.maven-gpg-plugin>3.2.2</version.maven-gpg-plugin>
     <version.maven-jar-plugin>3.3.0</version.maven-jar-plugin>
     <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
     <version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
@@ -126,10 +126,10 @@
     <version.maven-source-plugin>3.3.0</version.maven-source-plugin>
     <version.maven-surefire-plugin>3.2.5</version.maven-surefire-plugin>
     <version.nexus-staging-maven-plugin>1.6.13</version.nexus-staging-maven-plugin>
-    <version.sonar-maven-plugin>3.10.0.2594</version.sonar-maven-plugin>
+    <version.sonar-maven-plugin>3.11.0.3922</version.sonar-maven-plugin>
     <version.spotless-maven-plugin>2.43.0</version.spotless-maven-plugin>
     <version.spotless.google-java-format>1.15.0</version.spotless.google-java-format>
-    <version.spring-boot-maven-plugin>3.2.3</version.spring-boot-maven-plugin>
+    <version.spring-boot-maven-plugin>3.2.4</version.spring-boot-maven-plugin>
     <yarnAuditAnalyzerEnabled>false</yarnAuditAnalyzerEnabled>
   </properties>
 

diff --git a/removeDockerImages.sh b/removeDockerImages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # usage:
-# ./removeDockerImages.sh eu.gcr.io/gematik-all-infra-prod/idp/gsi-server
+# ./removeDockerImages.sh ${IDM_ARTIFACT_REGISTRY}/idp/gsi-server
 
 repository="$1"