diff --git a/.changeset/loud-planets-end.md b/.changeset/loud-planets-end.md new file mode 100644 index 0000000..cad97c5 --- /dev/null +++ b/.changeset/loud-planets-end.md @@ -0,0 +1,5 @@ +--- +"fuseki-geosparql": minor +--- + +Upgrade Apache Jena to 4.10.0 diff --git a/.changeset/soft-geese-run.md b/.changeset/soft-geese-run.md new file mode 100644 index 0000000..5dd8e2a --- /dev/null +++ b/.changeset/soft-geese-run.md @@ -0,0 +1,9 @@ +--- +"fuseki-geosparql": patch +--- + +Upgrade various components in the Docker image: + +- Alpine to 3.18.4 +- Maven to 3.9.5 (only at `builder` stage) +- OpenTelemetry Java instrumentation to 1.31.0 diff --git a/Dockerfile b/Dockerfile index 5fc1dda..7d3ee2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # manage tools versions -ARG ALPINE_VERSION="3.18.2" -ARG JENA_VERSION="4.9.0" -ARG OTEL_VERSION="1.25.1" -ARG MAVEN_VERSION="3.8.7" +ARG ALPINE_VERSION="3.18.4" +ARG JENA_VERSION="4.10.0" +ARG OTEL_VERSION="1.31.0" +ARG MAVEN_VERSION="3.9.5" # configure some paths, names and args ARG FUSEKI_HOME="/opt/fuseki" @@ -15,7 +15,7 @@ ARG JDEPS_EXTRA="jdk.crypto.cryptoki,jdk.crypto.ec,jdk.httpserver" ########################################################### # Build Fuseki from sources and include GeoSPARQL support # ########################################################### -FROM --platform=${BUILDPLATFORM} "docker.io/library/maven:${MAVEN_VERSION}-openjdk-18-slim" AS builder +FROM --platform=${BUILDPLATFORM} "docker.io/library/maven:${MAVEN_VERSION}-eclipse-temurin-17" AS builder ARG JENA_VERSION ARG OTEL_VERSION ARG FUSEKI_HOME diff --git a/patches/enable-geosparql.diff b/patches/enable-geosparql.diff index 112c4e5..8913b98 100644 --- a/patches/enable-geosparql.diff +++ b/patches/enable-geosparql.diff @@ -9,7 +9,7 @@ index 84c9e28..7e4bc29 100644 + + org.apache.jena + jena-geosparql -+ 4.9.0 ++ 4.10.0 + +