diff --git a/.github/workflows/publish-documentation.yaml b/.github/workflows/publish-documentation.yaml
index b21dc78dd4..dc3ea64e2f 100644
--- a/.github/workflows/publish-documentation.yaml
+++ b/.github/workflows/publish-documentation.yaml
@@ -45,11 +45,6 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- - name: Build API documentation with Maven
- run: |
- mvn clean package -pl irs-common,irs-models,irs-policy-store,irs-testing,irs-edc-client,irs-registry-client,irs-api -DskipTests --batch-mode
- cp irs-api/target/generated-sources/openapi/index.html docs/src/docs/api-specification/index.html
-
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
@@ -112,10 +107,26 @@ jobs:
run: |
mv docs/src/diagram-replacer/assets/ docs/target/generated-docs/assets/
+ - name: Generate Swagger UI
+ uses: Legion2/swagger-ui-action@v1
+ with:
+ output: swagger-ui
+ spec-file: docs/src/api/irs-api.yaml
+
- name: Update documentation on GitHub Pages
if: github.ref == 'refs/heads/main'
- uses: peaceiris/actions-gh-pages@v3.9.3
+ uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: "./docs/target/generated-docs"
destination_dir: "docs"
+
+ - name: Deploy Swagger UI to GitHub Pages
+ if: github.ref == 'refs/heads/main'
+ uses: peaceiris/actions-gh-pages@v4
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: "swagger-ui"
+ destination_dir: "docs/swagger-ui"
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e52db42f..b7fc1e3cdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha
## [Unreleased]
+## Changed
+
+- Removed obsolete entries from acceptedPolicies configuration. #530
+
### Fixed
- Update bouncycastle to 1.78 to fix CVE's.
diff --git a/DEPENDENCIES b/DEPENDENCIES
index cc88369343..ed985c44a1 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -130,33 +130,33 @@ maven/mavencentral/io.github.resilience4j/resilience4j-retry/2.1.0, Apache-2.0,
maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot3/2.1.0, Apache-2.0, approved, #10913
maven/mavencentral/io.github.resilience4j/resilience4j-spring6/2.1.0, Apache-2.0, approved, #10915
maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/2.1.0, Apache-2.0, approved, #10166
-maven/mavencentral/io.micrometer/micrometer-commons/1.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243
-maven/mavencentral/io.micrometer/micrometer-core/1.11.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238
-maven/mavencentral/io.micrometer/micrometer-observation/1.11.10, Apache-2.0, approved, #9242
+maven/mavencentral/io.micrometer/micrometer-commons/1.11.11, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243
+maven/mavencentral/io.micrometer/micrometer-core/1.11.11, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238
+maven/mavencentral/io.micrometer/micrometer-observation/1.11.11, Apache-2.0, approved, #9242
maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.11.4, Apache-2.0, approved, #9805
maven/mavencentral/io.minio/minio/8.5.9, Apache-2.0, approved, #9097
maven/mavencentral/io.netty.incubator/netty-incubator-transport-classes-io_uring/0.0.21.Final, Apache-2.0, approved, #9622
maven/mavencentral/io.netty.incubator/netty-incubator-transport-native-io_uring/0.0.21.Final, GPL-2.0-only WITH Linux-syscall-note OR MIT AND Apache-2.0 AND MIT, approved, #9649
-maven/mavencentral/io.netty/netty-buffer/4.1.107.Final, Apache-2.0, approved, CQ21842
-maven/mavencentral/io.netty/netty-codec-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http2/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-mqtt/4.1.107.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
-maven/mavencentral/io.netty/netty-codec-socks/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-common/4.1.107.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
-maven/mavencentral/io.netty/netty-handler-proxy/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-handler/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.107.Final, Apache-2.0, approved, #6367
-maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.107.Final, Apache-2.0, approved, #7004
-maven/mavencentral/io.netty/netty-resolver-dns/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.61.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
-maven/mavencentral/io.netty/netty-tcnative-classes/2.0.61.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.107.Final, Apache-2.0, approved, #6366
-maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport/4.1.107.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-buffer/4.1.109.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-codec-dns/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-mqtt/4.1.109.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
+maven/mavencentral/io.netty/netty-codec-socks/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-common/4.1.109.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-handler-proxy/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.109.Final, Apache-2.0, approved, #6367
+maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.109.Final, Apache-2.0, approved, #7004
+maven/mavencentral/io.netty/netty-resolver-dns/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.65.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
+maven/mavencentral/io.netty/netty-tcnative-classes/2.0.65.Final, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.109.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport/4.1.109.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
maven/mavencentral/io.opentelemetry/opentelemetry-api/1.25.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.opentelemetry/opentelemetry-api/1.29.0, Apache-2.0, approved, #10088
maven/mavencentral/io.opentelemetry/opentelemetry-context/1.25.0, Apache-2.0, approved, clearlydefined
@@ -191,10 +191,10 @@ maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-onl
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/javax.jms/javax.jms-api/2.0.1, CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0, approved, #1516
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
-maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.12, Apache-2.0, approved, #7164
+maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.13, Apache-2.0, approved, #7164
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.4, Apache-2.0, approved, #7164
maven/mavencentral/net.bytebuddy/byte-buddy/1.12.21, Apache-2.0 AND BSD-3-Clause, approved, #1811
-maven/mavencentral/net.bytebuddy/byte-buddy/1.14.12, Apache-2.0 AND BSD-3-Clause, approved, #7163
+maven/mavencentral/net.bytebuddy/byte-buddy/1.14.13, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.datafaker/datafaker/1.9.0, Apache-2.0, approved, #8797
maven/mavencentral/net.debasishg/redisclient_2.13/3.42, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217
@@ -212,9 +212,9 @@ maven/mavencentral/org.apache.commons/commons-compress/1.26.0, Apache-2.0 AND (A
maven/mavencentral/org.apache.commons/commons-compress/1.26.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-pool2/2.11.1, Apache-2.0, approved, CQ23795
-maven/mavencentral/org.apache.groovy/groovy-json/4.0.20, Apache-2.0, approved, #7411
-maven/mavencentral/org.apache.groovy/groovy-xml/4.0.20, Apache-2.0, approved, #10179
-maven/mavencentral/org.apache.groovy/groovy/4.0.20, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742
+maven/mavencentral/org.apache.groovy/groovy-json/4.0.21, Apache-2.0, approved, #7411
+maven/mavencentral/org.apache.groovy/groovy-xml/4.0.21, Apache-2.0, approved, #10179
+maven/mavencentral/org.apache.groovy/groovy/4.0.21, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742
maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528
maven/mavencentral/org.apache.httpcomponents/httpmime/4.5.13, Apache-2.0, approved, CQ11718
@@ -223,11 +223,11 @@ maven/mavencentral/org.apache.logging.log4j/log4j-core/2.20.0, Apache-2.0 AND (A
maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.20.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.logging.log4j/log4j-slf4j2-impl/2.20.0, Apache-2.0, approved, #8801
maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.20.0, Apache-2.0, approved, #8799
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.19, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.19, Apache-2.0, approved, #6997
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.19, Apache-2.0, approved, #7920
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.20, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.20, Apache-2.0, approved, #6997
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.20, Apache-2.0, approved, #7920
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.aspectj/aspectjweaver/1.9.21, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND BSD-3-Clause AND Apache-1.1, approved, #7695
+maven/mavencentral/org.aspectj/aspectjweaver/1.9.22, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND BSD-3-Clause AND Apache-1.1, approved, #7695
maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78, MIT, approved, #14434
@@ -333,38 +333,39 @@ maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apa
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.10.0-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.10.0-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.hk2/osgi-resource-locator/1.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192
maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
+maven/mavencentral/org.javassist/javassist/3.30.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #12108
maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255
maven/mavencentral/org.jboss.logging/jboss-logging/3.5.3.Final, Apache-2.0, approved, #9471
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.8.22, Apache-2.0, approved, #8910
@@ -408,7 +409,7 @@ maven/mavencentral/org.ow2.asm/asm-commons/9.6, BSD-3-Clause, approved, #10775
maven/mavencentral/org.ow2.asm/asm-tree/9.6, BSD-3-Clause, approved, #10773
maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776
-maven/mavencentral/org.projectlombok/lombok/1.18.30, MIT AND LicenseRef-Public-Domain, approved, CQ23907
+maven/mavencentral/org.projectlombok/lombok/1.18.32, MIT AND LicenseRef-Public-Domain, approved, CQ23907
maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined
maven/mavencentral/org.scala-lang.modules/scala-java8-compat_2.13/1.0.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.scala-lang.modules/scala-parser-combinators_2.13/2.3.0, Apache-2.0, approved, #8628
@@ -417,49 +418,49 @@ maven/mavencentral/org.scala-lang/scala-reflect/2.13.10, Apache-2.0, approved, #
maven/mavencentral/org.simpleflatmapper/lightning-csv/8.2.3, MIT, approved, clearlydefined
maven/mavencentral/org.simpleflatmapper/sfm-util/8.2.3, MIT, approved, clearlydefined
maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.12, MIT, approved, #7698
-maven/mavencentral/org.slf4j/slf4j-api/2.0.12, MIT, approved, #5915
+maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.13, MIT, approved, #7698
+maven/mavencentral/org.slf4j/slf4j-api/2.0.13, MIT, approved, #5915
maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.2.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.10, Apache-2.0, approved, #9348
-maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.10, Apache-2.0, approved, #9342
-maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.10, Apache-2.0, approved, #9341
-maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.10, Apache-2.0, approved, #11032
-maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.10, Apache-2.0, approved, #10675
-maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.10, Apache-2.0, approved, #9344
-maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.10, Apache-2.0, approved, #9338
-maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.10, Apache-2.0, approved, #9336
-maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.10, Apache-2.0, approved, #8800
-maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.10, Apache-2.0, approved, #9343
-maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.10, Apache-2.0, approved, #8806
-maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.10, Apache-2.0, approved, #9337
-maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.10, Apache-2.0, approved, #9353
-maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.10, Apache-2.0, approved, #9351
-maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.10, Apache-2.0, approved, #9335
-maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.10, Apache-2.0, approved, #9347
-maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.10, Apache-2.0, approved, #9349
-maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.10, Apache-2.0, approved, #9339
-maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.10, Apache-2.0, approved, #9346
-maven/mavencentral/org.springframework.boot/spring-boot/3.1.10, Apache-2.0, approved, #9352
-maven/mavencentral/org.springframework.data/spring-data-commons/3.1.10, Apache-2.0, approved, #8805
-maven/mavencentral/org.springframework.security/spring-security-config/6.1.8, Apache-2.0, approved, #9736
-maven/mavencentral/org.springframework.security/spring-security-core/6.1.8, Apache-2.0, approved, #9801
-maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.8, Apache-2.0 AND ISC, approved, #9735
-maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.8, Apache-2.0, approved, #9740
-maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.8, Apache-2.0, approved, #9741
-maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.8, Apache-2.0, approved, #9345
-maven/mavencentral/org.springframework.security/spring-security-test/6.1.8, Apache-2.0, approved, #10674
-maven/mavencentral/org.springframework.security/spring-security-web/6.1.8, Apache-2.0, approved, #9800
-maven/mavencentral/org.springframework/spring-aop/6.0.18, Apache-2.0, approved, #5940
-maven/mavencentral/org.springframework/spring-beans/6.0.18, Apache-2.0, approved, #5937
-maven/mavencentral/org.springframework/spring-context/6.0.18, Apache-2.0, approved, #5936
-maven/mavencentral/org.springframework/spring-core/6.0.18, Apache-2.0 AND BSD-3-Clause, approved, #5948
-maven/mavencentral/org.springframework/spring-expression/6.0.18, Apache-2.0, approved, #3284
-maven/mavencentral/org.springframework/spring-jcl/6.0.18, Apache-2.0, approved, #3283
-maven/mavencentral/org.springframework/spring-test/6.0.18, Apache-2.0, approved, #7003
-maven/mavencentral/org.springframework/spring-web/6.0.18, Apache-2.0, approved, #5942
-maven/mavencentral/org.springframework/spring-webmvc/6.0.18, Apache-2.0, approved, #5944
+maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.1.11, Apache-2.0, approved, #9348
+maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.1.11, Apache-2.0, approved, #9342
+maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.1.11, Apache-2.0, approved, #9341
+maven/mavencentral/org.springframework.boot/spring-boot-configuration-metadata/3.1.11, Apache-2.0, approved, #11032
+maven/mavencentral/org.springframework.boot/spring-boot-properties-migrator/3.1.11, Apache-2.0, approved, #10675
+maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.1.11, Apache-2.0, approved, #9344
+maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.1.11, Apache-2.0, approved, #9338
+maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.1.11, Apache-2.0, approved, #9336
+maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.1.11, Apache-2.0, approved, #8800
+maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.1.11, Apache-2.0, approved, #9343
+maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.1.11, Apache-2.0, approved, #8806
+maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.1.11, Apache-2.0, approved, #9337
+maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.1.11, Apache-2.0, approved, #9353
+maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.1.11, Apache-2.0, approved, #9351
+maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.1.11, Apache-2.0, approved, #9335
+maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.1.11, Apache-2.0, approved, #9347
+maven/mavencentral/org.springframework.boot/spring-boot-starter/3.1.11, Apache-2.0, approved, #9349
+maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.1.11, Apache-2.0, approved, #9339
+maven/mavencentral/org.springframework.boot/spring-boot-test/3.1.11, Apache-2.0, approved, #9346
+maven/mavencentral/org.springframework.boot/spring-boot/3.1.11, Apache-2.0, approved, #9352
+maven/mavencentral/org.springframework.data/spring-data-commons/3.1.11, Apache-2.0, approved, #8805
+maven/mavencentral/org.springframework.security/spring-security-config/6.1.9, Apache-2.0, approved, #9736
+maven/mavencentral/org.springframework.security/spring-security-core/6.1.9, Apache-2.0, approved, #9801
+maven/mavencentral/org.springframework.security/spring-security-crypto/6.1.9, Apache-2.0 AND ISC, approved, #9735
+maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.1.9, Apache-2.0, approved, #9740
+maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.1.9, Apache-2.0, approved, #9741
+maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.1.9, Apache-2.0, approved, #9345
+maven/mavencentral/org.springframework.security/spring-security-test/6.1.9, Apache-2.0, approved, #10674
+maven/mavencentral/org.springframework.security/spring-security-web/6.1.9, Apache-2.0, approved, #9800
+maven/mavencentral/org.springframework/spring-aop/6.0.19, Apache-2.0, approved, #5940
+maven/mavencentral/org.springframework/spring-beans/6.0.19, Apache-2.0, approved, #5937
+maven/mavencentral/org.springframework/spring-context/6.0.19, Apache-2.0, approved, #5936
+maven/mavencentral/org.springframework/spring-core/6.0.19, Apache-2.0 AND BSD-3-Clause, approved, #5948
+maven/mavencentral/org.springframework/spring-expression/6.0.19, Apache-2.0, approved, #3284
+maven/mavencentral/org.springframework/spring-jcl/6.0.19, Apache-2.0, approved, #3283
+maven/mavencentral/org.springframework/spring-test/6.0.19, Apache-2.0, approved, #7003
+maven/mavencentral/org.springframework/spring-web/6.0.19, Apache-2.0, approved, #5942
+maven/mavencentral/org.springframework/spring-webmvc/6.0.19, Apache-2.0, approved, #5944
maven/mavencentral/org.testcontainers/junit-jupiter/1.18.3, MIT, approved, #7941
maven/mavencentral/org.testcontainers/junit-jupiter/1.19.7, MIT, approved, #10344
maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #7938
diff --git a/charts/item-relationship-service/values.yaml b/charts/item-relationship-service/values.yaml
index 11e51ed895..2f60e73eb3 100644
--- a/charts/item-relationship-service/values.yaml
+++ b/charts/item-relationship-service/values.yaml
@@ -199,15 +199,9 @@ edc:
# IRS will only negotiate contracts for offers with a policy as defined in the allowedNames list.
# If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
acceptedPolicies:
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: "ID 3.0 Trace"
- leftOperand: "PURPOSE"
operator: "eq"
rightOperand: "ID 3.1 Trace"
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: R2_Traceability
- leftOperand: "FrameworkAgreement.traceability"
operator: "eq"
rightOperand: "active"
diff --git a/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md b/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md
index 2603d8da57..53d0124c66 100644
--- a/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md
+++ b/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md
@@ -377,7 +377,7 @@ policy store in order to receice further on assets with the specific policy.
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
}
}
diff --git a/docs/src/docs/api-specification/api-specification.adoc b/docs/src/docs/api-specification/api-specification.adoc
deleted file mode 100644
index d12cda4300..0000000000
--- a/docs/src/docs/api-specification/api-specification.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= API specification
-
-:toc:
-
-include::api.adoc[leveloffset=1]
\ No newline at end of file
diff --git a/docs/src/docs/api-specification/api.adoc b/docs/src/docs/api-specification/api.adoc
deleted file mode 100644
index 6b3235b426..0000000000
--- a/docs/src/docs/api-specification/api.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= OpenAPI Specification
-
-++++
-include::index.html[]
-++++
diff --git a/docs/src/docs/api-specification/index.html b/docs/src/docs/api-specification/index.html
deleted file mode 100644
index bb1634c9d5..0000000000
--- a/docs/src/docs/api-specification/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- IRS API
-
-
-IRS API
-This will be automatically generated when workflow "publish-documentation.yaml" is executed.
-
-
diff --git a/docs/src/docs/index.adoc b/docs/src/docs/index.adoc
index 42ba1b47a3..787214f3f2 100644
--- a/docs/src/docs/index.adoc
+++ b/docs/src/docs/index.adoc
@@ -3,8 +3,8 @@
== Administration Guide
xref:administration/administration-guide.adoc[]
-== API-Documentation
-xref:api-specification/api-specification.adoc[OpenApi specification]
+== Swagger-UI
+xref:swagger-ui/index.adoc[Swagger-UI]
== Architecture Documentation (arc42)
- xref:arc42/index.adoc[Single chapters]
diff --git a/docs/src/docs/swagger-ui/index.adoc b/docs/src/docs/swagger-ui/index.adoc
new file mode 100644
index 0000000000..dd7fc44618
--- /dev/null
+++ b/docs/src/docs/swagger-ui/index.adoc
@@ -0,0 +1,13 @@
+= Swagger-UI
+
+== NOTICE
+
+This work is licensed under the https://www.apache.org/licenses/LICENSE-2.0[Apache-2.0].
+
+- SPDX-License-Identifier: Apache-2.0
+- SPDX-FileCopyrightText: 2021, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+- SPDX-FileCopyrightText: 2022, 2023 BOSCH AG
+- SPDX-FileCopyrightText: 2021, 2022 ZF Friedrichshafen AG
+- SPDX-FileCopyrightText: 2022 ISTOS GmbH
+- SPDX-FileCopyrightText: 2021, 2023 Contributors to the Eclipse Foundation
+- Source URL: https://github.com/eclipse-tractusx/item-relationship-service
\ No newline at end of file
diff --git a/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml b/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml
index d089e82689..182e0dafb5 100644
--- a/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml
+++ b/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml
@@ -30,7 +30,7 @@ note left
},
"rightExpression": {
"edctype": "dataspaceconnector:literalexpression",
- "value": "ID 3.0 Trace"
+ "value": "ID 3.1 Trace"
},
"operator": "EQ"
}
diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java
index 1034be723b..9af1ac74dc 100644
--- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java
+++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java
@@ -128,8 +128,8 @@ private void registerAsset(final String assetId, final String notificationType,
}
}
""".formatted(assetId, notificationType, essBaseUrl + path);
- final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST,
- toEntity(body), String.class);
+ final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST, toEntity(body),
+ String.class);
if (entity.getStatusCode().is2xxSuccessful()) {
log.info("Notification asset registered successfully.");
@@ -160,7 +160,7 @@ private void registerPolicy(final String policyId) {
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
@@ -169,8 +169,8 @@ private void registerPolicy(final String policyId) {
}
}
""".formatted(policyId);
- final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath,
- HttpMethod.POST, toEntity(body), String.class);
+ final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath, HttpMethod.POST,
+ toEntity(body), String.class);
if (entity.getStatusCode().is2xxSuccessful()) {
log.info("Notification policy registered successfully.");
@@ -194,8 +194,8 @@ private void registerContractDefinition(final String contractId, final String as
}
""".formatted(contractId, contractId, assetId);
- final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath,
- HttpMethod.POST, toEntity(body), String.class);
+ final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath, HttpMethod.POST,
+ toEntity(body), String.class);
if (entity.getStatusCode().is2xxSuccessful()) {
log.info("Notification contract definition registered successfully.");
} else {
diff --git a/irs-api/src/main/resources/application.yml b/irs-api/src/main/resources/application.yml
index 7e34c4faaf..2e1268a00c 100644
--- a/irs-api/src/main/resources/application.yml
+++ b/irs-api/src/main/resources/application.yml
@@ -162,15 +162,9 @@ irs-edc-client:
# IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list.
# If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
acceptedPolicies:
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: "ID 3.0 Trace"
- leftOperand: "PURPOSE"
operator: "eq"
rightOperand: "ID 3.1 Trace"
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: R2_Traceability
- leftOperand: "FrameworkAgreement.traceability"
operator: "eq"
rightOperand: "active"
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java
index ed3c61c02c..11d579dd55 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java
@@ -69,7 +69,7 @@ void shouldMapContstraints() throws JsonProcessingException {
.leftExpression(
new LiteralExpression("idsc:PURPOSE"))
.rightExpression(
- new LiteralExpression("ID 3.0 Trace"))
+ new LiteralExpression("ID 3.1 Trace"))
.build();
final ObjectMapper objectMapper = new JsonLdConfiguration().objectMapper();
final String s = objectMapper.writeValueAsString(atomicConstraint);
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java
index 5b135ec95b..045de84d92 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java
@@ -50,7 +50,7 @@ void shouldParseEdcContractAgreementsResponse() throws JsonProcessingException {
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
}
},
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java
index d3d5de037e..a429081888 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java
@@ -71,7 +71,7 @@ void shouldRejectWrongPolicy() {
@Test
void shouldRejectWhenPolicyStoreIsEmpty() {
// given
- Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_0_TRACE);
+ Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_1_TRACE);
when(policyStore.getAcceptedPolicies(any())).thenReturn(List.of());
// when
boolean result = policyCheckerService.isValid(policy, "bpn");
@@ -102,12 +102,12 @@ void shouldRejectAndConstraintsWhenOnlyOneMatch() {
@Test
void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() {
// given
- final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
TestConstants.STATUS_ACTIVE);
- final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final var policyList = List.of(
new AcceptedPolicy(policy("and-policy", List.of(constraint1, constraint2, constraint3), List.of()),
OffsetDateTime.now().plusYears(1)));
@@ -127,12 +127,12 @@ void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSet
@Test
void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() {
// given
- final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
TestConstants.STATUS_ACTIVE);
- final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final var policyList = List.of(
new AcceptedPolicy(policy("and-policy", List.of(), List.of(constraint1, constraint2, constraint3)),
OffsetDateTime.now().plusYears(1)));
@@ -152,12 +152,12 @@ void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetO
@Test
void shouldAcceptConstraintsWithDefaultPolicy() {
// given
- final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
TestConstants.STATUS_ACTIVE);
- final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
- TestConstants.STATUS_ACTIVE);
+ final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+ new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
final var policyList = List.of(new AcceptedPolicy(
policy("default-policy", List.of(constraint1, constraint2, constraint3),
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java
index 66d59878c9..f47772e25d 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java
@@ -74,7 +74,7 @@ void setUp() {
@Test
void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONException {
// given
- String policyName = "ID 3.0 Trace";
+ String policyName = "ID 3.1 Trace";
String policyId = "4cc0bb57-2d64-4cfb-a13b-aceef3477b7e";
// when
@@ -99,7 +99,7 @@ void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONExc
{
"@type": "Constraint",
"odrl:leftOperand": "PURPOSE",
- "odrl:rightOperand": "ID 3.0 Trace",
+ "odrl:rightOperand": "ID 3.1 Trace",
"odrl:operator": {
"@id": "odrl:eq"
}
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java
index 547255d41c..64b7684b36 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java
@@ -31,7 +31,6 @@ public class TestConstants {
public static final String FRAMEWORK_AGREEMENT_DISMANTLER = "FrameworkAgreement.dismantler";
public static final String FRAMEWORK_AGREEMENT_TEST = "FrameworkAgreement.test";
public static final String MEMBERSHIP = "Membership";
- public static final String ID_3_0_TRACE = "ID 3.0 Trace";
public static final String ID_3_1_TRACE = "ID 3.1 Trace";
public static final String STATUS_ACTIVE = "active";
public static final String PURPOSE = "PURPOSE";
diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java
index bd9a1af69e..86c8bbf3f1 100644
--- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java
+++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java
@@ -87,7 +87,7 @@ class EdcTransformerTest {
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
}
},
@@ -190,7 +190,7 @@ private static Policy createPolicy(final String assetId) {
new LiteralExpression("idsc:PURPOSE"))
.operator(Operator.EQ)
.rightExpression(
- new LiteralExpression("ID 3.0 Trace"))
+ new LiteralExpression("ID 3.1 Trace"))
.build();
final OrConstraint orConstraint = OrConstraint.Builder.newInstance().constraint(atomicConstraint).build();
final Permission permission = Permission.Builder.newInstance()
diff --git a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java
index 7508a276b9..802a60114c 100644
--- a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java
+++ b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java
@@ -79,7 +79,7 @@
class PolicyStoreServiceTest {
private static final String BPN = "testBpn";
- private static final String EXAMPLE_ALLOWED_NAME = "ID 3.0 Trace";
+ private static final String EXAMPLE_ALLOWED_NAME = "ID 3.1 Trace";
private static final String EXAMPLE_ACCEPTED_LEFT_OPERAND = "PURPOSE";
private static final String REGISTER_POLICY_EXAMPLE_PAYLOAD = PolicyStoreControllerTest.REGISTER_POLICY_EXAMPLE_PAYLOAD;
diff --git a/irs-registry-client/README.md b/irs-registry-client/README.md
index 449f64e032..15778aba25 100644
--- a/irs-registry-client/README.md
+++ b/irs-registry-client/README.md
@@ -67,15 +67,9 @@ irs-edc-client:
# IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list.
# If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
acceptedPolicies:
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: "ID 3.0 Trace"
- leftOperand: "PURPOSE"
operator: "eq"
rightOperand: "ID 3.1 Trace"
- - leftOperand: "PURPOSE"
- operator: "eq"
- rightOperand: R2_Traceability
- leftOperand: "FrameworkAgreement.traceability"
operator: "eq"
rightOperand: "active"
diff --git a/local/testing/api-tests/README.md b/local/testing/api-tests/README.md
index 5b4d6da6d7..8f733c79d5 100644
--- a/local/testing/api-tests/README.md
+++ b/local/testing/api-tests/README.md
@@ -4,11 +4,11 @@ This folder contains [Tavern](https://tavern.readthedocs.io) API tests for the I
## Usage
-* Install python
-* Install pytest: ```py -m pip install pytest```
-* Install tavern: ```py -m pip install tavern```
-* Create variable.env in directory api-tests
-* Copy content to variable.env
+1. Install python
+2. Install pytest: ```py -m pip install pytest```
+3. Install tavern: ```py -m pip install tavern```
+4. Create variable.env in directory api-tests
+5. Copy content to variable.env
```
# this is temporary file for local development to setup environments variable such a secrets and URLs
# to run it just execute in console:
@@ -36,3 +36,10 @@ export ADMIN_USER_API_KEY_ESS=
+ 2. To run a single test:
+ ```console
+ py -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml::""
+
+ # for example:
+ py -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml::"Make sure job with submodels process with status COMPLETED with asPlanned-id"
+ ```
diff --git a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json
index edb31b4812..eafb522c61 100644
--- a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json
+++ b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
diff --git a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json
index 3cd3986742..2230704708 100644
--- a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json
+++ b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
diff --git a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json
index a68de610f5..dd05561bff 100644
--- a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json
+++ b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
},
{
"@type": "Constraint",
diff --git a/local/testing/testdata/README.md b/local/testing/testdata/README.md
index e2f36694bf..091094cd93 100644
--- a/local/testing/testdata/README.md
+++ b/local/testing/testdata/README.md
@@ -52,12 +52,12 @@ An example policy can look like this:
```json
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -70,7 +70,7 @@ An example policy can look like this:
"@type": "Constraint",
"odrl:leftOperand": "idsc:PURPOSE",
"odrl:operator": "EQ",
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
@@ -87,8 +87,8 @@ An example policy can look like this:
There are two options to apply the policy.
-1. Use the parameter `-p id-3.0-trace` to apply this policy to every asset
-2. Add a field `policy: "id-3.0-trace"` to the top level of each asset you want to use this policy. Every other asset
+1. Use the parameter `-p id-3.1-trace` to apply this policy to every asset
+2. Add a field `policy: "id-3.1-trace"` to the top level of each asset you want to use this policy. Every other asset
will get the default, empty policy.
It is also possible to define more than one policy at the beginning and then use the `"policy": ""` field to apply a
diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json
index 3d6fe2fc95..de73957298 100644
--- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json
+++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json
index 11a568597e..e1457e74d3 100644
--- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json
+++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json
index 0a526c11db..035d30662d 100644
--- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json
+++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json
@@ -1,11 +1,11 @@
{
"policies": {
- "ID 3.0 Trace": {
+ "ID 3.1 Trace": {
"@context": {
"odrl": "http://www.w3.org/ns/odrl/2/"
},
"@type": "PolicyDefinitionRequestDto",
- "@id": "id-3.0-trace",
+ "@id": "id-3.1-trace",
"policy": {
"@type": "Policy",
"odrl:permission": [
@@ -20,7 +20,7 @@
"odrl:operator": {
"@id": "odrl:eq"
},
- "odrl:rightOperand": "ID 3.0 Trace"
+ "odrl:rightOperand": "ID 3.1 Trace"
}
]
}
diff --git a/pom.xml b/pom.xml
index a9ee43e4aa..cb7cdab98f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
1.10.0-SNAPSHOT
- 3.1.10
+ 3.1.11
2.2.0
1.11.4
1.9.0