Merge branch 'development'

.github/dependabot.yml

@@ -3,6 +3,54 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/appstore/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/broker/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/clearinghouse/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/core/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/messaging/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/paris/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "maven"
+    directory: "/vocol/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"
+    open-pull-requests-limit: 30
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
     target-branch: "development"
     open-pull-requests-limit: 30

.github/workflows/development-maven-build.yml

@@ -15,10 +15,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'temurin'
         java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml

.github/workflows/maven-build-push.yml

@@ -13,10 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'temurin'
         java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml

.github/workflows/maven-build.yml

@@ -19,59 +19,40 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 11
       - name: Cache maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Run style checks
         run: mvn -B -U checkstyle:check --file pom.xml
 
-  license:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache maven packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Run license checks
-        run: mvn -B -U license:check --file pom.xml
-
   build:
-    needs: [style, license]
+    needs: [style]
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [11, 12, 13, 14, 15, 16]
+        java: [11]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Cache maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

CHANGELOG.md

@@ -9,6 +9,54 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Version [7.0.0] 2022-05-27
+
+### Organizational Note (major change):
+The IDSA repository of the IDS-Messaging-Services is maintained by `sovity GmbH` as of this release. This changes the naming of the internal package structure and, most importantly, the repository in which the artifacts are published.
+
+The new repository can be included in projects as follows. As of version 7.0.0, the releases are published here:
+
+	<repository>
+	    <id>sovity-public</id>
+        <url>https://pkgs.dev.azure.com/sovity/5bec6cbd-c80a-47ac-86ce-1deb26cee853/_packaging/artifact/maven/v1</url>
+    </repository>
+
+### Minor Change: Logging of incoming and outgoing messages
+It is as of now possible to log incoming messages (header, not payload), send requests and received responses to send requests. Following new optional application.properties settings are provided to enable or disable logging:
+
+- `messaging.log.incoming=true/false` Logs all incoming messages at info level (incoming requests + incoming responses to self-send requests). Default if not set is false = turned off.
+- `messaging.log.outgoing=true/false` Logs all outgoing messages at info level (outgoing requests + outgoing responses to incoming requests). Default if not set is false = turned off.
+
+### Patch Change: Fixes
+- ReferingConnector validation ([PR 526](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/526))
+
+### Patch Change: Other 
+- Added log-codes for event severity Info ([PR 537](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/537))
+- Changed `name` and `id` of `eis-ids-public` repository in pom.
+- Added negative leeway for expiration of cached DAT ([PR 527](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/527))
+
+### Patch Change: Dependency Maintenance
+- Upgrade: maven-dependency-plugin 3.2.0 -> 3.3.0 ([PR 446](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/446))
+- Upgrade: maven-compiler-plugin 3.10.0 -> 3.10.1 ([PR 445](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/445))
+- Upgrade: com.puppycrawl.tools:checkstyle 9.3 -> 10.2 ([PR 442](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/442), [PR 520](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/520))
+- Upgrade: org.springframework:spring-webmvc 5.3.15 -> 5.3.20 ([PR 438](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/453), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512))
+- Upgrade: org.springframework:spring-core 5.3.15 -> 5.3.20 ([PR 438](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/453), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512))
+- Upgrade: org.springframework:spring-web 5.3.15 -> 5.3.20 ([PR 438](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/453), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512))
+- Upgrade: org.springframework:spring-test 5.3.15 -> 5.3.20 ([PR 438](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/453), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512))
+- Upgrade: org.springframework:spring-tx 5.3.15 -> 5.3.20 ([PR 438](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/453), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512))
+- Upgrade: org.springframework.boot:spring-boot-starter-test 2.6.3 -> 2.7.0 ([PR 440](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/440), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512), [PR 531](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/531))
+- Upgrade: org.springframework.boot:spring-boot-starter 2.6.3 -> 2.7.0 ([PR 441](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/441), [PR 512](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/438), [PR 453](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/512), [PR 531](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/531))
+- Upgrade: org.json:json 20211205 -> 20220320 ([PR 454](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/454))
+- Upgrade: org.bitbucket.b_c:jose4j 0.7.10 -> 0.7.12 ([PR 455](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/455), [PR 517](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/517))
+- Upgrade: maven-surefire-plugin 2.19.1 -> 2.22.2 ([PR 515](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/515))
+- Upgrade: org.junit.platform:junit-platform-surefire-provider 1.0.3 -> 1.3.2 ([PR 515](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/515))
+- Upgrade: org.apache.jena:jena-core 4.4.0 -> 4.5.0 ([PR 520](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/520))
+- Upgrade: org.projectlombok:lombok 1.18.22 -> 1.18.24 ([PR 520](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/520))
+- Upgrade: org.apache.maven.plugins:maven-javadoc-plugin 3.3.2 -> 3.4.0 ([PR 520](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/520))
+- Upgrade: com.fasterxml.jackson.core:jackson-databind 2.9.10.8 -> 2.13.3 ([PR 516](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/516))
+- Add: com.fasterxml.jackson.core:jackson-annotations 2.13.3 ([PR 516](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/516))
+- Remove: deprecated junit-platform-surefire-provider and use built-in support in surefire >= 2.22.0 instead ([PR 525](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/525))
+
 ## Version [6.1.0] 2022-02-17
 
 ### Minor Change: New ConnectorFingerprintProvider

README.md

@@ -59,16 +59,13 @@ Supported out-of-the-box connectivity to the following IDS-Infrastructure-Compon
 
 ### Step 1
 
-The Java-modules provided by the project are accessible as Maven artifact dependencies. These artifacts are hosted on Fraunhofer ISST's Nexus. In order for the artifacts to be found, the Fraunhofer ISST Nexus repository must be added as a repository in the project's pom:
+The Java-modules provided by the project are accessible as Maven artifact dependencies. The repository must be added as a repository in the project's pom:
 
 ```xml
-<repositories>
-    <repository>
-        <id>isst-nexus-public</id>
-        <name>isst-public</name>
-        <url>https://mvn.ids.isst.fraunhofer.de/nexus/repository/ids-public/</url>
-    </repository>
-</repositories>
+<repository>
+    <id>sovity-public</id>
+    <url>https://pkgs.dev.azure.com/sovity/5bec6cbd-c80a-47ac-86ce-1deb26cee853/_packaging/artifact/maven/v1</url>
+</repository>
 ```
 
 ### Step 2
@@ -94,7 +91,7 @@ So, if an IDS-Connector should be implemented, in whose data ecosystem an IDS-Br
 
 ```xml
 <dependency>
-    <groupId>de.fraunhofer.ids.messaging</groupId>
+    <groupId>ids.messaging</groupId>
     <artifactId>broker</artifactId>
     <version>IDS_MESSAGING_SERVICES_VERSION</version>
 </dependency>
@@ -206,13 +203,11 @@ Log-codes exist for different log-levels. They allow easy search for the code lo
 Syntax: IMS-XY-L-1234, shortened to: IMSXYL1234
  - IMS = IDS-Messaging-Services
  - XY = Subsystem Module (CO Core, AP AppStore, BR Broker, CL ClearingHouse, ME Messaging, PA Paris, VO Vocol)
- - L = Event Severity (E Error, W Warn, D Debug)
+ - L = Event Severity (E Error, W Warn, D Debug, I Info)
  - 1234 = Log identifier
 
 Will e.g. print as [code=(IMSCOE0001)]: IDS-Messaging-Services Core-Module Error 0001.
 
-No log-code will be printed for log-info level.
-
 ## Other: Project-Wiki
 
 This project has a <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/wiki">GitHub-Wiki</a> where more details about the individual java-modules and their functionalities are documented.

appstore/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <artifactId>messaging-services</artifactId>
-        <groupId>de.fraunhofer.ids.messaging</groupId>
+        <groupId>ids.messaging</groupId>
         <version>${revision}</version>
     </parent>
 
@@ -39,7 +39,7 @@
     <dependencies>
         <!-- IDS-Messaging-Services Dependency -->
         <dependency>
-            <groupId>de.fraunhofer.ids.messaging</groupId>
+            <groupId>ids.messaging</groupId>
             <artifactId>messaging</artifactId>
             <version>${revision}</version>
             <scope>compile</scope>

appstore/src/main/java/de/fraunhofer/ids/messaging/appstore/AppStoreService.java → appstore/src/main/java/ids/messaging/appstore/AppStoreService.java

@@ -1,4 +1,6 @@
 /*
+ * Copyright Fraunhofer Institute for Software and Systems Engineering
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -10,28 +12,32 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ *  Contributors:
+ *       sovity GmbH
+ *
  */
-package de.fraunhofer.ids.messaging.appstore;
+package ids.messaging.appstore;
 
 import java.io.IOException;
 import java.net.URI;
 
-import de.fraunhofer.ids.messaging.common.DeserializeException;
-import de.fraunhofer.ids.messaging.common.SerializeException;
-import de.fraunhofer.ids.messaging.core.config.ConfigContainer;
-import de.fraunhofer.ids.messaging.core.daps.ClaimsException;
-import de.fraunhofer.ids.messaging.core.daps.DapsTokenManagerException;
-import de.fraunhofer.ids.messaging.core.daps.DapsTokenProvider;
-import de.fraunhofer.ids.messaging.protocol.MessageService;
-import de.fraunhofer.ids.messaging.protocol.http.SendMessageException;
-import de.fraunhofer.ids.messaging.protocol.http.ShaclValidatorException;
-import de.fraunhofer.ids.messaging.protocol.multipart.UnknownResponseException;
-import de.fraunhofer.ids.messaging.protocol.multipart.parser.MultipartParseException;
-import de.fraunhofer.ids.messaging.requests.InfrastructureService;
-import de.fraunhofer.ids.messaging.requests.MessageContainer;
-import de.fraunhofer.ids.messaging.requests.builder.IdsRequestBuilderService;
-import de.fraunhofer.ids.messaging.requests.exceptions.RejectionException;
-import de.fraunhofer.ids.messaging.requests.exceptions.UnexpectedPayloadException;
+import ids.messaging.common.DeserializeException;
+import ids.messaging.common.SerializeException;
+import ids.messaging.core.config.ConfigContainer;
+import ids.messaging.core.daps.ClaimsException;
+import ids.messaging.core.daps.DapsTokenManagerException;
+import ids.messaging.core.daps.DapsTokenProvider;
+import ids.messaging.protocol.MessageService;
+import ids.messaging.protocol.http.SendMessageException;
+import ids.messaging.protocol.http.ShaclValidatorException;
+import ids.messaging.protocol.multipart.UnknownResponseException;
+import ids.messaging.protocol.multipart.parser.MultipartParseException;
+import ids.messaging.requests.InfrastructureService;
+import ids.messaging.requests.MessageContainer;
+import ids.messaging.requests.builder.IdsRequestBuilderService;
+import ids.messaging.requests.exceptions.RejectionException;
+import ids.messaging.requests.exceptions.UnexpectedPayloadException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

appstore/src/main/java/de/fraunhofer/ids/messaging/appstore/IDSAppStoreService.java → appstore/src/main/java/ids/messaging/appstore/IDSAppStoreService.java

@@ -1,4 +1,6 @@
 /*
+ * Copyright Fraunhofer Institute for Software and Systems Engineering
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -10,23 +12,27 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ *  Contributors:
+ *       sovity GmbH
+ *
  */
-package de.fraunhofer.ids.messaging.appstore;
+package ids.messaging.appstore;
 
 import java.io.IOException;
 import java.net.URI;
 
-import de.fraunhofer.ids.messaging.common.DeserializeException;
-import de.fraunhofer.ids.messaging.common.SerializeException;
-import de.fraunhofer.ids.messaging.core.daps.ClaimsException;
-import de.fraunhofer.ids.messaging.core.daps.DapsTokenManagerException;
-import de.fraunhofer.ids.messaging.protocol.http.SendMessageException;
-import de.fraunhofer.ids.messaging.protocol.http.ShaclValidatorException;
-import de.fraunhofer.ids.messaging.protocol.multipart.UnknownResponseException;
-import de.fraunhofer.ids.messaging.protocol.multipart.parser.MultipartParseException;
-import de.fraunhofer.ids.messaging.requests.MessageContainer;
-import de.fraunhofer.ids.messaging.requests.exceptions.RejectionException;
-import de.fraunhofer.ids.messaging.requests.exceptions.UnexpectedPayloadException;
+import ids.messaging.common.DeserializeException;
+import ids.messaging.common.SerializeException;
+import ids.messaging.core.daps.ClaimsException;
+import ids.messaging.core.daps.DapsTokenManagerException;
+import ids.messaging.protocol.http.SendMessageException;
+import ids.messaging.protocol.http.ShaclValidatorException;
+import ids.messaging.protocol.multipart.UnknownResponseException;
+import ids.messaging.protocol.multipart.parser.MultipartParseException;
+import ids.messaging.requests.MessageContainer;
+import ids.messaging.requests.exceptions.RejectionException;
+import ids.messaging.requests.exceptions.UnexpectedPayloadException;
 
 
 /**