diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd8684bd..9262a808 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,7 +130,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Conforming id: meta-conf - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/conforming-agent @@ -142,7 +142,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings @@ -159,7 +159,7 @@ jobs: # Important step to push image description to DockerHub - since this is version independent, we always take it from main - name: Update Docker Hub description for Conforming Agent if: ${{ steps.set-docker-repo.outputs.REPO == 'docker.io' && github.ref == 'refs/heads/main' }} - uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3.4.2 + uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0 with: readme-filepath: conforming/README.md username: ${{ secrets.DOCKER_HUB_USER || github.actor }} @@ -169,7 +169,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Remoting id: meta-remote - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/remoting-agent @@ -181,7 +181,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings @@ -198,7 +198,7 @@ jobs: # Important step to push image description to DockerHub - since this is version independent, we always take it from main - name: Update Docker Hub description for Remoting Agent if: ${{ steps.set-docker-repo.outputs.REPO == 'docker.io' && github.ref == 'refs/heads/main' }} - uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3.4.2 + uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0 with: readme-filepath: remoting/README.md username: ${{ secrets.DOCKER_HUB_USER || github.actor }} @@ -208,7 +208,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Provisioning id: meta-prov - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/provisioning-agent @@ -220,7 +220,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings @@ -237,7 +237,7 @@ jobs: # Important step to push image description to DockerHub - since this is version independent, we always take it from main - name: Update Docker Hub description for Provisioning Agent if: ${{ steps.set-docker-repo.outputs.REPO == 'docker.io' && github.ref == 'refs/heads/main' }} - uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3.4.2 + uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0 with: readme-filepath: provisioning/README.md username: ${{ secrets.DOCKER_HUB_USER || github.actor }} @@ -247,7 +247,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Matchmaking id: meta-match - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/matchmaking-agent @@ -259,7 +259,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # build in any case, but push only main and version tag settings diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e41df6b9..a24991ef 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -63,7 +63,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -100,4 +100,4 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 \ No newline at end of file diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml index 07f079df..10008e2f 100644 --- a/.github/workflows/helm-chart-lint.yml +++ b/.github/workflows/helm-chart-lint.yml @@ -77,7 +77,7 @@ jobs: cache: 'maven' # Set-Up Python - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 + - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: 3.9 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 4c36609c..722b8729 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -1,6 +1,6 @@ --- # -# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation +# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Run Trivy vulnerability scanner in repo mode - uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0 # v0.14.0 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0 with: scan-type: "config" # ignore-unfixed: true @@ -65,7 +65,7 @@ jobs: output: "trivy-results-config.sarif" severity: "CRITICAL,HIGH" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 if: always() with: sarif_file: "trivy-results-config.sarif" @@ -123,7 +123,7 @@ jobs: # the next two steps will only execute if the image exists check was successful - name: Run Trivy vulnerability scanner if: success() && steps.imageCheck.outcome != 'failure' - uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0 # v0.14.0 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0 with: image-ref: "${{ steps.set-docker-repo.outputs.REPO }}/${{ matrix.image }}:${{ needs.git-sha7.outputs.value }}" format: "sarif" @@ -134,6 +134,6 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab if: success() && steps.imageCheck.outcome != 'failure' - uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 with: sarif_file: "trivy-results-${{ matrix.image }}.sarif" diff --git a/.github/workflows/veracode.yml b/.github/workflows/veracode.yml deleted file mode 100644 index 28755398..00000000 --- a/.github/workflows/veracode.yml +++ /dev/null @@ -1,154 +0,0 @@ ---- -# -# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, 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. -# -# SPDX-License-Identifier: Apache-2.0 -# - -name: "Veracode" - -on: - schedule: - - cron: '0 2 * * *' - workflow_dispatch: - -jobs: - secret-presence: - runs-on: ubuntu-latest - outputs: - ORG_VERACODE_API_ID: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_ID }} - ORG_VERACODE_API_KEY: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_KEY }} - steps: - - name: Check whether secrets exist - id: secret-presence - run: | - [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "ORG_VERACODE_API_ID=true" >> $GITHUB_OUTPUT - [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "ORG_VERACODE_API_KEY=true" >> $GITHUB_OUTPUT - exit 0 - - verify-formatting: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - fetch-depth: 0 - # Set-Up - - name: Setup JDK 17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - with: - java-version: '17' - distribution: 'temurin' - cache: 'maven' - - name: Verify proper formatting - run: ./mvnw spotless:check - - ### - # Standalone applications have all dependencies in their jar - ### - build_standalone: - runs-on: ubuntu-latest - needs: [secret-presence, verify-formatting] - permissions: - contents: read - strategy: - fail-fast: false - matrix: - variant: [{dir: remoting, name: remoting-agent}, - {dir: conforming, name: conforming-agent}, - {dir: matchmaking, name: matchmaking-agent}] - steps: - # Set-Up - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # Set-Up - - name: Setup JDK 17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - with: - java-version: '17' - distribution: 'temurin' - cache: 'maven' - # Build - - name: Build ${{ matrix.variant.name }} - run: |- - ./mvnw -s settings.xml -pl ${{ matrix.variant.dir }} install - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Tar gzip files for veracode upload - run: |- - tar -czvf ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}.tar.gz ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}-*.jar - - name: Veracode Upload And Scan - uses: veracode/veracode-uploadandscan-action@c3c0b78bddb42d5f6b10d70562f692215a410d7b #v1.0 - if: | - needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY - continue-on-error: true - with: - appname: knowledge-agents/${{ matrix.variant.name }} - createprofile: true - version: ${{ matrix.variant.name }}-${{ github.sha }} - filepath: ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}.tar.gz - vid: ${{ secrets.ORG_VERACODE_API_ID }} - vkey: ${{ secrets.ORG_VERACODE_API_KEY }} - - ### - # Embedded applications need dependencies being provided. - # Expecially wrt. Spring 5.3.28 Web there is an open HIGH vulnerability regarding - # org/springframework/remoting/httpinvoker which will not be fixed - # so we manipulate the jar in the docker environment directly and exclude - # the dependency from the scan - ### - build_embedded: - runs-on: ubuntu-latest - needs: [secret-presence, verify-formatting] - permissions: - contents: read - strategy: - fail-fast: false - matrix: - variant: [{dir: provisioning, name: provisioning-agent}] - steps: - # Check-Out - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - # Set-Up - - name: Setup JDK 17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - with: - java-version: '17' - distribution: 'temurin' - cache: 'maven' - - # Build - - name: Build ${{ matrix.variant.name }} - run: |- - ./mvnw -s settings.xml -pl ${{ matrix.variant.dir }} install - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Tar gzip files for veracode upload - run: |- - tar --exclude='spring-web-5.3.31.jar' -czvf ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}.tar.gz ${{ matrix.variant.dir }}/target/lib/*.jar ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}-*.jar - - name: Veracode Upload And Scan - uses: veracode/veracode-uploadandscan-action@c3c0b78bddb42d5f6b10d70562f692215a410d7b #v1.0 - if: | - needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY - continue-on-error: true - with: - appname: knowledge-agents/${{ matrix.variant.name }} - createprofile: true - version: ${{ matrix.variant.name }}-${{ github.sha }} - filepath: ${{ matrix.variant.dir }}/target/${{ matrix.variant.name }}.tar.gz - vid: ${{ secrets.ORG_VERACODE_API_ID }} - vkey: ${{ secrets.ORG_VERACODE_API_KEY }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ab768399..8d9ce3a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # matchmaking-agent -![Version: 1.12.19-SNAPSHOT](https://img.shields.io/badge/Version-1.12.19--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.19-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.12.19--SNAPSHOT-informational?style=flat-square) +![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) A Helm chart for the Tractus-X Matchmaking Agent which is a container encompassing data storage capabilities accessible from the dataplane by a REST API @@ -30,7 +30,7 @@ This chart has no prerequisites. ## TL;DR ```shell $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -$ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.12.19-SNAPSHOT +$ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.13.21-SNAPSHOT ``` ## Maintainers diff --git a/charts/matchmaking-agent/ci/integration-values.yaml b/charts/matchmaking-agent/ci/integration-values.yaml index e457eae1..ae7382bb 100644 --- a/charts/matchmaking-agent/ci/integration-values.yaml +++ b/charts/matchmaking-agent/ci/integration-values.yaml @@ -24,7 +24,7 @@ # image: # registry: ghcr.io/catenax-ng/ # repository: tx-knowledge-agents/matchmaking-agent -# tag: 1.12.19-SNAPSHOT +# tag: 1.13.21-SNAPSHOT participant: id: "BPNL0000000DUMMY" diff --git a/charts/provisioning-agent/Chart.yaml b/charts/provisioning-agent/Chart.yaml index 7a750611..1781d07e 100644 --- a/charts/provisioning-agent/Chart.yaml +++ b/charts/provisioning-agent/Chart.yaml @@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/ sources: - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/provisioning type: application -appVersion: "1.12.19-SNAPSHOT" -version: 1.12.19-SNAPSHOT +appVersion: "1.13.21-SNAPSHOT" +version: 1.13.21-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/provisioning-agent/README.md b/charts/provisioning-agent/README.md index 2b7fb466..41e04d72 100644 --- a/charts/provisioning-agent/README.md +++ b/charts/provisioning-agent/README.md @@ -20,7 +20,7 @@ # provisioning-agent -![Version: 1.12.19-SNAPSHOT](https://img.shields.io/badge/Version-1.12.19--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.19-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.12.19--SNAPSHOT-informational?style=flat-square) +![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) A Helm chart for the Tractus-X Provisioning Agent which is a container to Bridge Agent-Enabled Connector and Relational Data Sources. @@ -31,7 +31,7 @@ This chart has no prerequisites. ## TL;DR ```shell $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.12.19-SNAPSHOT +$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.13.21-SNAPSHOT ``` ## Maintainers diff --git a/charts/remoting-agent/Chart.yaml b/charts/remoting-agent/Chart.yaml index be261f5f..8750aea8 100644 --- a/charts/remoting-agent/Chart.yaml +++ b/charts/remoting-agent/Chart.yaml @@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/ sources: - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/remoting type: application -appVersion: "1.12.19-SNAPSHOT" -version: 1.12.19-SNAPSHOT +appVersion: "1.13.21-SNAPSHOT" +version: 1.13.21-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/remoting-agent/README.md b/charts/remoting-agent/README.md index c0472772..3abc9ee4 100644 --- a/charts/remoting-agent/README.md +++ b/charts/remoting-agent/README.md @@ -19,7 +19,7 @@ --> # remoting-agent -![Version: 1.12.19-SNAPSHOT](https://img.shields.io/badge/Version-1.12.19--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.12.19-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.12.19--SNAPSHOT-informational?style=flat-square) +![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) A Helm chart for the Tractus-X Remoting Agent which is a container to Bridge Agent-Enabled Connector and REST APIs. @@ -30,7 +30,7 @@ This chart has no prerequisites. ## TL;DR ```shell $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev -$ helm install my-release eclipse-tractusx/remoting-agent --version 1.12.19-SNAPSHOT +$ helm install my-release eclipse-tractusx/remoting-agent --version 1.13.21-SNAPSHOT ``` ## Maintainers diff --git a/conforming/README.md b/conforming/README.md index ce4e3e80..22b1451e 100644 --- a/conforming/README.md +++ b/conforming/README.md @@ -54,15 +54,15 @@ mvn package This will generate -- a [plugin jar](target/original-conforming-agent-1.12.19-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. -- a [standalone jar](target/conforming-agent-1.12.19-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). +- a [plugin jar](target/original-conforming-agent-1.13.21-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. +- a [standalone jar](target/conforming-agent-1.13.21-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). ### Run Locally -The [standalone jar](target/conforming-agent-1.12.19-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/conforming-agent-1.13.21-SNAPSHOT.jar) may be started as follows ```console -java -cp target/conforming-agent-1.12.19-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" +java -cp target/conforming-agent-1.13.21-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" ``` ### Containerizing @@ -76,7 +76,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/conforming-agent:1.12.19-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/conforming-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . ``` This will create a docker image based on a minimal java environment for running the Glassfish-based standalone jar. @@ -85,7 +85,7 @@ To run the docker image, you could invoke this command ```console docker run -p 8080:8080 \ - tractusx/conforming-agent:1.12.19-SNAPSHOT + tractusx/conforming-agent:1.13.21-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via @@ -124,7 +124,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:21-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin @@ -143,7 +143,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: conforming-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.12.19-SNAPSHOT + version: 1.13.21-SNAPSHOT alias: my-conforming-agent ``` diff --git a/conforming/pom.xml b/conforming/pom.xml index e606ad83..dfb9ab4e 100644 --- a/conforming/pom.xml +++ b/conforming/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.12.19-SNAPSHOT + 1.13.21-SNAPSHOT ../pom.xml diff --git a/conforming/src/main/docker/Dockerfile b/conforming/src/main/docker/Dockerfile index 4745853c..84b8cf4d 100644 --- a/conforming/src/main/docker/Dockerfile +++ b/conforming/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM eclipse-temurin:22_36-jre-alpine +FROM eclipse-temurin:22-jre-alpine ARG JAR ARG LIB diff --git a/matchmaking/README.md b/matchmaking/README.md index 656891fe..c5cca58f 100644 --- a/matchmaking/README.md +++ b/matchmaking/README.md @@ -66,10 +66,10 @@ This will generate ### Run Locally -The [standalone jar](target/matchmaking-agent-1.12.19-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/matchmaking-agent-1.13.21-SNAPSHOT.jar) may be started as follows ```console -java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.12.19-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap +java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.13.21-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap ``` Make sure that jar file, properties file and dataspace.ttl are in the same directory Then you should be able to reach the /graph endpoint @@ -107,7 +107,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:17-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin @@ -126,7 +126,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: matchmaking-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.12.19-SNAPSHOT + version: 1.13.21-SNAPSHOT alias: my-matchmmaking-agent ``` diff --git a/matchmaking/pom.xml b/matchmaking/pom.xml index 12214e0d..89de36b2 100644 --- a/matchmaking/pom.xml +++ b/matchmaking/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.12.19-SNAPSHOT + 1.13.21-SNAPSHOT ../pom.xml diff --git a/matchmaking/src/main/docker/Dockerfile b/matchmaking/src/main/docker/Dockerfile index 022c0b86..d2d1c2e5 100644 --- a/matchmaking/src/main/docker/Dockerfile +++ b/matchmaking/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM eclipse-temurin:22_36-jre-alpine +FROM eclipse-temurin:22-jre-alpine ARG JAR ARG LIB diff --git a/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java b/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java index e2db94b0..16765c29 100644 --- a/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java +++ b/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java @@ -155,15 +155,17 @@ public class DataManagement { public static final String ASSET_CALL = "%s%s/assets/request"; - // negotiation request 0.5.>=1 + // negotiation request 0.7.>=3 public static final String NEGOTIATION_REQUEST_BODY = "{\n" + " \"@context\": {\n" + - " \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\n" + + " \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" + + " \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\"\n" + " },\n" + " \"@type\": \"https://w3id.org/edc/v0.0.1/ns/ContractRequest\",\n" + " \"counterPartyAddress\": \"%1$s\",\n" + " \"protocol\": \"dataspace-protocol-http\",\n" + + " \"providerId\": \"%2$s\",\n" + " \"policy\": {\n" + " \"@context\": \"http://www.w3.org/ns/odrl.jsonld\",\n" + " \"@type\": \"odrl:Offer\",\n" + diff --git a/pom.xml b/pom.xml index 1f107c40..7ac1e02c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.eclipse.tractusx agents - 1.12.19-SNAPSHOT + 1.13.21-SNAPSHOT pom Tractus-X Knowledge Agents Reference Implementations Provides Reference Implementations and Artifacts to Realize Semantic Dataspace Backends diff --git a/provisioning/README.md b/provisioning/README.md index d1d5f23a..8570b988 100644 --- a/provisioning/README.md +++ b/provisioning/README.md @@ -111,7 +111,7 @@ mvn package ``` This will generate -- a [pluging jar](target/provisioning-agent-1.12.19-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) +- a [pluging jar](target/provisioning-agent-1.13.21-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) ### Containerizing (Provisioning Agent) @@ -124,7 +124,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/provisioning-agent:1.12.19-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/provisioning-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . ``` The image contains @@ -144,7 +144,7 @@ docker run -p 8080:8080 \ -v $(pwd)/resources/university-role1.obda:/input/mapping.obda \ -v $(pwd)/resources/university-role1.properties:/input/settings.properties \ -v $(pwd)/resources/university.sql:/tmp/university.sql \ - tractusx/provisioning-agent:1.12.19-SNAPSHOT + tractusx/provisioning-agent:1.13.21-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via @@ -192,7 +192,7 @@ docker run -p 8080:8080 -p 8082:8082 \ -e ONTOP_MAPPING_FILE="/input/role1.obda /input/role2.obda" \ -e ONTOP_PROPERTIES_FILE="/input/role1.properties /input/role2.properties" \ -e ONTOP_DEV_MODE="false false" \ - tractusx/provisioning-agent:1.12.19-SNAPSHOT + tractusx/provisioning-agent:1.13.21-SNAPSHOT ```` Accessing entities spanning two schemas using the first role/endpoint delivers a greater count @@ -297,7 +297,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: provisioning-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.12.19-SNAPSHOT + version: 1.13.21-SNAPSHOT alias: my-provider-agent ``` diff --git a/provisioning/pom.xml b/provisioning/pom.xml index bd759fca..0a564ea1 100644 --- a/provisioning/pom.xml +++ b/provisioning/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.12.19-SNAPSHOT + 1.13.21-SNAPSHOT ../pom.xml diff --git a/remoting/README.md b/remoting/README.md index cb54413f..a1bad0f7 100644 --- a/remoting/README.md +++ b/remoting/README.md @@ -134,15 +134,15 @@ mvn package ``` This will generate -- a [standalone jar](target/remoting-agent-1.12.19-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. -- a [pluging jar](target/original-remoting-agent-1.12.19-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. +- a [standalone jar](target/remoting-agent-1.13.21-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. +- a [pluging jar](target/original-remoting-agent-1.13.21-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. ### Run Locally -The standalone jar](target/remoting-agent-1.12.19-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source +The standalone jar](target/remoting-agent-1.13.21-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source ```console -java -jar target/remoting-agent-1.12.19-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG +java -jar target/remoting-agent-1.13.21-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG ``` ### Containerizing @@ -156,7 +156,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/remoting-agent:1.12.19-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/remoting-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . ``` This will create a docker image including an extended rdf4j-server as well as an interactive rdf4j-workbench. @@ -166,7 +166,7 @@ To run the docker image, you could invoke this command ```console docker run -p 8081:8081 \ -v $(pwd)/src/test:/var/rdf4j/config \ - tractusx/remoting-agent:1.12.19-SNAPSHOT + tractusx/remoting-agent:1.13.21-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8081/) via @@ -205,7 +205,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:21-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin @@ -224,7 +224,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: remoting-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.12.19-SNAPSHOT + version: 1.13.21-SNAPSHOT alias: my-remoting-agent ``` diff --git a/remoting/pom.xml b/remoting/pom.xml index f73cdb2b..802e77cc 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -26,7 +26,7 @@ org.eclipse.tractusx agents - 1.12.19-SNAPSHOT + 1.13.21-SNAPSHOT ../pom.xml diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile index 567a5a83..5dc8acd1 100644 --- a/remoting/src/main/docker/Dockerfile +++ b/remoting/src/main/docker/Dockerfile @@ -19,7 +19,7 @@ # Build Container: Fixes diverse vulnerabilities in guava <32, netty, jetty, spring-framework <5.3.28 and spring-web (all 5 versions - need to exclude a deprecated package from the jar) ## -FROM eclipse-temurin:22_36-jdk-alpine AS build +FROM eclipse-temurin:22-jdk-alpine AS build COPY target/original-remoting-agent-*.jar /opt/lib/ #COPY target/lib/guava-*.jar /opt/lib/ @@ -68,7 +68,7 @@ COPY resources/web/callback.xml /tmp/rdf4j-server/WEB-INF/callback.xml # Target Container: Use a valid base image ## -FROM eclipse-temurin:22_36-jre-alpine +FROM eclipse-temurin:22-jre-alpine ARG APP_USER=tomcat ARG APP_UID=10001 diff --git a/upgrade_version.sh b/upgrade_version.sh index a432f540..44a98176 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.12.19-SNAPSHOT +OLD_VERSION=1.13.21-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C