v28.0.1

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.3
+$ export appVersion=28.0.1
 $ export serverLoglevel=info (default)
 $ docker-compose --project-name myidp -f docker-compose-ref.yml up -d
 ```

ReleaseNotes.md

@@ -1,3 +1,10 @@
+# Release 28.0.1
+
+- remove parent pom from testsuite to avoid dependency conflicts
+- update dependencies
+- updating some test certificates
+- remove Aforeporter from testsuite
+
 # Release 27.0.3
 
 - switch to docker base image eclipse-temurin:17-jre

idp-client/pom.xml

@@ -7,13 +7,13 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.3</version>
+    <version>28.0.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-client</artifactId>
 
-  <version>27.0.3</version>
+  <version>28.0.1</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -45,12 +45,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${version.commons-io}</version>
-      <scope>test</scope>
-    </dependency>
+
 
     <dependency>
       <groupId>org.projectlombok</groupId>

idp-client/src/test/java/de/gematik/idp/client/MockIdpClientTest.java

@@ -146,7 +146,7 @@ void verifyServerSignatureEcc() {
   }
 
   @Test
-  void verifyServerSignatureRsa(@PkiKeyResolver.Filename("rsa") final PkiIdentity rsaIdentity) {
+  void verifyServerSignatureRsa(@PkiKeyResolver.Filename("R2048") final PkiIdentity rsaIdentity) {
     mockIdpClient =
         MockIdpClient.builder()
             .serverIdentity(rsaIdentity)

idp-commons/pom.xml

@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.3</version>
+    <version>28.0.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-commons</artifactId>
 
-  <version>27.0.3</version>
+  <version>28.0.1</version>
 
   <dependencies>
 
@@ -25,16 +25,16 @@
       <artifactId>spring-boot-starter-jersey</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${version.slf4j-api}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.konghq</groupId>
@@ -67,6 +67,12 @@
       <groupId>org.bitbucket.b_c</groupId>
       <artifactId>jose4j</artifactId>
       <version>0.9.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

idp-commons/src/test/java/de/gematik/idp/authentication/AuthenticationChallengeVerifierTest.java

@@ -73,7 +73,7 @@ class AuthenticationChallengeVerifierTest {
 
   @BeforeEach
   public void init(
-      @PkiKeyResolver.Filename("1_C.SGD-HSM.AUT_oid_sgd1_hsm_ecc.p12")
+      @PkiKeyResolver.Filename("idp_sig.p12")
           final PkiIdentity serverIdentity,
       @PkiKeyResolver.Filename("109500969_X114428530-2_c.ch.aut-ecc.p12")
           final PkiIdentity clientIdentity,

idp-commons/src/test/java/de/gematik/idp/authentication/AuthenticationResponseBuilderTest.java

@@ -66,7 +66,7 @@ class AuthenticationResponseBuilderTest {
 
   @BeforeEach
   public void init(
-      @PkiKeyResolver.Filename("hsm_ecc") final PkiIdentity serverIdentity,
+      @PkiKeyResolver.Filename("idp_sig") final PkiIdentity serverIdentity,
       @PkiKeyResolver.Filename("c.ch.aut-ecc") final PkiIdentity clientIdentity) {
     this.clientIdentity = clientIdentity;
     this.serverIdentity = serverIdentity;

idp-commons/src/test/java/de/gematik/idp/data/FederationPubKeyTest.java

@@ -45,7 +45,7 @@ void buildJwkWithX5c() {
         CryptoLoader.getCertificateFromPem(
             FileUtils.readFileToByteArray(
                 ResourceReader.getFileFromResourceAsTmpFile(
-                    "1_C.SGD-HSM.AUT_oid_sgd1_hsm_ecc.pem")));
+                    "idp_sig.pem")));
     final FederationPubKey federationPubKey = new FederationPubKey();
     federationPubKey.setCertificate(Optional.of(certificate));
 

idp-commons/src/test/java/de/gematik/idp/token/IdTokenBuilderTest.java

@@ -70,7 +70,7 @@ class IdTokenBuilderTest {
   private PkiIdentity pkiIdentity;
 
   @BeforeEach
-  public void init(@PkiKeyResolver.Filename("authz_rsa") final PkiIdentity clientIdentity) {
+  public void init(@PkiKeyResolver.Filename("apo-rsa") final PkiIdentity clientIdentity) {
     pkiIdentity = clientIdentity;
     final Map<String, Object> bodyClaims = new HashMap<>();
     bodyClaims.put(PROFESSION_OID.getJoseName(), OID_VERSICHERTER);
@@ -158,7 +158,7 @@ void checkIdTokenClaimAtHash() {
 
   @Test
   void checkIdTokenWithoutNotExistingUserConsentTokenFromAuthenticationToken(
-      @PkiKeyResolver.Filename("authz_rsa") final PkiIdentity clientIdentity) {
+      @PkiKeyResolver.Filename("apo-rsa") final PkiIdentity clientIdentity) {
     final Map<String, Object> bodyClaims = new HashMap<>();
     bodyClaims.put(ID_NUMBER.getJoseName(), "id_number");
     bodyClaims.put(GIVEN_NAME.getJoseName(), "given_name");

idp-commons/src/test/resources/idp_sig.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICsTCCAligAwIBAgIHA61I5ACUjTAKBggqhkjOPQQDAjCBhDELMAkGA1UEBhMC
+REUxHzAdBgNVBAoMFmdlbWF0aWsgR21iSCBOT1QtVkFMSUQxMjAwBgNVBAsMKUtv
+bXBvbmVudGVuLUNBIGRlciBUZWxlbWF0aWtpbmZyYXN0cnVrdHVyMSAwHgYDVQQD
+DBdHRU0uS09NUC1DQTEwIFRFU1QtT05MWTAeFw0yMDA4MDQwMDAwMDBaFw0yNTA4
+MDQyMzU5NTlaMEkxCzAJBgNVBAYTAkRFMSYwJAYDVQQKDB1nZW1hdGlrIFRFU1Qt
+T05MWSAtIE5PVC1WQUxJRDESMBAGA1UEAwwJSURQIFNpZyAxMFowFAYHKoZIzj0C
+AQYJKyQDAwIIAQEHA0IABJZQrG1NWxIB3kz/6Z2zojlkJqN3vJXZ3EZnJ6JXTXw5
+ZDFZ5XjwWmtgfomv3VOV7qzI5ycUSJysMWDEu3mqRcajge0wgeowHQYDVR0OBBYE
+FJ8DVLAZWT+BlojTD4MT/Na+ES8YMDgGCCsGAQUFBwEBBCwwKjAoBggrBgEFBQcw
+AYYcaHR0cDovL2VoY2EuZ2VtYXRpay5kZS9vY3NwLzAMBgNVHRMBAf8EAjAAMCEG
+A1UdIAQaMBgwCgYIKoIUAEwEgUswCgYIKoIUAEwEgSMwHwYDVR0jBBgwFoAUKPD4
+5qnId8xDRduartc6g6wOD6gwLQYFKyQIAwMEJDAiMCAwHjAcMBowDAwKSURQLURp
+ZW5zdDAKBggqghQATASCBDAOBgNVHQ8BAf8EBAMCB4AwCgYIKoZIzj0EAwIDRwAw
+RAIgVBPhAwyX8HAVH0O0b3+VazpBAWkQNjkEVRkv+EYX1e8CIFdn4O+nivM+XVi9
+xiKK4dW1R7MD334OpOPTFjeEhIVV
+-----END CERTIFICATE-----

idp-crypto/pom.xml

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

idp-report/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.3</version>
+    <version>28.0.1</version>
   </parent>
   <artifactId>idp-report</artifactId>
 

idp-sektoral/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.3</version>
+    <version>28.0.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-sektoral</artifactId>
-  <version>27.0.3</version>
+  <version>28.0.1</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -48,12 +48,6 @@
       <artifactId>idp-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>de.gematik.idp</groupId>
-      <artifactId>idp-test</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
@@ -62,18 +56,10 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.konghq</groupId>
-      <artifactId>unirest-java</artifactId>
-    </dependency>
     <dependency>
       <groupId>jakarta.validation</groupId>
       <artifactId>jakarta.validation-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>

idp-server/pom.xml

@@ -7,18 +7,19 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>27.0.3</version>
+    <version>28.0.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-server</artifactId>
-  <version>27.0.3</version>
+  <version>28.0.1</version>
   <packaging>jar</packaging>
 
   <properties>
     <commit_hash>undefined</commit_hash>
     <version.jaxb-api>2.4.0-b180830.0359</version.jaxb-api>
     <version.jaxb-impl>4.0.5</version.jaxb-impl>
+    <version.tiger-rbel>3.0.5</version.tiger-rbel>
   </properties>
 
   <dependencies>
@@ -140,33 +141,19 @@
     <dependency>
       <groupId>org.wiremock</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>3.5.2</version>
+      <version>3.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>
-      <version>1.8.0</version>
+      <version>1.9.0</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/de.gematik.test/tiger-rbel -->
     <dependency>
       <groupId>de.gematik.test</groupId>
-      <artifactId>tiger-test-lib</artifactId>
-      <version>${version.tiger}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bctls-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
+      <artifactId>tiger-rbel</artifactId>
+      <version>${version.tiger-rbel}</version>
     </dependency>
     <dependency>
       <groupId>io.rest-assured</groupId>
@@ -187,14 +174,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>

idp-test/pom.xml

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