diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31a2e7ea..d1011ad0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,7 +125,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Conforming id: meta-conf - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/conforming-agent @@ -137,12 +137,12 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.10.15-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.11.16-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 - name: Conforming Container Build and Push - uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 with: context: conforming/. file: conforming/src/main/docker/Dockerfile @@ -164,7 +164,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Remoting id: meta-remote - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/remoting-agent @@ -176,12 +176,12 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.10.15-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.11.16-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 - name: Remoting Container Build and Push - uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 with: context: remoting/. file: remoting/src/main/docker/Dockerfile @@ -203,7 +203,7 @@ jobs: # Create SemVer or ref tags dependent of trigger event - name: Docker Meta Provisioning id: meta-prov - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.1.5 with: images: | ${{ steps.set-docker-repo.outputs.REPO }}/provisioning-agent @@ -215,12 +215,12 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=1.10.15-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }} + type=raw,value=1.11.16-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 - name: Provisioning Container Build and Push - uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 with: context: provisioning/. file: provisioning/src/main/docker/Dockerfile diff --git a/DEPENDENCIES b/DEPENDENCIES index 88c4cd6a..f9073ced 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,11 +1,10 @@ maven/mavencentral/aopalliance/aopalliance/1.0, LicenseRef-Public-Domain, approved, CQ2918 -maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636 maven/mavencentral/ch.qos.logback/logback-classic/1.2.12, EPL-1.0, approved, CQ13636 -maven/mavencentral/ch.qos.logback/logback-classic/1.4.8, EPL-1.0 OR LGPL-2.1-only, approved, #3435 -maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635 +maven/mavencentral/ch.qos.logback/logback-classic/1.2.13, EPL-1.0, approved, CQ13636 +maven/mavencentral/ch.qos.logback/logback-classic/1.4.12, EPL-1.0 OR LGPL-2.1-only, approved, #3435 maven/mavencentral/ch.qos.logback/logback-core/1.2.12, EPL-1.0, approved, CQ13635 -maven/mavencentral/ch.qos.logback/logback-core/1.4.8, EPL-1.0 OR LGPL-2.1-only, approved, #3373 -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/ch.qos.logback/logback-core/1.2.13, EPL-1.0, approved, CQ13635 +maven/mavencentral/ch.qos.logback/logback-core/1.4.12, EPL-1.0 OR LGPL-2.1-only, approved, #3373 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.2, Apache-2.0, approved, #7947 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133 @@ -16,16 +15,13 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.2, Apache-2. maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2, Apache-2.0, approved, #9237 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.1, Apache-2.0, approved, #8802 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.13.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-joda/2.15.2, Apache-2.0, approved, #11369 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.1, Apache-2.0, approved, #7930 maven/mavencentral/com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.15.2, Apache-2.0, approved, #11061 maven/mavencentral/com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.15.2, Apache-2.0, approved, #9101 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.15.2, Apache-2.0, approved, #9100 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.1, Apache-2.0, approved, #7950 maven/mavencentral/com.github.jsonld-java/jsonld-java/0.13.4, BSD-3-Clause, approved, CQ22136 @@ -33,7 +29,7 @@ maven/mavencentral/com.github.jsqlparser/jsqlparser/4.4, LGPL-2.1 OR Apache-2.0, maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 -maven/mavencentral/com.google.guava/guava/32.0.1-jre, Apache-2.0 AND CC0-1.0 AND CC-PDDC, approved, #8772 +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/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 @@ -50,7 +46,7 @@ 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 maven/mavencentral/io.github.classgraph/classgraph/4.8.154, MIT, approved, CQ22530 maven/mavencentral/io.github.solf/nullanno/3.0.0, EPL-1.0, approved, #11625 -maven/mavencentral/io.micrometer/micrometer-core/1.9.12, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #7711 +maven/mavencentral/io.micrometer/micrometer-core/1.9.17, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #7711 maven/mavencentral/io.mikael/urlbuilder/2.0.9, Apache-2.0, approved, #9815 maven/mavencentral/io.netty/netty-buffer/4.1.94.Final, Apache-2.0, approved, CQ21842 maven/mavencentral/io.netty/netty-codec/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 @@ -67,23 +63,24 @@ 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.0, Apache-2.0 AND OGC-1.0, restricted, #11624 -maven/mavencentral/it.unibz.inf.ontop/ontop-obda-core/5.1.0, Apache-2.0, approved, #11623 -maven/mavencentral/it.unibz.inf.ontop/ontop-rdb/5.1.0, Apache-2.0, approved, #11626 +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/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.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca maven/mavencentral/jakarta.servlet/jakarta.servlet-api/4.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.servlet maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.validation maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/2.1.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb +maven/mavencentral/javax.activation/javax.activation-api/1.2.0, (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ18740 maven/mavencentral/javax.inject/javax.inject/1, Apache-2.0, approved, CQ3555 maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ7248 maven/mavencentral/javax.servlet/servlet-api/2.5, Apache-2.0, approved, CQ1961 maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302 -maven/mavencentral/javax.xml.bind/jaxb-api/2.3.0, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ16911 +maven/mavencentral/javax.xml.bind/jaxb-api/2.3.1, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ16911 maven/mavencentral/joda-time/joda-time/2.10.14, Apache-2.0, approved, clearlydefined -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.10.20, Apache-2.0, approved, clearlydefined -maven/mavencentral/net.bytebuddy/byte-buddy/1.10.20, , approved, CQ22491 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.19, Apache-2.0, approved, #1810 +maven/mavencentral/net.bytebuddy/byte-buddy/1.12.21, Apache-2.0 AND BSD-3-Clause, approved, #1811 maven/mavencentral/net.minidev/accessors-smart/2.4.7, Apache-2.0, approved, #7515 maven/mavencentral/net.minidev/json-smart/2.4.7, Apache-2.0, approved, #3288 maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined @@ -117,108 +114,105 @@ maven/mavencentral/org.apache.lucene/lucene-sandbox/8.9.0, Apache-2.0, approved, maven/mavencentral/org.apache.lucene/lucene-spatial-extras/8.9.0, Apache-2.0, approved, #6138 maven/mavencentral/org.apache.lucene/lucene-spatial3d/8.9.0, Apache-2.0, approved, #6140 maven/mavencentral/org.apache.solr/solr-solrj/8.9.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #6141 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.76, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.81, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.76, Apache-2.0, approved, CQ20193 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.81, Apache-2.0, approved, CQ20193 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.76, Apache-2.0, approved, CQ20194 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.81, Apache-2.0, approved, CQ20194 -maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.81, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.83, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.83, Apache-2.0, approved, CQ20193 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.83, Apache-2.0, approved, CQ20194 +maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.83, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.yetus/audience-annotations/0.12.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.zookeeper/zookeeper-jute/3.7.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.zookeeper/zookeeper/3.7.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.assertj/assertj-core/3.19.0, 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.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.50.v20221201, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.http2/http2-common/9.4.50.v20221201, EPL-2.0 OR Apache-2.0, approved, rt.jetty +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-common/9.4.52.v20230823, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.http2/http2-hpack/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.http2/http2-http-client-transport/9.4.50.v20221201, 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/jetty-alpn-client/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-alpn-java-client/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-client/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.rdf4j/rdf4j-client/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-mapdb/4.3.3, BSD-3-Clause, approved, technology.rdf4j +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.3, 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.3, 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.3, 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.3, 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.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-transaction/4.3.3, 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.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-common-xml/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-config/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-client/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-protocol/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-http-server-spring/4.3.3, 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.3, 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.3, 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.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-query/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-evaluation/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-geosparql/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryalgebra-model/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryparser-sparql/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryrender/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-binary/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-queryresultio-text/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-contextaware/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-dataset/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-event/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-http/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-manager/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sail/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-repository-sparql/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-binary/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-datatypes/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-jsonld/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-languages/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-n3/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-nquads/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-ntriples/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfjson/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-rdfxml/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trig/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-trix/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-rio-turtle/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-base/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-elasticsearch/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-inferencer/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lmdb/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene-api/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-lucene/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-memory/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-model/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-nativerdf/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sail-solr/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-shacl/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-sparqlbuilder/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-spin/4.3.3, BSD-3-Clause, approved, technology.rdf4j -maven/mavencentral/org.eclipse.rdf4j/rdf4j-storage/4.3.3, 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.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/jakarta.inject/2.6.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-api/2.6.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish @@ -239,29 +233,23 @@ maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydef maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192 maven/mavencentral/org.javabits.jgrapht/jgrapht-core/0.9.3, EPL-2.0 OR LGPL-2.1-or-later, approved, #9816 maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.0, EPL-2.0, approved, #3133 -maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.8.2, EPL-2.0, approved, #1292 -maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.0, EPL-2.0, approved, #3125 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.0, EPL-2.0, approved, #3134 -maven/mavencentral/org.junit.jupiter/junit-jupiter/5.8.2, EPL-2.0, approved, clearlydefined -maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.0, EPL-2.0, approved, #6972 -maven/mavencentral/org.junit.platform/junit-platform-commons/1.8.2, EPL-2.0, approved, #1288 -maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.0, EPL-2.0, approved, #3130 -maven/mavencentral/org.junit.platform/junit-platform-engine/1.8.2, EPL-2.0, approved, #1289 -maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.0, EPL-2.0, approved, #3128 +maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133 +maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.2, EPL-2.0, approved, #3125 +maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134 +maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.2, EPL-2.0, approved, #6972 +maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130 +maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.2, 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, BSD-2-Clause, approved, CQ17408 -maven/mavencentral/org.locationtech.jts/jts-core/1.18.1, 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.1, BSD-3-Clause, approved, #3055 -maven/mavencentral/org.lwjgl/lwjgl/3.3.1, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.mapdb/mapdb/1.0.8, Apache-2.0, approved, CQ8246 -maven/mavencentral/org.mockito/mockito-core/3.8.0, MIT, approved, clearlydefined -maven/mavencentral/org.mockito/mockito-junit-jupiter/3.8.0, MIT, approved, clearlydefined -maven/mavencentral/org.objenesis/objenesis/3.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.locationtech.jts/jts-core/1.18.2, BSD-3-Clause AND EPL-1.0, approved, #13160 +maven/mavencentral/org.locationtech.proj4j/proj4j/1.1.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.locationtech.spatial4j/spatial4j/0.8, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.lwjgl/lwjgl-lmdb/3.3.3, BSD-3-Clause, approved, #3055 +maven/mavencentral/org.lwjgl/lwjgl/3.3.3, BSD-3-Clause, approved, clearlydefined +maven/mavencentral/org.mapdb/mapdb/1.0.9, Apache-2.0, approved, CQ8246 +maven/mavencentral/org.mockito/mockito-core/4.11.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #6160 +maven/mavencentral/org.mockito/mockito-junit-jupiter/4.11.0, MIT, approved, clearlydefined +maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029 maven/mavencentral/org.postgresql/postgresql/42.6.0, BSD-2-Clause AND Apache-2.0, approved, #9159 @@ -275,29 +263,29 @@ maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-simple/2.0.7, MIT, approved, #10372 -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.13, Apache-2.0, approved, #3273 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/2.7.13, Apache-2.0, approved, #4316 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.13, Apache-2.0, approved, #4314 -maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/2.7.13, Apache-2.0, approved, #4318 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.13, Apache-2.0, approved, #4307 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.13, Apache-2.0, approved, #4327 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.13, Apache-2.0, approved, #4320 -maven/mavencentral/org.springframework.boot/spring-boot-starter-thymeleaf/2.7.13, Apache-2.0, approved, #4350 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.13, Apache-2.0, approved, #4305 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.13, Apache-2.0, approved, #4304 -maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.13, Apache-2.0, approved, #4308 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.13, Apache-2.0, approved, #4313 -maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.13, Apache-2.0, approved, #4323 -maven/mavencentral/org.springframework.boot/spring-boot/2.7.13, Apache-2.0, approved, #4322 -maven/mavencentral/org.springframework/spring-aop/5.3.28, Apache-2.0, approved, CQ23152 -maven/mavencentral/org.springframework/spring-beans/5.3.28, Apache-2.0, approved, CQ23153 -maven/mavencentral/org.springframework/spring-context/5.3.28, Apache-2.0, approved, CQ23051 -maven/mavencentral/org.springframework/spring-core/5.3.28, Apache-2.0 AND BSD-3-Clause, approved, CQ23154 -maven/mavencentral/org.springframework/spring-expression/5.3.28, Apache-2.0, approved, CQ23155 -maven/mavencentral/org.springframework/spring-jcl/5.3.28, Apache-2.0, approved, CQ23156 -maven/mavencentral/org.springframework/spring-test/5.3.28, Apache-2.0, approved, CQ23054 -maven/mavencentral/org.springframework/spring-web/5.3.28, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157 -maven/mavencentral/org.springframework/spring-webmvc/5.3.28, Apache-2.0, approved, CQ23158 +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.18, Apache-2.0, approved, #3273 +maven/mavencentral/org.springframework.boot/spring-boot-actuator/2.7.18, Apache-2.0, approved, #4316 +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.18, Apache-2.0, approved, #4314 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/2.7.18, Apache-2.0, approved, #4318 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.18, Apache-2.0, approved, #4307 +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.18, Apache-2.0, approved, #4327 +maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.18, Apache-2.0, approved, #4320 +maven/mavencentral/org.springframework.boot/spring-boot-starter-thymeleaf/2.7.18, Apache-2.0, approved, #4350 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.18, Apache-2.0, approved, #4305 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.18, Apache-2.0, approved, #4304 +maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.18, Apache-2.0, approved, #4308 +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-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.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/charts/conforming-agent/Chart.yaml b/charts/conforming-agent/Chart.yaml index f4958433..ad4ed319 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.10.15-SNAPSHOT" -version: 1.10.15-SNAPSHOT +appVersion: "1.11.16-SNAPSHOT" +version: 1.11.16-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/conforming-agent/README.md b/charts/conforming-agent/README.md index 5cd28dd8..5c7abd1a 100644 --- a/charts/conforming-agent/README.md +++ b/charts/conforming-agent/README.md @@ -20,7 +20,7 @@ # conforming-agent -![Version: 1.10.15-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.15-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square) +![Version: 1.11.16-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.16-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--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.10.15-SNAPSHOT +$ helm install my-release eclipse-tractusx/conforming-agent --version 1.11.16-SNAPSHOT ``` ## Maintainers diff --git a/charts/conforming-agent/values.yaml b/charts/conforming-agent/values.yaml index afaa8d2e..2cb904f2 100644 --- a/charts/conforming-agent/values.yaml +++ b/charts/conforming-agent/values.yaml @@ -102,9 +102,11 @@ securityContext: # -- Requires the container to run without root privileges runAsNonRoot: true # -- The container's process will run with the specified uid - runAsUser: 10100 + runAsUser: 10001 # -- Processes within a pod will belong to this guid runAsGroup: 30000 + # -- The owner for volumes and any files created within volumes will belong to this guid + fsGroup: 30000 livenessProbe: # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) diff --git a/charts/provisioning-agent/Chart.yaml b/charts/provisioning-agent/Chart.yaml index 76c113fb..e40efc1b 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.10.15-SNAPSHOT" -version: 1.10.15-SNAPSHOT +appVersion: "1.11.16-SNAPSHOT" +version: 1.11.16-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/provisioning-agent/README.md b/charts/provisioning-agent/README.md index ead71be3..e8a791a4 100644 --- a/charts/provisioning-agent/README.md +++ b/charts/provisioning-agent/README.md @@ -20,7 +20,7 @@ # provisioning-agent -![Version: 1.10.15-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.15-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square) +![Version: 1.11.16-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.16-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--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.10.15-SNAPSHOT +$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.11.16-SNAPSHOT ``` ## Maintainers diff --git a/charts/provisioning-agent/values.yaml b/charts/provisioning-agent/values.yaml index fe771736..db7524f5 100644 --- a/charts/provisioning-agent/values.yaml +++ b/charts/provisioning-agent/values.yaml @@ -80,11 +80,11 @@ podSecurityContext: # -- Restrict a Container's Syscalls with seccomp type: RuntimeDefault # -- Runs all processes within a pod with a special uid - runAsUser: 999 + runAsUser: 10001 # -- Processes within a pod will belong to this guid - runAsGroup: 999 + runAsGroup: 30000 # -- The owner for volumes and any files created within volumes will belong to this guid - fsGroup: 999 + fsGroup: 30000 # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod securityContext: diff --git a/charts/remoting-agent/Chart.yaml b/charts/remoting-agent/Chart.yaml index ff4dd0f4..dffc4f65 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.10.15-SNAPSHOT" -version: 1.10.15-SNAPSHOT +appVersion: "1.11.16-SNAPSHOT" +version: 1.11.16-SNAPSHOT maintainers: - name: 'Tractus-X Knowledge Agents Team' diff --git a/charts/remoting-agent/README.md b/charts/remoting-agent/README.md index 3d13edfa..09d2ce14 100644 --- a/charts/remoting-agent/README.md +++ b/charts/remoting-agent/README.md @@ -19,7 +19,7 @@ --> # remoting-agent -![Version: 1.10.15-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.15-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--SNAPSHOT-informational?style=flat-square) +![Version: 1.11.16-SNAPSHOT](https://img.shields.io/badge/Version-1.10.2--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.16-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.10.2--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.10.15-SNAPSHOT +$ helm install my-release eclipse-tractusx/remoting-agent --version 1.11.16-SNAPSHOT ``` ## Maintainers diff --git a/charts/remoting-agent/templates/deployment.yaml b/charts/remoting-agent/templates/deployment.yaml index 26323483..b0ab7f04 100644 --- a/charts/remoting-agent/templates/deployment.yaml +++ b/charts/remoting-agent/templates/deployment.yaml @@ -101,16 +101,16 @@ spec: subPath: logback.xml readOnly: true - name: logs - mountPath: /usr/local/tomcat/logs + mountPath: /opt/tomcat/logs readOnly: false - name: work - mountPath: /usr/local/tomcat/work/Catalina/localhost + mountPath: /opt/tomcat/work/Catalina/localhost readOnly: false - name: conf - mountPath: /usr/local/tomcat/conf/Catalina/localhost + mountPath: /opt/tomcat/conf/Catalina/localhost readOnly: false - name: tmp - mountPath: /usr/local/tomcat/temp + mountPath: /opt/tomcat/temp readOnly: false - name: rdf4jlogs mountPath: /var/rdf4j/server/logs diff --git a/conforming/README.md b/conforming/README.md index e82a9129..991a3792 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.10.15-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. -- a [standalone jar](target/conforming-agent-1.10.15-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). +- a [plugin jar](target/original-conforming-agent-1.11.16-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. +- a [standalone jar](target/conforming-agent-1.11.16-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). ### Run Locally -The [standalone jar](target/conforming-agent-1.10.15-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/conforming-agent-1.11.16-SNAPSHOT.jar) may be started as follows ```console -java -cp target/conforming-agent-1.10.15-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" +java -cp target/conforming-agent-1.11.16-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.10.15-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/conforming-agent:1.11.16-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.10.15-SNAPSHOT + tractusx/conforming-agent:1.11.16-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:17-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:21-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.10.15-SNAPSHOT + version: 1.11.16-SNAPSHOT alias: my-conforming-agent ``` diff --git a/conforming/pom.xml b/conforming/pom.xml index b35e1f93..41f10da1 100644 --- a/conforming/pom.xml +++ b/conforming/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.10.15-SNAPSHOT + 1.11.16-SNAPSHOT ../pom.xml @@ -53,7 +53,7 @@ 2.2.12 2.40 4.13.1 - 1.4.8 + 1.4.12 2.5 2.0.1.Final diff --git a/conforming/src/main/docker/Dockerfile b/conforming/src/main/docker/Dockerfile index a0386c7c..92dc83e4 100644 --- a/conforming/src/main/docker/Dockerfile +++ b/conforming/src/main/docker/Dockerfile @@ -15,12 +15,12 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM eclipse-temurin:17-jre-alpine +FROM eclipse-temurin:21-jre-alpine ARG JAR ARG LIB ARG APP_USER=agent -ARG APP_UID=10100 +ARG APP_UID=10001 ARG APP_GID=30000 RUN addgroup --gid "$APP_GID" --system "$APP_USER" diff --git a/pom.xml b/pom.xml index 11a444e5..7d12cb38 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.eclipse.tractusx agents - 1.10.15-SNAPSHOT + 1.11.16-SNAPSHOT pom Tractus-X Knowledge Agents Reference Implementations Provides Reference Implementations and Artifacts to Realize Semantic Dataspace Backends @@ -37,26 +37,27 @@ 11 false - 5.9.0 + 5.9.2 4.6.1 3.2.4 4.9.3 - 4.3.3 + 4.3.8 2.0.7 4.5.14 1.2 + 1.2.13 2.15.2 2.15.2 2.13.5 - 2.3.0 - 5.1.0 + 2.3.1 + 5.1.2 UTF-8 3.1.0 - 5.3.28 - 2.7.13 - 32.0.1-jre - 9.0.81 + 5.3.31 + 2.7.18 + 32.1.2-jre + 9.0.83 4.1.94.Final 9.4.53.v20231009 2.0 @@ -99,7 +100,7 @@ org.eclipse.dash license-tool-plugin - 1.0.3-SNAPSHOT + 1.1.1-SNAPSHOT automotive.tractusx DEPENDENCIES @@ -117,7 +118,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.2.5 !online @@ -202,7 +203,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.37.0 + 2.42.0 format @@ -219,9 +220,9 @@ maven-checkstyle-plugin 3.3.0 - ${session.executionRootDirectory}/resources/tx-checkstyle-config.xml + ${project.basedir}/../resources/tx-checkstyle-config.xml - config_loc=${session.executionRootDirectory}/resources + config_loc=${project.basedir}/../resources true true diff --git a/provisioning/README.md b/provisioning/README.md index 6259cdaf..3aead2dd 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.10.15-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) +- a [pluging jar](target/provisioning-agent-1.11.16-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.10.15-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/provisioning-agent:1.11.16-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.10.15-SNAPSHOT + tractusx/provisioning-agent:1.11.16-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.10.15-SNAPSHOT + tractusx/provisioning-agent:1.11.16-SNAPSHOT ```` Accessing entities spanning two schemas using the first role/endpoint delivers a greater count @@ -278,10 +278,10 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [ontop/ontop:5.0.2](https://github.com/ontop/ontop/tree/version5/client/docker) -- Official Ontop DockerHub page: https://hub.docker.com/u/ontop -- Ontop Project: https://ontop-vkg.org -- Additional information about the Ontop image: https://hub.docker.com/r/ontop/ontop +- [eclipse-temurin:11-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 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). @@ -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.10.15-SNAPSHOT + version: 1.11.16-SNAPSHOT alias: my-provider-agent ``` diff --git a/provisioning/pom.xml b/provisioning/pom.xml index ce447144..3d66d7b1 100644 --- a/provisioning/pom.xml +++ b/provisioning/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.10.15-SNAPSHOT + 1.11.16-SNAPSHOT ../pom.xml diff --git a/provisioning/src/main/docker/Dockerfile b/provisioning/src/main/docker/Dockerfile index 6fbd55c7..262d2d83 100644 --- a/provisioning/src/main/docker/Dockerfile +++ b/provisioning/src/main/docker/Dockerfile @@ -15,11 +15,23 @@ # # SPDX-License-Identifier: Apache-2.0 +## +# Blueprint Container: Prebuilt distribution of ontop which we will repackage +## + +FROM ontop/ontop:5.1.2 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) ## -FROM openjdk:22-jdk-slim AS build +FROM eclipse-temurin:11-jdk AS build + +# run with docker --build-arg jdbcDrivers=path_to_my_driver to establish a different driver +ARG jdbcDrivers="https://repo1.maven.org/maven2/com/h2database/h2/2.2.220/h2-2.2.220.jar https://download.dremio.com/jdbc-driver/dremio-jdbc-driver-LATEST.jar https://repo1.maven.org/maven2/org/apache/calcite/avatica/avatica/1.22.0/avatica-1.22.0.jar" + +# run with docker --build-arg HTTP_PROXY=path_to_my_driver if building behind corporate firewall +ARG HTTP_PROXY="" COPY target/provisioning-agent-*.jar /opt/ontop/lib/ COPY target/lib/guava-*.jar /opt/ontop/lib/ @@ -29,63 +41,78 @@ COPY target/lib/postgresql-*.jar /opt/ontop/jdbc/ WORKDIR /tmp -RUN mv /opt/ontop/lib/spring-web-5.3.28.jar . && \ - jar xvf spring-web-5.3.28.jar && \ - rm -f spring-web-5.3.28.jar && \ +RUN if [ "${HTTP_PROXY}" != "" ]; then \ + echo "Acquire::http::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ + 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 && \ rm -rf org/springframework/remoting/httpinvoker && \ jar cf /opt/ontop/lib/spring-web.jar * -FROM ontop/ontop:5.1.0 +## +# Target Container: Use a valid base image +## -# Switch to root -USER root +FROM eclipse-temurin:11-jre-alpine -# In case you need a debuggable image, please uncomment -#RUN rm -rf /opt/java/openjdk && apt-get -y upgrade && apt-get -y update && apt-get -y install openjdk-11-jdk +ARG APP_USER=ontop +ARG APP_UID=10001 +ARG APP_GID=30000 -COPY resources/entrypoint.sh /opt/ontop/. +RUN addgroup --gid "$APP_GID" --system "$APP_USER" -# run with docker --build-arg jdbcDrivers=path_to_my_driver to establish a different driver -ARG jdbcDrivers="https://repo1.maven.org/maven2/com/h2database/h2/2.2.220/h2-2.2.220.jar https://download.dremio.com/jdbc-driver/dremio-jdbc-driver-LATEST.jar https://repo1.maven.org/maven2/org/apache/calcite/avatica/avatica/1.22.0/avatica-1.22.0.jar" +RUN adduser \ + --shell /sbin/nologin \ + --disabled-password \ + --gecos "" \ + --ingroup "$APP_USER" \ + --no-create-home \ + --uid "$APP_UID" \ + "$APP_USER" -# set proxy if building behind corporate firewall -ARG HTTP_PROXY="" +COPY --from=blueprint /opt/ontop /opt/ontop +COPY resources/entrypoint.sh /opt/ontop/. # unfortunately, ontop does not use explicit group ids and user ids (which are needed by tractusx chart security contraints), so we need to relax executable rights -RUN if [ "${HTTP_PROXY}" != "" ]; then \ - echo "Acquire::http::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ - echo "Acquire::https::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ - fi && \ - rm /opt/ontop/lib/guava-*.jar && \ +RUN rm /opt/ontop/lib/guava-*.jar && \ rm /opt/ontop/lib/tomcat-embed-*.jar && \ rm /opt/ontop/lib/spring-*.jar && \ - mkdir -p /opt/ontop/jdbc && \ - for jdbcDriver in "$jdbcDrivers"; do wget --no-check-certificate -q -P /opt/ontop/jdbc ${jdbcDriver} ; done && \ - if [ "${HTTP_PROXY}" != "" ]; then rm -f /etc/apt/apt.conf.d/proxy.conf; fi && \ mkdir -p /opt/ontop/input && \ mkdir -p /opt/ontop/database && \ + mkdir -p /opt/ontop/data && \ chmod 755 /opt/ontop/entrypoint.sh && \ chown -R ontop:ontop /opt/ontop +# switch to the user +USER "$APP_USER" + +## copy over patched stuff COPY --from=build /opt/ontop/lib/*.jar /opt/ontop/lib/ COPY --from=build /opt/ontop/jdbc/*.jar /opt/ontop/jdbc/ -# Switch back -USER ontop - # run with docker --build-arg sqlFiles=initial_sql to establish a different sql file ARG sqlFiles=resources/dtc.sql -COPY ${sqlFiles} ./data/ +COPY ${sqlFiles} /opt/ontop/data/. # Additional Java debugging options ARG JAVA_TOOL_OPTIONS "" # ontop uses this as the default port, we need multiple ports if exposing multiple endpoints -EXPOSE 8080 +EXPOSE 8080 8686 + +# temporary files may be written and should go to that mounted volume +VOLUME /tmp + +# Original healthcheck only worked with one endpoint +HEALTHCHECK NONE # These are the environment variables pointing to the various settings # To disable a setting simply leave it empty # To enable different settings for multiple endpoints simply separate the options with a space +ENV PATH="${JAVA_HOME}/bin:/opt/ontop:${PATH}" ENV ONTOP_PORT=8080 ENV ONTOP_ONTOLOGY_FILE=/opt/ontop/input/ontology.ttl ENV ONTOP_MAPPING_FILE=/opt/ontop/input/mapping.obda @@ -94,10 +121,9 @@ ENV ONTOP_PORTAL_FILE="" ENV ONTOP_CORS_ALLOWED_ORIGINS="*" ENV ONTOP_DEV_MODE=true -# Original healthcheck only worked with one endpoint -HEALTHCHECK NONE +# The user/entry home +WORKDIR /opt/ontop # Run Ontop Agents ENTRYPOINT ["./entrypoint.sh"] - \ No newline at end of file diff --git a/remoting/README.md b/remoting/README.md index 39abeb27..7f8660a5 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.10.15-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. -- a [pluging jar](target/original-remoting-agent-1.10.15-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. +- a [standalone jar](target/remoting-agent-1.11.16-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. +- a [pluging jar](target/original-remoting-agent-1.11.16-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. ### Run Locally -The standalone jar](target/remoting-agent-1.10.15-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source +The standalone jar](target/remoting-agent-1.11.16-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source ```console -java -jar target/remoting-agent-1.10.15-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG +java -jar target/remoting-agent-1.11.16-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.10.15-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/remoting-agent:1.11.16-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.10.15-SNAPSHOT + tractusx/remoting-agent:1.11.16-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8081/) via @@ -205,10 +205,10 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [tomcat:9-jre11-temurin](https://github.com/docker-library/tomcat/tree/master/9.0/jre11/temurin-jammy) -- Official Tomcat Dockerhub page: https://hub.docker.com/_/tomcat -- Apache Tomcat Project: https://tomcat.apache.org/ -- Additional information about the Tomcat image: https://github.com/docker-library/repo-info/tree/master/repos/tomcat +- [eclipse-temurin:21-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 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). @@ -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.10.15-SNAPSHOT + version: 1.11.16-SNAPSHOT alias: my-remoting-agent ``` diff --git a/remoting/pom.xml b/remoting/pom.xml index 11d5002c..f7853ef2 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -26,7 +26,7 @@ org.eclipse.tractusx agents - 1.10.15-SNAPSHOT + 1.11.16-SNAPSHOT ../pom.xml @@ -77,6 +77,18 @@ ${commons.logging.version} + + ch.qos.logback + logback-classic + ${logback.version} + + + + ch.qos.logback + logback-core + ${logback.version} + + org.slf4j slf4j-simple @@ -138,11 +150,11 @@ compile - + org.springframework.boot diff --git a/remoting/resources/web/startup.sh b/remoting/resources/web/startup.sh new file mode 100755 index 00000000..5459fff0 --- /dev/null +++ b/remoting/resources/web/startup.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# Copyright (c) 2022,2023 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 + +# start the tomcat +$CATALINA_HOME/bin/catalina.sh run \ No newline at end of file diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile index b5a5de80..2ceb5443 100644 --- a/remoting/src/main/docker/Dockerfile +++ b/remoting/src/main/docker/Dockerfile @@ -19,14 +19,15 @@ # 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 openjdk:22-jdk-slim AS build +FROM eclipse-temurin:21-jdk-alpine AS build COPY target/original-remoting-agent-*.jar /opt/lib/ -COPY target/lib/guava-*.jar /opt/lib/ +#COPY target/lib/guava-*.jar /opt/lib/ COPY target/lib/netty-*.jar /opt/lib/ COPY target/lib/http2-hpack-*.jar /opt/lib/ COPY target/lib/jetty-*.jar /opt/lib/ 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/snappy-java-*.jar /opt/lib/ @@ -39,17 +40,75 @@ COPY resources/web/tomcat-users.xml /opt/conf/ WORKDIR /tmp -RUN mv /opt/lib/spring-web-5.3.28.jar . && \ - jar xvf spring-web-5.3.28.jar && \ - rm -f spring-web-5.3.28.jar && \ +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 && \ 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 && \ +# 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 && \ + 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/snappy-*.jar && \ + rm /tmp/rdf4j-server/WEB-INF/lib/zookeeper-*.jar && \ + cp /opt/lib/*.jar /tmp/rdf4j-server/WEB-INF/lib/ + +COPY resources/web/rdf4j.xml /tmp/rdf4j-server/WEB-INF/web.xml +COPY resources/web/callback.xml /tmp/rdf4j-server/WEB-INF/callback.xml + ## -# Runtime Container: Currently based on Tomcat 9 (and the "old" Java Servlet API until RDF4J upgrades) +# Target Container: Use a valid base image ## -FROM tomcat:9-jre11-temurin +FROM eclipse-temurin:21-jre-alpine + +ARG APP_USER=tomcat +ARG APP_UID=10001 +ARG APP_GID=30000 + +RUN addgroup --gid "$APP_GID" --system "$APP_USER" + +RUN adduser \ + --shell /sbin/nologin \ + --disabled-password \ + --gecos "" \ + --ingroup "$APP_USER" \ + --no-create-home \ + --uid "$APP_UID" \ + "$APP_USER" + +# Environment variables +ENV TOMCAT_MAJOR=9 \ + TOMCAT_VERSION=9.0.83 \ + CATALINA_HOME=/opt/tomcat + +RUN mkdir -p /opt + +# install tomcat +RUN wget -q -O /tmp/apache-tomcat.tar.gz https://archive.apache.org/dist/tomcat/tomcat-${TOMCAT_MAJOR}/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz && \ + gunzip /tmp/apache-tomcat.tar.gz && \ + tar -C /opt -xf /tmp/apache-tomcat.tar && \ + ln -s /opt/apache-tomcat-$TOMCAT_VERSION $CATALINA_HOME && \ + rm -rf /tmp/* /var/cache/apk/* /opt/apache-tomcat-$TOMCAT_VERSION/webapps/* && \ + rm $CATALINA_HOME/conf/logging.properties && \ + rm $CATALINA_HOME/conf/server.xml && \ + rm $CATALINA_HOME/conf/tomcat-users.xml && \ + rm $CATALINA_HOME/conf/web.xml && \ + mkdir -p /var/rdf4j/server/conf && \ + mkdir -p /var/rdf4j/server/repositories && \ + mkdir -p /opt/tomcat/webapps/rdf4j-server && \ + chown -R tomcat:tomcat /var/rdf4j /opt/apache-tomcat-$TOMCAT_VERSION && \ + chmod 775 /opt/apache-tomcat-$TOMCAT_VERSION $CATALINA_HOME/bin $CATALINA_HOME/bin/catalina.sh /var/rdf4j/server + +EXPOSE 8080 + +WORKDIR $CATALINA_HOME ENV JAVA_OPTS="-Xmx2g" ENV CATALINA_OPTS="-Dorg.eclipse.rdf4j.appdata.basedir=/var/rdf4j" @@ -59,49 +118,12 @@ ARG JAVA_TOOL_OPTIONS "" # TODO Should have a healthcheck HEALTHCHECK NONE -ARG HTTP_PROXY="" -RUN if [ "${HTTP_PROXY}" != "" ]; then \ - echo "Acquire::http::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ - echo "Acquire::https::Proxy \"${HTTP_PROXY}\"" >> /etc/apt/apt.conf.d/proxy.conf; \ - fi && \ - apt-get -y upgrade && \ - apt-get -y update && \ - apt-get -y --no-install-recommends install unzip=6.0-26ubuntu3.1 && \ - addgroup --system --gid 30000 tomcat && \ - adduser --disabled-password --gecos "" --ingroup tomcat --uid 10001 tomcat && \ - rm -rf /usr/local/tomcat/webapps/* && \ - wget -q -O /tmp/rdf4j.zip "https://rhlx01.hs-esslingen.de/pub/Mirrors/eclipse/rdf4j/eclipse-rdf4j-4.3.2-sdk.zip" && \ - if [ "${HTTP_PROXY}" != "" ]; then rm -f /etc/apt/apt.conf.d/proxy.conf; fi && \ - unzip -d /tmp /tmp/rdf4j.zip eclipse-rdf4j-4.3.2/war/rdf4j-server.war eclipse-rdf4j-4.3.2/war/rdf4j-workbench.war && \ - rm /tmp/rdf4j.zip - -RUN mkdir -p /var/rdf4j/server/conf && \ - mkdir -p /var/rdf4j/server/repositories && \ - unzip /tmp/eclipse-rdf4j-4.3.2/war/rdf4j-server.war -d /usr/local/tomcat/webapps/rdf4j-server && \ - rm -rf /tmp/eclipse-rdf4j-4.3.2 && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/guava-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/netty-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/http2-hpack-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/jetty-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/spring-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/snappy-*.jar && \ - rm /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/zookeeper-*.jar && \ - rm /usr/local/tomcat/conf/logging.properties && \ - rm /usr/local/tomcat/conf/server.xml && \ - rm /usr/local/tomcat/conf/tomcat-users.xml && \ - rm /usr/local/tomcat/conf/web.xml && \ - chown -R tomcat:tomcat /var/rdf4j /usr/local/tomcat && \ - apt-get -y --auto-remove remove unzip && \ - chmod 775 /usr/local/tomcat /usr/local/tomcat/bin /usr/local/tomcat/bin/catalina.sh /var/rdf4j/server - -COPY --from=build /opt/lib/*.jar /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/lib/ -COPY --from=build /opt/conf/*.xml /opt/conf/*.properties /usr/local/tomcat/conf/ -COPY resources/web/rdf4j.xml /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/web.xml -COPY resources/web/callback.xml /usr/local/tomcat/webapps/rdf4j-server/WEB-INF/callback.xml - USER tomcat -WORKDIR /usr/local/tomcat/ +COPY --from=build /opt/conf/*.xml /opt/conf/*.properties /opt/tomcat/conf/ +COPY --from=build /tmp/rdf4j-server/ /opt/tomcat/webapps/rdf4j-server/ +COPY resources/web/startup.sh /opt/tomcat/bin/startup.sh + +ENTRYPOINT [ "/opt/tomcat/bin/startup.sh" ] -EXPOSE 8081 diff --git a/remoting/src/test/resources/config.ttl b/remoting/src/test/resources/config.ttl index 633f7aab..3005a7a5 100644 --- a/remoting/src/test/resources/config.ttl +++ b/remoting/src/test/resources/config.ttl @@ -80,10 +80,10 @@ cx-prognosis:Prognosis rdf:type cx-fx:Function; dcterms:title "Prognosis" ; cx-fx:targetUri "https://api.agify.io"; cx-fx:input cx-prognosis:name; - cx-fx:output cx-prognosis:prediction; cx-fx:result cx-prognosis:hasResult. cx-prognosis:hasResult rdf:type cx-fx:Result; + cx-fx:output cx-prognosis:prediction; cx-fx:output cx-prognosis:support. cx-prognosis:name rdf:type cx-fx:Argument; diff --git a/upgrade_version.sh b/upgrade_version.sh index 806b2e8b..e9de2ffa 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.10.15-SNAPSHOT +OLD_VERSION=1.11.16-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C