diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e218f41..9aee21a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.14.24-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 @@ -181,7 +181,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.14.24-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 @@ -220,7 +220,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.14.24-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 @@ -259,7 +259,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.14.24-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 a24991ef..50d9e501 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@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 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@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 \ No newline at end of file + uses: github/codeql-action/analyze@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 \ No newline at end of file diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml index 10008e2f..87de4af0 100644 --- a/.github/workflows/helm-chart-lint.yml +++ b/.github/workflows/helm-chart-lint.yml @@ -64,7 +64,7 @@ jobs: # Set-Up Helm - name: Set up Helm - uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5 + uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 with: version: v3.10.3 @@ -77,7 +77,7 @@ jobs: cache: 'maven' # Set-Up Python - - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 with: python-version: 3.9 diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml index 8ab748dc..26c00c65 100644 --- a/.github/workflows/helm-chart-release.yml +++ b/.github/workflows/helm-chart-release.yml @@ -51,7 +51,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install Helm - uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5 + uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index a13833a3..3860deac 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -70,6 +70,6 @@ jobs: - name: Upload SARIF file for GitHub Advanced Security Dashboard if: always() - uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6 + uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 with: sarif_file: kicsResults/results.sarif diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 722b8729..d645bb4a 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -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@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 if: always() with: sarif_file: "trivy-results-config.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@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3 with: sarif_file: "trivy-results-${{ matrix.image }}.sarif" diff --git a/DEPENDENCIES b/DEPENDENCIES index f6598f07..d1270765 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -24,13 +24,15 @@ maven/mavencentral/com.github.jsqlparser/jsqlparser/4.4, LGPL-2.1 OR Apache-2.0, maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, CC-BY-2.5, approved, #15220 maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159 -maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.google.errorprone/error_prone_annotations/2.28.0, Apache-2.0, approved, #15107 maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 -maven/mavencentral/com.google.guava/guava/32.1.2-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, #9229 +maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, CQ22654 +maven/mavencentral/com.google.guava/guava/32.1.3-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, #9229 +maven/mavencentral/com.google.guava/guava/33.3.0-jre, Apache-2.0 AND CC0-1.0 AND (Apache-2.0 AND CC-PDDC) AND (Apache-2.0 AND CC0-1.0), approved, #15952 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.inject.extensions/guice-assistedinject/5.0.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.google.inject/guice/5.0.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.google.j2objc/j2objc-annotations/2.8, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.google.inject/guice/5.0.1, Apache-2.0, approved, #16805 +maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676 maven/mavencentral/com.google.protobuf/protobuf-java/3.23.3, BSD-3-Clause, approved, #8634 maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701 @@ -44,7 +46,7 @@ maven/mavencentral/commons-cli/commons-cli/1.5.0, Apache-2.0, approved, clearlyd maven/mavencentral/commons-codec/commons-codec/1.14, Apache-2.0, approved, clearlydefined maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641 maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, #15185 -maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745 +maven/mavencentral/commons-io/commons-io/2.14.0, Apache-2.0, approved, #10768 maven/mavencentral/commons-io/commons-io/2.15.1, Apache-2.0, approved, #11244 maven/mavencentral/commons-lang/commons-lang/2.6, Apache-2.0, approved, CQ6183 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 @@ -76,9 +78,9 @@ maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.12, Apache-2.0, approved, maven/mavencentral/io.swagger.core.v3/swagger-integration/2.2.12, Apache-2.0, approved, #10352 maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2/2.2.12, Apache-2.0, approved, #9814 maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.12, Apache-2.0, approved, #10353 -maven/mavencentral/it.unibz.inf.ontop/ontop-model/5.1.2, Apache-2.0, approved, #11624 -maven/mavencentral/it.unibz.inf.ontop/ontop-obda-core/5.1.2, Apache-2.0, approved, #11623 -maven/mavencentral/it.unibz.inf.ontop/ontop-rdb/5.1.2, Apache-2.0, approved, #11626 +maven/mavencentral/it.unibz.inf.ontop/ontop-model/5.2.0, Apache-2.0, approved, #16806 +maven/mavencentral/it.unibz.inf.ontop/ontop-obda-core/5.2.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/it.unibz.inf.ontop/ontop-rdb/5.2.0, Apache-2.0, approved, #16804 maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca @@ -165,14 +167,14 @@ maven/mavencentral/org.apache.zookeeper/zookeeper/3.8.4, Apache-2.0, approved, # maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161 maven/mavencentral/org.attoparser/attoparser/2.0.5.RELEASE, Apache-2.0, approved, CQ18900 -maven/mavencentral/org.checkerframework/checker-qual/3.33.0, MIT, approved, clearlydefined +maven/mavencentral/org.checkerframework/checker-qual/3.43.0, MIT, approved, clearlydefined maven/mavencentral/org.codehaus.woodstox/stax2-api/3.1.4, BSD-2-Clause, approved, CQ13504 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.1, BSD-2-Clause, approved, #2670 maven/mavencentral/org.codehaus.woodstox/woodstox-core-asl/4.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.eclipse.jetty.http2/http2-client/9.4.52.v20230823, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.http2/http2-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.http2/http2-common/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.http2/http2-hpack/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.http2/http2-http-client-transport/9.4.52.v20230823, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.http2/http2-http-client-transport/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-alpn-java-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty @@ -187,81 +189,81 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.16, EPL-2.0 OR Apache-2. maven/mavencentral/org.eclipse.jetty/jetty-servlets/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.rdf4j/rdf4j-client/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-mapdb/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-transaction/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-xml/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-config/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-client/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-protocol/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-server-spring/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.2.4, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-query/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-evaluation/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-geosparql/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-model/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-sparql/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryrender/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-binary/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-text/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-contextaware/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-dataset/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-event/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-http/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-manager/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sail/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sparql/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-binary/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-datatypes/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-jsonld/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-languages/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-n3/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-nquads/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-ntriples/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfjson/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfxml/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trig/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trix/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-turtle/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-base/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-elasticsearch/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-inferencer/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lmdb/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-memory/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-model/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-nativerdf/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-solr/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-shacl/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sparqlbuilder/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-spin/4.3.8, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-storage/4.3.8, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-client/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-mapdb/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-annotation/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-exception/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-io/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-iterator/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-text/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-transaction/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-util/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-xml/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-config/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-client/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-protocol/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-server-spring/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model-vocabulary/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.3.10, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-model/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-query/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-evaluation/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-geosparql/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-model/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-sparql/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryrender/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-binary/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-text/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-contextaware/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-dataset/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-event/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-http/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-manager/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sail/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sparql/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-binary/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-datatypes/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-jsonld/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-languages/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-n3/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-nquads/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-ntriples/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfjson/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfxml/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trig/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trix/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-turtle/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-base/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-elasticsearch/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-inferencer/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lmdb/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene-api/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-memory/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-model/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-nativerdf/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-solr/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-shacl/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-sparqlbuilder/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-spin/4.3.14, BSD-3-Clause, approved, technology.rdf4j +maven/mavencentral/org.eclipse.rdf4j/rdf4j-storage/4.3.14, BSD-3-Clause, approved, technology.rdf4j maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/2.6.1, 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.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2.external/jakarta.inject/2.6.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish @@ -307,20 +309,20 @@ maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.10, Apache-2.0, a maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.10, Apache-2.0, approved, #11827 maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.2, EPL-2.0, approved, #9714 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133 +maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.3, EPL-2.0, approved, #3133 maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.2, EPL-2.0, approved, #9711 -maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.2, EPL-2.0, approved, #3125 +maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.3, EPL-2.0, approved, #3125 maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.2, EPL-2.0, approved, #15250 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134 +maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.3, EPL-2.0, approved, #3134 maven/mavencentral/org.junit.jupiter/junit-jupiter/5.10.2, EPL-2.0, approved, #15197 -maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.2, EPL-2.0, approved, #6972 +maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.3, EPL-2.0, approved, #6972 maven/mavencentral/org.junit.platform/junit-platform-commons/1.10.2, EPL-2.0, approved, #9715 -maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130 +maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.3, EPL-2.0, approved, #3130 maven/mavencentral/org.junit.platform/junit-platform-engine/1.10.2, EPL-2.0, approved, #9709 -maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.2, EPL-2.0, approved, #3128 +maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.3, EPL-2.0, approved, #3128 maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484 maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, CC0-1.0, approved, #15280 -maven/mavencentral/org.locationtech.jts/jts-core/1.18.2, EPL-2.0, approved, locationtech.jts +maven/mavencentral/org.locationtech.jts/jts-core/1.19.0, EPL-2.0, approved, locationtech.jts maven/mavencentral/org.locationtech.proj4j/proj4j/1.1.1, Apache-2.0, approved, locationtech.proj4j maven/mavencentral/org.locationtech.spatial4j/spatial4j/0.8, Apache-2.0, approved, locationtech.spatial4j maven/mavencentral/org.lwjgl/lwjgl-lmdb/3.3.3, BSD-3-Clause, approved, #3055 @@ -332,7 +334,7 @@ maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydef maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713 maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029 -maven/mavencentral/org.postgresql/postgresql/42.7.2, BSD-2-Clause AND Apache-2.0, approved, #11681 +maven/mavencentral/org.postgresql/postgresql/42.7.3, BSD-2-Clause AND Apache-2.0, approved, #11681 maven/mavencentral/org.roaringbitmap/RoaringBitmap/0.9.45, Apache-2.0, approved, clearlydefined maven/mavencentral/org.roaringbitmap/shims/0.9.45, Apache-2.0, approved, clearlydefined maven/mavencentral/org.simpleframework/simple-common/6.0.1, Apache-2.0, approved, CQ16868 @@ -357,15 +359,15 @@ maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.18, Apache-2 maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.18, Apache-2.0, approved, #4313 maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.18, Apache-2.0, approved, #4323 maven/mavencentral/org.springframework.boot/spring-boot/2.7.18, Apache-2.0, approved, #4322 -maven/mavencentral/org.springframework/spring-aop/5.3.31, Apache-2.0, approved, CQ23152 -maven/mavencentral/org.springframework/spring-beans/5.3.31, Apache-2.0, approved, CQ23153 -maven/mavencentral/org.springframework/spring-context/5.3.31, Apache-2.0, approved, CQ23051 -maven/mavencentral/org.springframework/spring-core/5.3.31, Apache-2.0 AND BSD-3-Clause, approved, CQ23154 -maven/mavencentral/org.springframework/spring-expression/5.3.31, Apache-2.0, approved, CQ23155 -maven/mavencentral/org.springframework/spring-jcl/5.3.31, Apache-2.0, approved, CQ23156 +maven/mavencentral/org.springframework/spring-aop/5.3.39, Apache-2.0, approved, CQ23152 +maven/mavencentral/org.springframework/spring-beans/5.3.39, Apache-2.0, approved, CQ23153 +maven/mavencentral/org.springframework/spring-context/5.3.39, Apache-2.0, approved, CQ23051 +maven/mavencentral/org.springframework/spring-core/5.3.39, Apache-2.0 AND BSD-3-Clause, approved, CQ23154 +maven/mavencentral/org.springframework/spring-expression/5.3.39, Apache-2.0, approved, CQ23155 +maven/mavencentral/org.springframework/spring-jcl/5.3.39, Apache-2.0, approved, CQ23156 maven/mavencentral/org.springframework/spring-test/5.3.31, Apache-2.0, approved, CQ23054 -maven/mavencentral/org.springframework/spring-web/5.3.31, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157 -maven/mavencentral/org.springframework/spring-webmvc/5.3.31, Apache-2.0, approved, CQ23158 +maven/mavencentral/org.springframework/spring-web/5.3.39, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157 +maven/mavencentral/org.springframework/spring-webmvc/5.3.39, Apache-2.0, approved, CQ23158 maven/mavencentral/org.thymeleaf.extras/thymeleaf-extras-java8time/3.0.4.RELEASE, Apache-2.0, approved, clearlydefined maven/mavencentral/org.thymeleaf/thymeleaf-spring5/3.0.15.RELEASE, Apache-2.0, approved, clearlydefined maven/mavencentral/org.thymeleaf/thymeleaf/3.0.15.RELEASE, EPL-2.0, approved, CQ22180 diff --git a/NOTICE.md b/NOTICE.md index 8e1220b5..c35f001e 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -70,8 +70,8 @@ You may recreate an up-to-date DEPENDENCIES file by invoking ``` The KA-RI build and runtime platform is relying on: -* [Java Runtime Environment (JRE >=11 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java-Laufzeitumgebung) -* [Java Development Kit (JDK >=11 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java_Development_Kit) +* [Java Runtime Environment (JRE >=17 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java-Laufzeitumgebung) +* [Java Development Kit (JDK >=17 - license depends on chosen provider)](https://de.wikipedia.org/wiki/Java_Development_Kit) * [Apache Maven >=3.8 (Apache License 2.0)](https://maven.apache.org) * [Eclipse Dash (Eclipse Public License 2.0)](https://github.com/eclipse/dash-licenses) * [Docker Engine >= 20.10.17 (Apache License 2.0)]() diff --git a/README.md b/README.md index 56a1350e..2e8981ff 100644 --- a/README.md +++ b/README.md @@ -114,10 +114,10 @@ kubectl wait --namespace ingress-nginx \ --selector=app.kubernetes.io/component=controller \ --timeout=90s # transfer images -kind load docker-image docker.io/tractusx/conforming-agent:1.14.23-SNAPSHOT --name ka -kind load docker-image docker.io/tractusx/matchmaking-agent:1.14.23-SNAPSHOT --name ka -kind load docker-image docker.io/tractusx/provisioning-agent:1.14.23-SNAPSHOT --name ka -kind load docker-image docker.io/tractusx/remoting-agent:1.14.23-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/conforming-agent:1.14.24-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/matchmaking-agent:1.14.24-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/provisioning-agent:1.14.24-SNAPSHOT --name ka +kind load docker-image docker.io/tractusx/remoting-agent:1.14.24-SNAPSHOT --name ka # run container test ct install --charts charts/conforming-agent ct install --charts charts/matchmaking-agent diff --git a/charts/conforming-agent/Chart.yaml b/charts/conforming-agent/Chart.yaml index 2d0af69c..6d7a1b12 100644 --- a/charts/conforming-agent/Chart.yaml +++ b/charts/conforming-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/conforming type: application -appVersion: "1.14.23-SNAPSHOT" -version: 1.14.23-SNAPSHOT +appVersion: "1.14.24-SNAPSHOT" +version: 1.14.24-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/conforming-agent/README.md b/charts/conforming-agent/README.md index f1443082..1b359594 100644 --- a/charts/conforming-agent/README.md +++ b/charts/conforming-agent/README.md @@ -20,7 +20,7 @@ # conforming-agent -![Version: 1.14.23-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.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) +![Version: 1.14.24-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.14.24-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) A Helm chart for the Tractus-X Conforming Agent which is a container to assess the conformity of all other parts of the Agent-Enabled Dataspace. @@ -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/conforming-agent --version 1.14.23-SNAPSHOT +$ helm install my-release eclipse-tractusx/conforming-agent --version 1.14.24-SNAPSHOT ``` ## Maintainers diff --git a/charts/conforming-agent/values.yaml b/charts/conforming-agent/values.yaml index 46bd554a..76346eef 100644 --- a/charts/conforming-agent/values.yaml +++ b/charts/conforming-agent/values.yaml @@ -191,8 +191,8 @@ ingresses: # We recommend 20% of a cpu and 256MB per endpoint resources: requests: - cpu: 200m - memory: 256Mi + cpu: 100m + memory: 128Mi limits: cpu: 200m memory: 256Mi diff --git a/charts/matchmaking-agent/Chart.yaml b/charts/matchmaking-agent/Chart.yaml index 5c9ee90b..451b091e 100644 --- a/charts/matchmaking-agent/Chart.yaml +++ b/charts/matchmaking-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/matchmaking type: application -appVersion: "1.14.23-SNAPSHOT" -version: 1.14.23-SNAPSHOT +appVersion: "1.14.24-SNAPSHOT" +version: 1.14.24-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/matchmaking-agent/README.md b/charts/matchmaking-agent/README.md index 4b27f16e..db315db7 100644 --- a/charts/matchmaking-agent/README.md +++ b/charts/matchmaking-agent/README.md @@ -19,7 +19,7 @@ --> # matchmaking-agent -![Version: 1.14.23-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.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) +![Version: 1.14.24-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.14.24-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.14.23-SNAPSHOT +$ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.14.24-SNAPSHOT ``` ## Maintainers diff --git a/charts/matchmaking-agent/ci/integration-values.yaml b/charts/matchmaking-agent/ci/integration-values.yaml index 5889d876..098a096a 100644 --- a/charts/matchmaking-agent/ci/integration-values.yaml +++ b/charts/matchmaking-agent/ci/integration-values.yaml @@ -22,9 +22,9 @@ # # image: -# registry: ghcr.io/catenax-ng/ +# registry: ghcr.io/big-data-spaces # repository: tx-knowledge-agents/matchmaking-agent -# tag: 1.14.23-SNAPSHOT +# tag: 1.14.24-SNAPSHOT participant: id: "BPNL0000000DUMMY" diff --git a/charts/matchmaking-agent/values.yaml b/charts/matchmaking-agent/values.yaml index 9c3ee685..ca2f04a3 100644 --- a/charts/matchmaking-agent/values.yaml +++ b/charts/matchmaking-agent/values.yaml @@ -287,8 +287,8 @@ ingresses: # We recommend 25% of a cpu, 512MB per server and 256MB per endpoint resources: requests: - cpu: 250m - memory: 768Mi + cpu: 100m + memory: 256Mi limits: cpu: 250m memory: 768Mi diff --git a/charts/provisioning-agent/Chart.yaml b/charts/provisioning-agent/Chart.yaml index 9c71fae4..92a82cd9 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.14.23-SNAPSHOT" -version: 1.14.23-SNAPSHOT +appVersion: "1.14.24-SNAPSHOT" +version: 1.14.24-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/provisioning-agent/README.md b/charts/provisioning-agent/README.md index d79a8c74..d06b6578 100644 --- a/charts/provisioning-agent/README.md +++ b/charts/provisioning-agent/README.md @@ -20,7 +20,7 @@ # provisioning-agent -![Version: 1.14.23-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.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) +![Version: 1.14.24-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.14.24-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.14.23-SNAPSHOT +$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.14.24-SNAPSHOT ``` ## Maintainers diff --git a/charts/provisioning-agent/values.yaml b/charts/provisioning-agent/values.yaml index 8d290d12..d5136c9b 100644 --- a/charts/provisioning-agent/values.yaml +++ b/charts/provisioning-agent/values.yaml @@ -233,11 +233,11 @@ ingresses: # We recommend using 50% of CPU and 0.5Gi of memory per exported endpoint resources: requests: - cpu: 500m - memory: 512Mi + cpu: 250m + memory: 256Mi limits: - cpu: 500m - memory: 512Mi + cpu: 750m + memory: 768Mi autoscaling: # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) diff --git a/charts/remoting-agent/Chart.yaml b/charts/remoting-agent/Chart.yaml index 6452d1e8..b7077bdf 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.14.23-SNAPSHOT" -version: 1.14.23-SNAPSHOT +appVersion: "1.14.24-SNAPSHOT" +version: 1.14.24-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/remoting-agent/README.md b/charts/remoting-agent/README.md index e40e6b63..02c4832e 100644 --- a/charts/remoting-agent/README.md +++ b/charts/remoting-agent/README.md @@ -19,7 +19,7 @@ --> # remoting-agent -![Version: 1.14.23-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.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square) +![Version: 1.14.24-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.14.24-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.14.23-SNAPSHOT +$ helm install my-release eclipse-tractusx/remoting-agent --version 1.14.24-SNAPSHOT ``` ## Maintainers diff --git a/charts/remoting-agent/values.yaml b/charts/remoting-agent/values.yaml index 73fcc798..32bc1c69 100644 --- a/charts/remoting-agent/values.yaml +++ b/charts/remoting-agent/values.yaml @@ -191,10 +191,10 @@ ingresses: # We recommend 25% of a cpu, 512MB per server and 256MB per endpoint resources: requests: - cpu: 250m - memory: 768Mi + cpu: 100m + memory: 256Mi limits: - cpu: 250m + cpu: 300m memory: 768Mi autoscaling: diff --git a/conforming/README.md b/conforming/README.md index 8660536a..6849542f 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.14.23-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. -- a [standalone jar](target/conforming-agent-1.14.23-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). +- a [plugin jar](target/original-conforming-agent-1.14.24-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. +- a [standalone jar](target/conforming-agent-1.14.24-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). ### Run Locally -The [standalone jar](target/conforming-agent-1.14.23-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/conforming-agent-1.14.24-SNAPSHOT.jar) may be started as follows ```console -java -cp target/conforming-agent-1.14.23-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" +java -cp target/conforming-agent-1.14.24-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.14.23-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/conforming-agent:1.14.24-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.14.23-SNAPSHOT + tractusx/conforming-agent:1.14.24-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via @@ -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.14.23-SNAPSHOT + version: 1.14.24-SNAPSHOT alias: my-conforming-agent ``` diff --git a/conforming/pom.xml b/conforming/pom.xml index 53e42d9a..6b04b326 100644 --- a/conforming/pom.xml +++ b/conforming/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.14.23-SNAPSHOT + 1.14.24-SNAPSHOT ../pom.xml @@ -157,6 +157,11 @@ guava ${guava.version} + + commons-io + commons-io + ${commons.io.version} + diff --git a/matchmaking/README.md b/matchmaking/README.md index f3d47b5d..4bba36ae 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.14.23-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/matchmaking-agent-1.14.24-SNAPSHOT.jar) may be started as follows ```console -java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.14.23-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap +java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.14.24-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 @@ -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.14.23-SNAPSHOT + version: 1.14.24-SNAPSHOT alias: my-matchmmaking-agent ``` diff --git a/matchmaking/pom.xml b/matchmaking/pom.xml index 243fb429..b3d14da8 100644 --- a/matchmaking/pom.xml +++ b/matchmaking/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.14.23-SNAPSHOT + 1.14.24-SNAPSHOT ../pom.xml diff --git a/matchmaking/resources/dataspace.ttl b/matchmaking/resources/dataspace.ttl index 4b25fc91..ae86ff64 100644 --- a/matchmaking/resources/dataspace.ttl +++ b/matchmaking/resources/dataspace.ttl @@ -22,10 +22,10 @@ ################################################################# @prefix : . -@prefix cx: . +@prefix cx: . @prefix cx-common: . -@prefix cx-diag: . -@prefix cx-telematics: . +@prefix cx-diag: . +@prefix cx-telematics: . @prefix owl: . @prefix rdf: . @prefix xml: . @@ -181,7 +181,7 @@ bpns:BPNS0000000006V6 cx-common:hasGeoInformation . cx-telematics:hasHeader "{ \"CountingMethod\": \"ZF_TimeAtLevel\", \"CountingUnit\": \"s\", \"Channels\": [ { \"Name\": \"Temp_Oil\", \"Type\": \"Load\", \"Unit\": \"degC\", \"LowerLimit\": -40, \"UpperLimit\": 220, \"NumberOfBins\": 52 } ] }"^^json:Object. cx-common:EngineeringMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso , ; rdfs:subClassOf [ a owl:Restriction ; @@ -212,21 +212,21 @@ cx-common:EngineeringMaterial a owl:Class ; "Engineering Material"@en . cx-common:SemiconductorMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:EngineeringMaterial ; skos:prefLabel "Halbleiter Material"@de, "Semiconductor Material"@en . cx-common:CeramicMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:subClassOf cx-common:EngineeringMaterial ; skos:altLabel "anorganisch-nichtmetallischer Werkstoff"@de ; skos:prefLabel "Keramisches Material"@de, "Ceramic Material"@en . cx-common:CompositeMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:EngineeringMaterial ; skos:definition "mixture of materials"@en ; @@ -234,7 +234,7 @@ cx-common:CompositeMaterial a owl:Class ; "Composite Material"@en . cx-common:PolymerMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso , ; rdfs:subClassOf cx-common:EngineeringMaterial ; @@ -242,14 +242,14 @@ cx-common:PolymerMaterial a owl:Class ; "Polymer Material"@en . cx-common:MetalMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:EngineeringMaterial ; skos:prefLabel "Metallmaterial"@de, "Metal Material"@en . cx-common:HeavyMetal a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:MetalMaterial ; skos:definition "density above 5 g/cm³"@en ; @@ -257,7 +257,7 @@ cx-common:HeavyMetal a owl:Class ; "Heavy Metal"@en . cx-common:LightMetal a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:MetalMaterial ; skos:definition "density below 5 g/cm³"@en ; @@ -265,21 +265,21 @@ cx-common:LightMetal a owl:Class ; "Light Metal"@en . cx-common:NativeMetal a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:MetalMaterial ; skos:prefLabel "Reinmetall"@de, "Native Metal"@en . cx-common:Alloy a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:MetalMaterial ; skos:prefLabel "Legierung"@de, "Alloy"@en . cx-common:CathodeMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:Alloy ; skos:prefLabel "Kathodenmaterial"@de, @@ -312,7 +312,7 @@ cx-common:CompositeMaterial_Carbon a cx-common:CompositeMaterial ; skos:prefLabel "Karbon"@de. cx-common:OrganicMaterial a owl:Class ; - rdfs:isDefinedBy ; + rdfs:isDefinedBy ; rdfs:seeAlso ; rdfs:subClassOf cx-common:EngineeringMaterial ; skos:altLabel "Organischer Werkstoff"@de ; diff --git a/pom.xml b/pom.xml index 148728ac..bd599c11 100644 --- a/pom.xml +++ b/pom.xml @@ -26,24 +26,25 @@ 4.0.0 org.eclipse.tractusx agents - 1.14.23-SNAPSHOT + 1.14.24-SNAPSHOT pom Tractus-X Knowledge Agents Reference Implementations Provides Reference Implementations and Artifacts to Realize Semantic Dataspace Backends - 11 - 11 + 17 + 17 false 5.10.2 5.2.0 3.3.2 4.12.0 - 4.3.8 + 4.3.14 4.5.14 1.2 + 2.14.0 1.26.0 2.15.2 3.1.0 @@ -51,18 +52,18 @@ 4.0.1 5.0.2 2.3.1 - 5.1.2 + 5.2.0 2.5 3.1.0 - 5.3.31 + 5.3.39 2.7.18 - 32.1.2-jre + 33.3.0-jre 9.0.83 4.1.101.Final 9.4.54.v20240208 2.2 1.1.10.5 - 42.7.2 + 42.7.3 3.8.4 2.2.12 2.40 @@ -134,7 +135,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.4.0 !online @@ -164,6 +165,7 @@ ${project.basedir} build + --load --platform ${platform} -f diff --git a/provisioning/README.md b/provisioning/README.md index ac04599d..9f6929a9 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.14.23-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) +- a [pluging jar](target/provisioning-agent-1.14.24-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.14.23-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/provisioning-agent:1.14.24-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.14.23-SNAPSHOT + tractusx/provisioning-agent:1.14.24-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.14.23-SNAPSHOT + tractusx/provisioning-agent:1.14.24-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.14.23-SNAPSHOT + version: 1.14.24-SNAPSHOT alias: my-provider-agent ``` diff --git a/provisioning/pom.xml b/provisioning/pom.xml index 8ae8e388..11721b0e 100644 --- a/provisioning/pom.xml +++ b/provisioning/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.14.23-SNAPSHOT + 1.14.24-SNAPSHOT ../pom.xml @@ -46,6 +46,8 @@ + 11 + 11 org.eclipse.tractusx.agents.provisioning-agent ${symbolic.name}-${project.version} @@ -61,6 +63,11 @@ guava ${guava.version} + + commons-io + commons-io + ${commons.io.version} + org.junit.jupiter junit-jupiter-engine @@ -99,8 +106,42 @@ org.yaml snakeyaml + + org.springframework + * + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-jcl + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + ch.qos.logback logback-classic diff --git a/provisioning/src/main/docker/Dockerfile b/provisioning/src/main/docker/Dockerfile index 3aba6c4f..da967eae 100644 --- a/provisioning/src/main/docker/Dockerfile +++ b/provisioning/src/main/docker/Dockerfile @@ -19,7 +19,7 @@ # Blueprint Container: Prebuilt distribution of ontop which we will repackage ## -FROM ontop/ontop:5.1.2 as blueprint +FROM ontop/ontop:5.2.0 as blueprint ## # Build Container: Fixes diverse vulnerabilities in guava <32, tomcat, spring-boot 2.7<13, spring-framework <5.3.28 and spring-web (all 5 versions - need to exclude a deprecated package from the jar) @@ -37,6 +37,7 @@ COPY target/provisioning-agent-*.jar /opt/ontop/lib/ COPY target/lib/guava-*.jar /opt/ontop/lib/ COPY target/lib/tomcat-embed-*.jar /opt/ontop/lib/ COPY target/lib/spring-*.jar /opt/ontop/lib/ +COPY target/lib/commons-io-*.jar /opt/ontop/lib/ COPY target/lib/postgresql-*.jar /opt/ontop/jdbc/ WORKDIR /tmp @@ -46,11 +47,16 @@ RUN if [ "${HTTP_PROXY}" != "" ]; then \ echo "Acquire::https::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ fi && \ for jdbcDriver in "$jdbcDrivers"; do wget --no-check-certificate -q -P /opt/ontop/jdbc ${jdbcDriver} ; done && \ - mv /opt/ontop/lib/spring-web-5.3.31.jar . && \ - jar xvf spring-web-5.3.31.jar && \ - rm -f spring-web-5.3.31.jar && \ + mv /opt/ontop/lib/spring-web-5.3.39.jar . && \ + jar xvf spring-web-5.3.39.jar && \ + rm -f spring-web-5.3.39.jar && \ rm -rf org/springframework/remoting/httpinvoker && \ - jar cf /opt/ontop/lib/spring-web.jar * + jar cf /opt/ontop/lib/spring-web.jar * && \ + rm -rf * && \ + mv /opt/ontop/lib/spring-webmvc-5.3.39.jar . && \ + jar xvf spring-webmvc-5.3.39.jar && \ + rm -f spring-webmvc-5.3.39.jar && \ + jar cf /opt/ontop/lib/spring-webmvc.jar * ## # Target Container: Use a valid base image @@ -80,6 +86,7 @@ COPY resources/entrypoint.sh /opt/ontop/. RUN rm /opt/ontop/lib/guava-*.jar && \ rm /opt/ontop/lib/tomcat-embed-*.jar && \ rm /opt/ontop/lib/spring-*.jar && \ + rm /opt/ontop/lib/commons-io-*.jar && \ mkdir -p /opt/ontop/input && \ mkdir -p /opt/ontop/database && \ mkdir -p /opt/ontop/data && \ diff --git a/remoting/README.md b/remoting/README.md index 1a96352e..12bf3955 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.14.23-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. -- a [pluging jar](target/original-remoting-agent-1.14.23-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. +- a [standalone jar](target/remoting-agent-1.14.24-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. +- a [pluging jar](target/original-remoting-agent-1.14.24-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. ### Run Locally -The standalone jar](target/remoting-agent-1.14.23-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source +The standalone jar](target/remoting-agent-1.14.24-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source ```console -java -jar target/remoting-agent-1.14.23-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG +java -jar target/remoting-agent-1.14.24-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.14.23-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/remoting-agent:1.14.24-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.14.23-SNAPSHOT + tractusx/remoting-agent:1.14.24-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8081/) via @@ -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.14.23-SNAPSHOT + version: 1.14.24-SNAPSHOT alias: my-remoting-agent ``` diff --git a/remoting/pom.xml b/remoting/pom.xml index 0c937da2..9a2dcd6a 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -26,7 +26,7 @@ org.eclipse.tractusx agents - 1.14.23-SNAPSHOT + 1.14.24-SNAPSHOT ../pom.xml @@ -77,6 +77,12 @@ ${commons.logging.version} + + commons-io + commons-io + ${commons.io.version} + + ch.qos.logback logback-classic @@ -192,9 +198,44 @@ org.yaml snakeyaml + + org.springframework + * + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-jcl + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + org.yaml snakeyaml diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile index 5865e2bc..22d95525 100644 --- a/remoting/src/main/docker/Dockerfile +++ b/remoting/src/main/docker/Dockerfile @@ -31,6 +31,7 @@ COPY target/lib/spring-*.jar /opt/lib/ COPY target/lib/logback-*.jar /opt/lib/ COPY target/lib/httpmime-*.jar /opt/lib/ COPY target/lib/commons-logging-*.jar /opt/lib/ +COPY target/lib/commons-io-*.jar /opt/lib/ COPY target/lib/snappy-java-*.jar /opt/lib/ COPY target/lib/zookeeper-*.jar /opt/lib/ @@ -41,15 +42,20 @@ COPY resources/web/tomcat-users.xml /opt/conf/ WORKDIR /tmp -RUN mv /opt/lib/spring-web-5.3.31.jar . && \ - jar xvf spring-web-5.3.31.jar && \ - rm -f spring-web-5.3.31.jar && \ +RUN mv /opt/lib/spring-web-5.3.39.jar . && \ + jar xvf spring-web-5.3.39.jar && \ + rm -f spring-web-5.3.39.jar && \ rm -rf org/springframework/remoting/httpinvoker && \ - jar cf /opt/lib/spring-web.jar * - -RUN wget -q -O /tmp/rdf4j.zip "https://rhlx01.hs-esslingen.de/pub/Mirrors/eclipse/rdf4j/eclipse-rdf4j-4.3.8-sdk.zip" && \ - unzip -d /tmp /tmp/rdf4j.zip eclipse-rdf4j-4.3.8/war/rdf4j-server.war eclipse-rdf4j-4.3.8/war/rdf4j-workbench.war && \ - unzip /tmp/eclipse-rdf4j-4.3.8/war/rdf4j-server.war -d /tmp/rdf4j-server && \ + jar cf /opt/lib/spring-web.jar * && \ + rm -rf * && \ + mv /opt/lib/spring-webmvc-5.3.39.jar . && \ + jar xvf spring-webmvc-5.3.39.jar && \ + rm -f spring-webmvc-5.3.39.jar && \ + jar cf /opt/lib/spring-webmvc.jar * + +RUN wget -q -O /tmp/rdf4j.zip "https://rhlx01.hs-esslingen.de/pub/Mirrors/eclipse/rdf4j/eclipse-rdf4j-4.3.14-sdk.zip" && \ + unzip -d /tmp /tmp/rdf4j.zip eclipse-rdf4j-4.3.14/war/rdf4j-server.war eclipse-rdf4j-4.3.14/war/rdf4j-workbench.war && \ + unzip /tmp/eclipse-rdf4j-4.3.14/war/rdf4j-server.war -d /tmp/rdf4j-server && \ # rm /tmp/rdf4j-server/WEB-INF/lib/guava-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/netty-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/http2-hpack-*.jar && \ @@ -57,6 +63,7 @@ RUN wget -q -O /tmp/rdf4j.zip "https://rhlx01.hs-esslingen.de/pub/Mirrors/eclips rm /tmp/rdf4j-server/WEB-INF/lib/jetty-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/spring-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/logback-*.jar && \ + rm /tmp/rdf4j-server/WEB-INF/lib/commons-io-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/snappy-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/zookeeper-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/solr-*.jar && \ diff --git a/upgrade_version.sh b/upgrade_version.sh index 83eadae7..4f2a0f6a 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.14.23-SNAPSHOT +OLD_VERSION=1.14.24-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C