From 34983246a61b4d5fbb51766b26b11f101e0daae2 Mon Sep 17 00:00:00 2001 From: "Dr. Christoph \"Schorsch\" Jung" Date: Fri, 4 Oct 2024 15:30:10 +0200 Subject: [PATCH] fix|chore: upgrade deps. --- DEPENDENCIES | 132 ++++++++++++------------ NOTICE.md | 4 +- charts/conforming-agent/values.yaml | 4 +- charts/matchmaking-agent/values.yaml | 4 +- charts/provisioning-agent/values.yaml | 8 +- charts/remoting-agent/values.yaml | 6 +- conforming/pom.xml | 5 + pom.xml | 16 +-- provisioning/pom.xml | 39 +++++++ provisioning/src/main/docker/Dockerfile | 17 ++- remoting/pom.xml | 41 ++++++++ remoting/src/main/docker/Dockerfile | 23 +++-- 12 files changed, 200 insertions(+), 99 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index f6598f07..96c5150d 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -187,81 +187,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-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.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-annotation/4.3.14, 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-exception/4.3.14, 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-io/4.3.14, 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-iterator/4.3.14, 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-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.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-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.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-api/4.3.14, 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-vocabulary/4.3.14, 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-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 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/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/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/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/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/pom.xml b/conforming/pom.xml index 53e42d9a..226c0266 100644 --- a/conforming/pom.xml +++ b/conforming/pom.xml @@ -157,6 +157,11 @@ guava ${guava.version} + + commons-io + commons-io + ${commons.io.version} + diff --git a/pom.xml b/pom.xml index 6884e692..3eacd8bf 100644 --- a/pom.xml +++ b/pom.xml @@ -33,17 +33,18 @@ - 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,10 +52,10 @@ 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 33.3.0-jre 9.0.83 @@ -62,7 +63,7 @@ 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/pom.xml b/provisioning/pom.xml index 8ae8e388..bed6df88 100644 --- a/provisioning/pom.xml +++ b/provisioning/pom.xml @@ -61,6 +61,11 @@ guava ${guava.version} + + commons-io + commons-io + ${commons.io.version} + org.junit.jupiter junit-jupiter-engine @@ -99,8 +104,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/pom.xml b/remoting/pom.xml index 0c937da2..c5d41ae3 100644 --- a/remoting/pom.xml +++ b/remoting/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 && \