diff --git a/.github/actions/thread-dump-post/action.yml b/.github/actions/thread-dump-post/action.yml
new file mode 100644
index 00000000000..34e19d3bcd6
--- /dev/null
+++ b/.github/actions/thread-dump-post/action.yml
@@ -0,0 +1,7 @@
+name: Thread dump on cancellation
+description: Capture JVM thread dumps after a job is cancelled.
+runs:
+  using: node20
+  main: main.js
+  post: post.js
+  post-if: cancelled()
diff --git a/.github/actions/thread-dump-post/main.js b/.github/actions/thread-dump-post/main.js
new file mode 100644
index 00000000000..56803b99e65
--- /dev/null
+++ b/.github/actions/thread-dump-post/main.js
@@ -0,0 +1 @@
+console.log("Thread dump post-step registered.");
diff --git a/.github/actions/thread-dump-post/post.js b/.github/actions/thread-dump-post/post.js
new file mode 100644
index 00000000000..b9825ce087f
--- /dev/null
+++ b/.github/actions/thread-dump-post/post.js
@@ -0,0 +1,40 @@
+const { execSync } = require("child_process");
+
+function run(command) {
+  execSync(command, { stdio: "inherit", shell: "/bin/bash" });
+}
+
+function dumpThreads() {
+  run('echo "== Cancellation detected: capturing JVM thread dumps =="');
+  run(
+    [
+      "set -euo pipefail",
+      "pids=$(pgrep -f '[j]ava' || true)",
+      'if [[ -z "${pids}" ]]; then echo "No Java processes found."; exit 0; fi',
+      "if command -v jcmd >/dev/null 2>&1; then",
+      "  for pid in ${pids}; do",
+      '    echo "-- jcmd Thread.print for PID ${pid} --"',
+      "    jcmd \"${pid}\" Thread.print || true",
+      "  done",
+      "  exit 0",
+      "fi",
+      "if command -v jstack >/dev/null 2>&1; then",
+      "  for pid in ${pids}; do",
+      '    echo "-- jstack for PID ${pid} --"',
+      "    jstack \"${pid}\" || true",
+      "  done",
+      "  exit 0",
+      "fi",
+      "for pid in ${pids}; do",
+      '  echo "-- kill -QUIT ${pid} (no jcmd/jstack available) --"',
+      "  kill -QUIT \"${pid}\" || true",
+      "done",
+    ].join("\n")
+  );
+}
+
+try {
+  dumpThreads();
+} catch (error) {
+  console.error("Thread dump post-step failed:", error);
+}
diff --git a/.github/workflows/develop-status.yml b/.github/workflows/develop-status.yml
index 4c711a31f90..4192f9e67d2 100644
--- a/.github/workflows/develop-status.yml
+++ b/.github/workflows/develop-status.yml
@@ -15,6 +15,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: Register JVM thread dump on cancel
+      uses: ./.github/actions/thread-dump-post
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
@@ -29,7 +31,7 @@ jobs:
     - name: Build
       run: mvn -B -U clean install -Pquick,\!formatting
     - name: Verify
-      run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
+      run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
     - name: Publish Test Report
       if: failure()
       uses: scacap/action-surefire-report@v1
diff --git a/.github/workflows/main-status.yml b/.github/workflows/main-status.yml
index 04c2a1d146c..6053c54ac2f 100644
--- a/.github/workflows/main-status.yml
+++ b/.github/workflows/main-status.yml
@@ -15,6 +15,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: Register JVM thread dump on cancel
+      uses: ./.github/actions/thread-dump-post
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
@@ -29,7 +31,7 @@ jobs:
     - name: Build
       run: mvn -B -U -T 2C clean install -DskipTests
     - name: Run all tests
-      run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
+      run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
     - name: Publish Test Report
       if: failure()
       uses: scacap/action-surefire-report@v1
diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
index 46eceb30fef..567db1f4444 100644
--- a/.github/workflows/pr-verify.yml
+++ b/.github/workflows/pr-verify.yml
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -23,7 +25,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Check formatting
-        run: mvn -B --quiet -T 2C formatter:validate impsort:check xml-format:xml-check
+        run: mvn -B -Pformatting spotless:check
       - name: Quick compile
         run: mvn -B --quiet -T 2C compile -DskipTests -Pquick
       - name: Download all other dependencies
@@ -34,6 +36,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -53,6 +57,8 @@ jobs:
         jdk: [ 11, 25 ]
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -62,7 +68,7 @@ jobs:
       - name: Build
         run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
       - name: Test
-        run: ./scripts/ci/run-with-thread-dump.sh mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
+        run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
       - name: Publish Test Report
         if: failure()
         uses: scacap/action-surefire-report@v1.9.0
@@ -75,6 +81,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -84,7 +92,7 @@ jobs:
       - name: Build
         run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
       - name: Verify
-        run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
+        run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
       - name: Publish Test Report
         if: failure()
         uses: scacap/action-surefire-report@v1.9.0
@@ -96,6 +104,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -105,7 +115,7 @@ jobs:
       - name: Build
         run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
       - name: Verify
-        run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
+        run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
       - name: Publish Test Report
         if: failure()
         uses: scacap/action-surefire-report@v1.9.0
@@ -117,6 +127,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -134,6 +146,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -148,11 +162,13 @@ jobs:
           node-version: 18
       - name: Run end-to-end tests of RDF4J Server and Workbench
         working-directory: ./e2e
-        run: ../scripts/ci/run-with-thread-dump.sh ./run.sh
+        run: exec ../scripts/ci/run-with-thread-dump.sh ./run.sh
 
   copyright-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Register JVM thread dump on cancel
+        uses: ./.github/actions/thread-dump-post
       - name: check copyright header present
         run: scripts/checkCopyrightPresent.sh
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e690819b9c2..9008ad0e295 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -90,7 +90,7 @@
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<transformers>
-						<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+						<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
 						<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
 							<resource>edl-v1.0.txt</resource>
 							<file>../edl-v1.0.txt</file>
diff --git a/assembly/src/main/assembly/sdk.xml b/assembly/src/main/assembly/sdk.xml
index c02af08e093..c05c3ad78fe 100644
--- a/assembly/src/main/assembly/sdk.xml
+++ b/assembly/src/main/assembly/sdk.xml
@@ -15,7 +15,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>..</directory>
-			<outputDirectory/>
+			<outputDirectory />
 			<includes>
 				<include>*.txt</include>
 			</includes>
@@ -49,15 +49,15 @@
 		</file>
 		<file>
 			<source>../edl-v1.0.txt</source>
-			<outputDirectory/>
+			<outputDirectory />
 		</file>
 		<file>
 			<source>../about.md</source>
-			<outputDirectory/>
+			<outputDirectory />
 		</file>
 		<file>
 			<source>../notice.md</source>
-			<outputDirectory/>
+			<outputDirectory />
 		</file>
 	</files>
 </assembly>
diff --git a/compliance/elasticsearch/src/test/resources/logback-test.xml b/compliance/elasticsearch/src/test/resources/logback-test.xml
index 60d8e2b9c42..e5e5497fa27 100644
--- a/compliance/elasticsearch/src/test/resources/logback-test.xml
+++ b/compliance/elasticsearch/src/test/resources/logback-test.xml
@@ -6,16 +6,16 @@
 		</encoder>
 	</appender>
 	<logger name="org.eclipse.rdf4j.sail.elasticsearch.ElasticsearchSailTest">
-		<level value="warn"/>
+		<level value="warn" />
 	</logger>
 	<logger name="org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailSpinTest">
-		<level value="info"/>
+		<level value="info" />
 	</logger>
 	<logger name="org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailTupleFunctionTest">
-		<level value="warn"/>
+		<level value="warn" />
 	</logger>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/compliance/repository/src/test/resources/logback-test.xml b/compliance/repository/src/test/resources/logback-test.xml
index da908388a37..318803b5897 100644
--- a/compliance/repository/src/test/resources/logback-test.xml
+++ b/compliance/repository/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
 			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.eclipse.rdf4j" level="info"/>
+	<logger name="org.eclipse.rdf4j" level="info" />
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/compliance/rio/src/test/resources/logback-test.xml b/compliance/rio/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/compliance/rio/src/test/resources/logback-test.xml
+++ b/compliance/rio/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/compliance/solr/solr/cores/embedded/conf/solrconfig.xml b/compliance/solr/solr/cores/embedded/conf/solrconfig.xml
index 67cea4f63de..913c079c3b5 100644
--- a/compliance/solr/solr/cores/embedded/conf/solrconfig.xml
+++ b/compliance/solr/solr/cores/embedded/conf/solrconfig.xml
@@ -2,9 +2,9 @@
 <config>
 	<luceneMatchVersion>8.9.0</luceneMatchVersion>
 	<dataDir>target/test-data</dataDir>
-	<requestHandler name="/select" class="solr.SearchHandler"/>
-	<requestHandler name="/get" class="solr.RealTimeGetHandler"/>
-	<directoryFactory class="org.apache.solr.core.RAMDirectoryFactory"/>
+	<requestHandler name="/select" class="solr.SearchHandler" />
+	<requestHandler name="/get" class="solr.RealTimeGetHandler" />
+	<directoryFactory class="org.apache.solr.core.RAMDirectoryFactory" />
 	<indexConfig>
 		<lockType>single</lockType>
 	</indexConfig>
diff --git a/compliance/solr/solr/solr.xml b/compliance/solr/solr/solr.xml
index 6fcbdd865a1..a777659cae0 100644
--- a/compliance/solr/solr/solr.xml
+++ b/compliance/solr/solr/solr.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solr/>
+<solr />
diff --git a/compliance/solr/src/test/resources/logback-test.xml b/compliance/solr/src/test/resources/logback-test.xml
index 9fed5f35d71..2e36e369c66 100644
--- a/compliance/solr/src/test/resources/logback-test.xml
+++ b/compliance/solr/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
 			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.eclipse.rdf4j" level="debug"/>
+	<logger name="org.eclipse.rdf4j" level="debug" />
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/compliance/sparql/src/test/resources/logback-test.xml b/compliance/sparql/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/compliance/sparql/src/test/resources/logback-test.xml
+++ b/compliance/sparql/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/http/client/src/test/resources/__files/repository-list.xml b/core/http/client/src/test/resources/__files/repository-list.xml
index aaab88f5ac5..8a36b8ebac9 100644
--- a/core/http/client/src/test/resources/__files/repository-list.xml
+++ b/core/http/client/src/test/resources/__files/repository-list.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparql xmlns="http://www.w3.org/2005/sparql-results#">
 	<head>
-		<variable name="uri"/>
-		<variable name="id"/>
-		<variable name="title"/>
-		<variable name="readable"/>
-		<variable name="writable"/>
+		<variable name="uri" />
+		<variable name="id" />
+		<variable name="title" />
+		<variable name="readable" />
+		<variable name="writable" />
 	</head>
 	<results ordered="false" distinct="false">
 		<result>
diff --git a/core/http/client/src/test/resources/logback-test.xml b/core/http/client/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/http/client/src/test/resources/logback-test.xml
+++ b/core/http/client/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/http/protocol/src/test/resources/logback-test.xml b/core/http/protocol/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/http/protocol/src/test/resources/logback-test.xml
+++ b/core/http/protocol/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/model-api/src/test/java/org/eclipse/rdf4j/model/ValueFactoryTest.java b/core/model-api/src/test/java/org/eclipse/rdf4j/model/ValueFactoryTest.java
index 197b7a45369..e26692cd156 100644
--- a/core/model-api/src/test/java/org/eclipse/rdf4j/model/ValueFactoryTest.java
+++ b/core/model-api/src/test/java/org/eclipse/rdf4j/model/ValueFactoryTest.java
@@ -18,7 +18,6 @@
 import static java.time.temporal.ChronoUnit.YEARS;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatNullPointerException;
diff --git a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/xsd/DateCast.java b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/xsd/DateCast.java
index f3b94ac248d..345f806f8ff 100644
--- a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/xsd/DateCast.java
+++ b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/function/xsd/DateCast.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.query.algebra.evaluation.function.xsd;
 
 import static javax.xml.datatype.DatatypeConstants.FIELD_UNDEFINED;
-
 import static org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil.isValidDate;
 
 import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/IfValueEvaluationStep.java b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/IfValueEvaluationStep.java
index 00b01264f51..f1f994002ec 100644
--- a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/IfValueEvaluationStep.java
+++ b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/IfValueEvaluationStep.java
@@ -48,4 +48,4 @@ public Value evaluate(BindingSet bindings) throws ValueExprEvaluationException,
 			return alternative.evaluate(bindings);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/ValueExprTripleRefEvaluationStep.java b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/ValueExprTripleRefEvaluationStep.java
index 38b712c0ad6..080c2d842c7 100644
--- a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/ValueExprTripleRefEvaluationStep.java
+++ b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/values/ValueExprTripleRefEvaluationStep.java
@@ -49,4 +49,4 @@ public Value evaluate(BindingSet bindings) throws ValueExprEvaluationException,
 		}
 		return valueFactory.createTriple((Resource) subj, (IRI) pred, obj);
 	}
-}
\ No newline at end of file
+}
diff --git a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/util/QueryEvaluationUtility.java b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/util/QueryEvaluationUtility.java
index be716ca4e90..fbb27bd6f62 100644
--- a/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/util/QueryEvaluationUtility.java
+++ b/core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/util/QueryEvaluationUtility.java
@@ -372,11 +372,6 @@ public static boolean isSimpleLiteral(Value v) {
 		return false;
 	}
 
-//	public static boolean isPlainLiteral(Literal l) {
-//		return l.getCoreDatatype().filter(d -> d == CoreDatatype.XSD.STRING).isPresent();
-////		return l.getCoreDatatype().orElse(null) == CoreDatatype.XSD.STRING;
-//	}
-
 	/**
 	 * Checks whether the supplied literal is a "simple literal". A "simple literal" is a literal with no language tag
 	 * and the datatype {@link CoreDatatype.XSD#STRING}.
diff --git a/core/queryalgebra/evaluation/src/test/resources/logback-test.xml b/core/queryalgebra/evaluation/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/queryalgebra/evaluation/src/test/resources/logback-test.xml
+++ b/core/queryalgebra/evaluation/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryalgebra/geosparql/src/test/resources/logback-test.xml b/core/queryalgebra/geosparql/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/queryalgebra/geosparql/src/test/resources/logback-test.xml
+++ b/core/queryalgebra/geosparql/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlComprehensiveStreamingValidTest.java b/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlComprehensiveStreamingValidTest.java
index 0da5c55523b..c7d19c2179b 100644
--- a/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlComprehensiveStreamingValidTest.java
+++ b/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlComprehensiveStreamingValidTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.queryrender;
 
 import static java.util.Spliterator.ORDERED;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlPropertyPathStreamTest.java b/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlPropertyPathStreamTest.java
index 85ce60b8ab5..f7c7c81a4fe 100644
--- a/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlPropertyPathStreamTest.java
+++ b/core/queryrender/src/test/java/org/eclipse/rdf4j/queryrender/SparqlPropertyPathStreamTest.java
@@ -12,7 +12,6 @@
 package org.eclipse.rdf4j.queryrender;
 
 import static java.util.Spliterator.ORDERED;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/core/queryrender/src/test/resources/logback-test-logstash.xml b/core/queryrender/src/test/resources/logback-test-logstash.xml
index 270aa992657..5388fc87e19 100644
--- a/core/queryrender/src/test/resources/logback-test-logstash.xml
+++ b/core/queryrender/src/test/resources/logback-test-logstash.xml
@@ -7,12 +7,12 @@
     Note: requires net.logstash.logback dependency, which is not added by default.
   -->
 	<appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+		<encoder class="net.logstash.logback.encoder.LogstashEncoder" />
 	</appender>
-	<logger name="org.eclipse.rdf4j" level="ERROR"/>
-	<logger name="org.apache.http" level="ERROR"/>
-	<logger name="org.eclipse.jetty" level="ERROR"/>
+	<logger name="org.eclipse.rdf4j" level="ERROR" />
+	<logger name="org.apache.http" level="ERROR" />
+	<logger name="org.eclipse.jetty" level="ERROR" />
 	<root level="ERROR">
-		<appender-ref ref="JSON"/>
+		<appender-ref ref="JSON" />
 	</root>
 </configuration>
diff --git a/core/queryrender/src/test/resources/logback-test.xml b/core/queryrender/src/test/resources/logback-test.xml
index b52949bed28..b8d254d7bd5 100644
--- a/core/queryrender/src/test/resources/logback-test.xml
+++ b/core/queryrender/src/test/resources/logback-test.xml
@@ -7,10 +7,10 @@
 		</encoder>
 	</appender>
 	<!-- Silence noisy libraries by default during tests -->
-	<logger name="org.eclipse.rdf4j" level="ERROR"/>
-	<logger name="org.apache.http" level="ERROR"/>
-	<logger name="org.eclipse.jetty" level="ERROR"/>
+	<logger name="org.eclipse.rdf4j" level="ERROR" />
+	<logger name="org.apache.http" level="ERROR" />
+	<logger name="org.eclipse.jetty" level="ERROR" />
 	<root level="ERROR">
-		<appender-ref ref="STDOUT"/>
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryresultio/binary/src/test/resources/logback-test.xml b/core/queryresultio/binary/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/queryresultio/binary/src/test/resources/logback-test.xml
+++ b/core/queryresultio/binary/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryresultio/sparqljson/src/test/resources/logback-test.xml b/core/queryresultio/sparqljson/src/test/resources/logback-test.xml
index 4b3ea0773e9..9902cda08fe 100644
--- a/core/queryresultio/sparqljson/src/test/resources/logback-test.xml
+++ b/core/queryresultio/sparqljson/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="info"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="info" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryresultio/sparqlxml/src/test/resources/logback-test.xml b/core/queryresultio/sparqlxml/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/queryresultio/sparqlxml/src/test/resources/logback-test.xml
+++ b/core/queryresultio/sparqlxml/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/queryresultio/text/src/test/resources/logback-test.xml b/core/queryresultio/text/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/queryresultio/text/src/test/resources/logback-test.xml
+++ b/core/queryresultio/text/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/repository/api/src/test/resources/logback-test.xml b/core/repository/api/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/repository/api/src/test/resources/logback-test.xml
+++ b/core/repository/api/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/repository/manager/src/test/resources/logback-test.xml b/core/repository/manager/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/repository/manager/src/test/resources/logback-test.xml
+++ b/core/repository/manager/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/repository/sail/src/test/resources/logback-test.xml b/core/repository/sail/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/repository/sail/src/test/resources/logback-test.xml
+++ b/core/repository/sail/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/rio/api/src/test/resources/logback-test.xml b/core/rio/api/src/test/resources/logback-test.xml
index d03ddcd9e11..8e938eeebbd 100644
--- a/core/rio/api/src/test/resources/logback-test.xml
+++ b/core/rio/api/src/test/resources/logback-test.xml
@@ -6,10 +6,10 @@
 		</encoder>
 	</appender>
 	<logger name="org.eclipse.rdf4j.rio">
-		<level value="warn"/>
+		<level value="warn" />
 	</logger>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/rio/trix/src/test/resources/logback-test.xml b/core/rio/trix/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/rio/trix/src/test/resources/logback-test.xml
+++ b/core/rio/trix/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/api/src/test/resources/logback-test.xml b/core/sail/api/src/test/resources/logback-test.xml
index ec0d62f9826..257d4852f07 100644
--- a/core/sail/api/src/test/resources/logback-test.xml
+++ b/core/sail/api/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml
index c0a82d8dfb7..d354b84751c 100644
--- a/core/sail/elasticsearch-store/pom.xml
+++ b/core/sail/elasticsearch-store/pom.xml
@@ -138,7 +138,7 @@
 				<jdk>11</jdk>
 			</activation>
 			<properties>
-				<java.sec.mgr/>
+				<java.sec.mgr />
 			</properties>
 		</profile>
 		<profile>
diff --git a/core/sail/elasticsearch-store/src/test/resources/logback.xml b/core/sail/elasticsearch-store/src/test/resources/logback.xml
index c74381fb0c2..de2284179bb 100644
--- a/core/sail/elasticsearch-store/src/test/resources/logback.xml
+++ b/core/sail/elasticsearch-store/src/test/resources/logback.xml
@@ -7,7 +7,7 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
+		<appender-ref ref="CONSOLE" />
 	</root>
-	<logger name="org.eclipse.rdf4j.sail.extensiblestore" level="INFO"/>
+	<logger name="org.eclipse.rdf4j.sail.extensiblestore" level="INFO" />
 </configuration>
diff --git a/core/sail/extensible-store/src/test/resources/logback.xml b/core/sail/extensible-store/src/test/resources/logback.xml
index e4aad7d7afc..79176417992 100644
--- a/core/sail/extensible-store/src/test/resources/logback.xml
+++ b/core/sail/extensible-store/src/test/resources/logback.xml
@@ -7,7 +7,7 @@
 		</encoder>
 	</appender>
 	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
+		<appender-ref ref="CONSOLE" />
 	</root>
-	<logger name="org.eclipse.rdf4j.sail.extensiblestore" level="DEBUG"/>
+	<logger name="org.eclipse.rdf4j.sail.extensiblestore" level="DEBUG" />
 </configuration>
diff --git a/core/sail/inferencer/src/test/resources/logback-test.xml b/core/sail/inferencer/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/sail/inferencer/src/test/resources/logback-test.xml
+++ b/core/sail/inferencer/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/SailSourceModelTest.java b/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/SailSourceModelTest.java
index 01ddf213bf0..6de8b089113 100644
--- a/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/SailSourceModelTest.java
+++ b/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/SailSourceModelTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.sail.lmdb;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
diff --git a/core/sail/lmdb/src/test/resources/logback-test.xml b/core/sail/lmdb/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/sail/lmdb/src/test/resources/logback-test.xml
+++ b/core/sail/lmdb/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/lucene/src/test/resources/logback-test.xml b/core/sail/lucene/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/sail/lucene/src/test/resources/logback-test.xml
+++ b/core/sail/lucene/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/memory/src/test/resources/logback-test.xml b/core/sail/memory/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/sail/memory/src/test/resources/logback-test.xml
+++ b/core/sail/memory/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/model/src/test/resources/logback-test.xml b/core/sail/model/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/sail/model/src/test/resources/logback-test.xml
+++ b/core/sail/model/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreTxnTest.java b/core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreTxnTest.java
index 3390903ead1..9bfc3186548 100644
--- a/core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreTxnTest.java
+++ b/core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreTxnTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.sail.nativerdf;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/core/sail/nativerdf/src/test/resources/logback-test.xml b/core/sail/nativerdf/src/test/resources/logback-test.xml
index 4b3ea0773e9..9902cda08fe 100644
--- a/core/sail/nativerdf/src/test/resources/logback-test.xml
+++ b/core/sail/nativerdf/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="info"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="info" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/sail/shacl/src/test/resources/logback-test.xml b/core/sail/shacl/src/test/resources/logback-test.xml
index 40ced8210b0..d835d50feb5 100644
--- a/core/sail/shacl/src/test/resources/logback-test.xml
+++ b/core/sail/shacl/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
 			<pattern>%d %green([%thread]) %highlight(%level) %logger{50} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.eclipse.rdf4j.sail.shacl" level="info"/>
+	<logger name="org.eclipse.rdf4j.sail.shacl" level="info" />
 	<root>
-		<level value="info"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="info" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/core/spin/src/test/resources/logback-test.xml b/core/spin/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/core/spin/src/test/resources/logback-test.xml
+++ b/core/spin/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/eclipse-settings/xml.prefs b/eclipse-settings/xml.prefs
new file mode 100644
index 00000000000..5837260b815
--- /dev/null
+++ b/eclipse-settings/xml.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+formatCommentJoinLines=false
+formatCommentText=false
+indentationChar=tab
+indentationSize=1
+lineWidth=1000
diff --git a/pom.xml b/pom.xml
index 9ed15667edb..70c939bab7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,36 @@
 		<!-- for maven Central deployment it is important that bom is the last module -->
 		<module>bom</module>
 	</modules>
+	<properties>
+		<java.version>11</java.version>
+		<maven.compiler.release>${java.version}</maven.compiler.release>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<enforce-javaee-provided.fail>true</enforce-javaee-provided.fail>
+		<slf4j.version>1.7.36</slf4j.version>
+		<logback.version>1.2.13</logback.version>
+		<log4j.version>2.25.3</log4j.version>
+		<httpclient.version>4.5.14</httpclient.version>
+		<jackson.version>2.13.5</jackson.version>
+		<httpcore.version>4.4.16</httpcore.version>
+		<jsonldjava.version>0.13.4</jsonldjava.version>
+		<last.japicmp.compare.version>5.0.0</last.japicmp.compare.version>
+		<jaxb.version>2.3.8</jaxb.version>
+		<lwjgl.version>3.3.6</lwjgl.version>
+		<lucene.version>8.9.0</lucene.version>
+		<solr.version>8.9.0</solr.version>
+		<elasticsearch.version>7.15.2</elasticsearch.version>
+		<spring.version>5.3.39</spring.version>
+		<guava.version>32.1.3-jre</guava.version>
+		<jmhVersion>1.37</jmhVersion>
+		<servlet.version>4.0.0</servlet.version>
+		<junit.version>5.9.3</junit.version>
+		<jetty.version>9.4.54.v20240208</jetty.version>
+		<netty.version>4.1.111.Final</netty.version>
+		<testcontainers.version>1.20.6</testcontainers.version>
+		<argLine />
+	</properties>
 	<profiles>
 		<profile>
 			<id>ossrh</id>
@@ -299,35 +329,63 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>net.revelc.code.formatter</groupId>
-						<artifactId>formatter-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>format</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>net.revelc.code</groupId>
-						<artifactId>impsort-maven-plugin</artifactId>
+						<groupId>com.diffplug.spotless</groupId>
+						<artifactId>spotless-maven-plugin</artifactId>
+						<version>2.46.1</version>
+						<configuration>
+							<java>
+								<includes>
+									<include>src/main/java/**/*.java</include>
+									<include>src/test/java/**/*.java</include>
+								</includes>
+								<eclipse>
+									<file>${maven.multiModuleProjectDirectory}/eclipse-settings/eclipse-rdf4j-conventions.xml</file>
+								</eclipse>
+								<importOrder>
+									<order>java,javax,org,com</order>
+								</importOrder>
+								<removeUnusedImports />
+								<trimTrailingWhitespace />
+								<endWithNewline />
+							</java>
+							<formats>
+								<format>
+									<!-- All XML files, except those excluded below -->
+									<includes>
+										<include>**/*.xml</include>
+									</includes>
+									<!-- Mirror old xml-format-maven-plugin excludes and avoid double-formatting POMs -->
+									<excludes>
+										<exclude>eclipse-settings/**</exclude>
+										<exclude>**/target/**</exclude>
+										<exclude>**/site/themes/**</exclude>
+										<exclude>**/.*/**
+										</exclude>
+										<exclude>**/dependency-reduced-pom.xml</exclude>
+									</excludes>
+									<eclipseWtp>
+										<type>XML</type>
+										<files>
+											<file>${maven.multiModuleProjectDirectory}/eclipse-settings/xml.prefs</file>
+										</files>
+									</eclipseWtp>
+								</format>
+							</formats>
+							<skip>${formatter.skip}</skip>
+						</configuration>
 						<executions>
 							<execution>
+								<id>spotless-apply</id>
+								<phase>process-resources</phase>
 								<goals>
-									<goal>sort</goal>
+									<goal>apply</goal>
 								</goals>
 							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>au.com.acegi</groupId>
-						<artifactId>xml-format-maven-plugin</artifactId>
-						<executions>
 							<execution>
-								<phase>process-resources</phase>
+								<id>spotless-check</id>
+								<phase>verify</phase>
 								<goals>
-									<goal>xml-format</goal>
+									<goal>check</goal>
 								</goals>
 							</execution>
 						</executions>
@@ -377,36 +435,6 @@
 			</build>
 		</profile>
 	</profiles>
-	<properties>
-		<java.version>11</java.version>
-		<maven.compiler.release>${java.version}</maven.compiler.release>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<enforce-javaee-provided.fail>true</enforce-javaee-provided.fail>
-		<slf4j.version>1.7.36</slf4j.version>
-		<logback.version>1.2.13</logback.version>
-		<log4j.version>2.17.2</log4j.version>
-		<httpclient.version>4.5.14</httpclient.version>
-		<jackson.version>2.13.5</jackson.version>
-		<httpcore.version>4.4.16</httpcore.version>
-		<jsonldjava.version>0.13.4</jsonldjava.version>
-		<last.japicmp.compare.version>5.0.0</last.japicmp.compare.version>
-		<jaxb.version>2.3.8</jaxb.version>
-		<lwjgl.version>3.3.6</lwjgl.version>
-		<lucene.version>8.9.0</lucene.version>
-		<solr.version>8.9.0</solr.version>
-		<elasticsearch.version>7.15.2</elasticsearch.version>
-		<spring.version>5.3.39</spring.version>
-		<guava.version>32.1.3-jre</guava.version>
-		<jmhVersion>1.37</jmhVersion>
-		<servlet.version>4.0.0</servlet.version>
-		<junit.version>5.9.3</junit.version>
-		<jetty.version>9.4.54.v20240208</jetty.version>
-		<netty.version>4.1.111.Final</netty.version>
-		<testcontainers.version>1.20.6</testcontainers.version>
-		<argLine/>
-	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<!-- Jackson Bill-of-Materials -->
diff --git a/site/content/news/rdf4j-530-M1.md b/site/content/news/rdf4j-530-M1.md
new file mode 100644
index 00000000000..faf4f4d7f08
--- /dev/null
+++ b/site/content/news/rdf4j-530-M1.md
@@ -0,0 +1,25 @@
+---
+title: "RDF4J 5.3.0 Milestone 1"
+date: 2025-12-21T23:16:10+0100
+layout: "single"
+categories: ["news"]
+---
+Milestone number 1 of the upcoming 5.3.0 release of RDF4J is now available for download.
+
+RDF4J 5.3.0 is a minor release focusing on stability and getting the code ready for the next major release. 
+
+### Notable changes in 5.3.0 M1
+
+ - The Var implementation used in the query engine now supports custom implementations through the Java Service Provider Interface (SPI). See: [Var.java](https://github.com/eclipse-rdf4j/rdf4j/blob/1fd83f729d0c1a23d66cda2eeea5b77994d1b586/core/queryalgebra/model/src/main/java/org/eclipse/rdf4j/query/algebra/Var.java#L320)
+ - The Solr Sail has been deprecated and will be removed in the next major release.
+
+This milestone build is not yet feature-complete, but we are putting it out to receive early feedback on the deprecation.
+
+<!--more-->
+
+ - [issues fixed in 5.3.0 Milestone 1](https://github.com/eclipse/rdf4j/issues?q=is%3Aissue+label%3AM1+is%3Aclosed+milestone%3A5.3.0)
+ - [issues planned for 5.3.0](https://github.com/eclipse/rdf4j/milestone/124)
+
+### Links
+
+- [Download RDF4J](/download/)
diff --git a/site/static/javadoc/5.3.0-M1.tar.xz b/site/static/javadoc/5.3.0-M1.tar.xz
new file mode 100644
index 00000000000..54f6d1cbe0b
Binary files /dev/null and b/site/static/javadoc/5.3.0-M1.tar.xz differ
diff --git a/site/static/javadoc/latest.tar.xz b/site/static/javadoc/latest.tar.xz
index 5a07b987c8d..54f6d1cbe0b 100644
Binary files a/site/static/javadoc/latest.tar.xz and b/site/static/javadoc/latest.tar.xz differ
diff --git a/spring-components/rdf4j-spring-demo/src/main/resources/logback.xml b/spring-components/rdf4j-spring-demo/src/main/resources/logback.xml
index cc3c5b4b7b3..0b8a6cf56d2 100644
--- a/spring-components/rdf4j-spring-demo/src/main/resources/logback.xml
+++ b/spring-components/rdf4j-spring-demo/src/main/resources/logback.xml
@@ -16,8 +16,8 @@
 		</encoder>
 	</appender>
 	<root level="WARN">
-		<appender-ref ref="STDOUT"/>
+		<appender-ref ref="STDOUT" />
 	</root>
-	<logger name="org.eclipse.rdf4j.spring" level="ERROR"/>
-	<logger name="org.springframework" level="ERROR"/>
+	<logger name="org.eclipse.rdf4j.spring" level="ERROR" />
+	<logger name="org.springframework" level="ERROR" />
 </configuration>
diff --git a/spring-components/rdf4j-spring-demo/src/test/resources/logback.xml b/spring-components/rdf4j-spring-demo/src/test/resources/logback.xml
index 2c07d55c40c..374aaed196a 100644
--- a/spring-components/rdf4j-spring-demo/src/test/resources/logback.xml
+++ b/spring-components/rdf4j-spring-demo/src/test/resources/logback.xml
@@ -6,8 +6,8 @@
 		</encoder>
 	</appender>
 	<root level="WARN">
-		<appender-ref ref="STDOUT"/>
+		<appender-ref ref="STDOUT" />
 	</root>
-	<logger name="org.eclipse.rdf4j.spring" level="ERROR"/>
-	<logger name="org.springframework" level="ERROR"/>
+	<logger name="org.eclipse.rdf4j.spring" level="ERROR" />
+	<logger name="org.springframework" level="ERROR" />
 </configuration>
diff --git a/spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/dao/support/operation/TupleQueryResultConverter.java b/spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/dao/support/operation/TupleQueryResultConverter.java
index 96053acfd07..d042fb2aaaf 100644
--- a/spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/dao/support/operation/TupleQueryResultConverter.java
+++ b/spring-components/rdf4j-spring/src/main/java/org/eclipse/rdf4j/spring/dao/support/operation/TupleQueryResultConverter.java
@@ -12,7 +12,6 @@
 package org.eclipse.rdf4j.spring.dao.support.operation;
 
 import static java.util.stream.Collectors.mapping;
-
 import static org.eclipse.rdf4j.spring.dao.exception.mapper.ExceptionMapper.mapException;
 import static org.eclipse.rdf4j.spring.dao.support.operation.OperationUtils.require;
 
diff --git a/spring-components/rdf4j-spring/src/test/resources/logback.xml b/spring-components/rdf4j-spring/src/test/resources/logback.xml
index cc3c5b4b7b3..0b8a6cf56d2 100644
--- a/spring-components/rdf4j-spring/src/test/resources/logback.xml
+++ b/spring-components/rdf4j-spring/src/test/resources/logback.xml
@@ -16,8 +16,8 @@
 		</encoder>
 	</appender>
 	<root level="WARN">
-		<appender-ref ref="STDOUT"/>
+		<appender-ref ref="STDOUT" />
 	</root>
-	<logger name="org.eclipse.rdf4j.spring" level="ERROR"/>
-	<logger name="org.springframework" level="ERROR"/>
+	<logger name="org.eclipse.rdf4j.spring" level="ERROR" />
+	<logger name="org.springframework" level="ERROR" />
 </configuration>
diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml
index 7fe21e0d642..df66a73a055 100644
--- a/testsuites/benchmark/pom.xml
+++ b/testsuites/benchmark/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>rdf4j-benchmark</artifactId>
 	<name>RDF4J: benchmarks</name>
-	<description/>
+	<description />
 	<dependencies>
 		<dependency>
 			<groupId>org.openjdk.jmh</groupId>
@@ -109,7 +109,7 @@
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>org.openjdk.jmh.Main</mainClass>
 								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
 							</transformers>
 						</configuration>
 					</execution>
diff --git a/testsuites/benchmark/src/main/java/org/eclipse/rdf4j/benchmark/rio/RDFSizeBenchmarks.java b/testsuites/benchmark/src/main/java/org/eclipse/rdf4j/benchmark/rio/RDFSizeBenchmarks.java
index 112d808b96a..ef8953c01f1 100644
--- a/testsuites/benchmark/src/main/java/org/eclipse/rdf4j/benchmark/rio/RDFSizeBenchmarks.java
+++ b/testsuites/benchmark/src/main/java/org/eclipse/rdf4j/benchmark/rio/RDFSizeBenchmarks.java
@@ -13,7 +13,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_16;
 import static java.nio.charset.StandardCharsets.UTF_8;
-
 import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
 import static org.eclipse.rdf4j.rio.helpers.BasicParserSettings.VERIFY_LANGUAGE_TAGS;
 import static org.eclipse.rdf4j.rio.helpers.BasicParserSettings.VERIFY_RELATIVE_URIS;
diff --git a/testsuites/model/src/main/java/org/eclipse/rdf4j/testsuite/model/ModelTest.java b/testsuites/model/src/main/java/org/eclipse/rdf4j/testsuite/model/ModelTest.java
index 387a71b0329..8bc51bd6c1c 100644
--- a/testsuites/model/src/main/java/org/eclipse/rdf4j/testsuite/model/ModelTest.java
+++ b/testsuites/model/src/main/java/org/eclipse/rdf4j/testsuite/model/ModelTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.testsuite.model;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/tools/config/src/main/resources/org/eclipse/rdf4j/common/app/config/defaults/logback.xml b/tools/config/src/main/resources/org/eclipse/rdf4j/common/app/config/defaults/logback.xml
index a05d9655203..035fa4176ab 100644
--- a/tools/config/src/main/resources/org/eclipse/rdf4j/common/app/config/defaults/logback.xml
+++ b/tools/config/src/main/resources/org/eclipse/rdf4j/common/app/config/defaults/logback.xml
@@ -6,13 +6,13 @@
 			<fileNamePattern>${org.eclipse.rdf4j.common.logging.dir}/main-%d{yyyy-MM-dd}.log</fileNamePattern>
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-			<layout class="org.eclipse.rdf4j.common.logging.file.logback.StackTracePatternLayout"/>
+			<layout class="org.eclipse.rdf4j.common.logging.file.logback.StackTracePatternLayout" />
 			<charset>UTF-8</charset>
 		</encoder>
-		<logreader class="org.eclipse.rdf4j.common.logging.file.logback.FileLogReader" default="true"/>
+		<logreader class="org.eclipse.rdf4j.common.logging.file.logback.FileLogReader" default="true" />
 	</appender>
 	<root>
-		<level value="INFO"/>
-		<appender-ref ref="MainLog"/>
+		<level value="INFO" />
+		<appender-ref ref="MainLog" />
 	</root>
 </configuration>
diff --git a/tools/console/pom.xml b/tools/console/pom.xml
index e7840d6890d..3ddbca96131 100644
--- a/tools/console/pom.xml
+++ b/tools/console/pom.xml
@@ -89,8 +89,8 @@
 							<mainClass>org.eclipse.rdf4j.console.Console</mainClass>
 							<packageName>org.eclipse.rdf4j.console</packageName>
 							<addClasspath>true</addClasspath>
-							<addExtensions/>
-							<classpathPrefix/>
+							<addExtensions />
+							<classpathPrefix />
 						</manifest>
 					</archive>
 				</configuration>
diff --git a/tools/console/src/test/java/org/eclipse/rdf4j/console/command/LoadIsolationTest.java b/tools/console/src/test/java/org/eclipse/rdf4j/console/command/LoadIsolationTest.java
index cf1e60c9f7e..c740db5c1cc 100644
--- a/tools/console/src/test/java/org/eclipse/rdf4j/console/command/LoadIsolationTest.java
+++ b/tools/console/src/test/java/org/eclipse/rdf4j/console/command/LoadIsolationTest.java
@@ -49,7 +49,7 @@ public void setUp() throws Exception {
 	}
 
 	@Test
-        public void promptBeforeUsingDefaultIsolation() throws Exception {
+	public void promptBeforeUsingDefaultIsolation() throws Exception {
 		when(mockConsoleIO.askProceed(contains("isolation level NONE"), eq(false))).thenReturn(false);
 
 		cmd.execute("load", "data.ttl");
diff --git a/tools/console/src/test/resources/logback-test.xml b/tools/console/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/tools/console/src/test/resources/logback-test.xml
+++ b/tools/console/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/federation/build/test/rdf4j-server/WEB-INF/rdf4j-http-server-servlet.xml b/tools/federation/build/test/rdf4j-server/WEB-INF/rdf4j-http-server-servlet.xml
index 3c7ef942efc..23ec03906ea 100644
--- a/tools/federation/build/test/rdf4j-server/WEB-INF/rdf4j-http-server-servlet.xml
+++ b/tools/federation/build/test/rdf4j-server/WEB-INF/rdf4j-http-server-servlet.xml
@@ -12,28 +12,28 @@
 	</bean>
 	<!-- Customized FedX: use custom init to avoid initialization of logging framework -->
 	<bean id="commonAppConfig" class="org.eclipse.rdf4j.federated.server.CustomAppConfiguration" init-method="init" destroy-method="destroy">
-		<property name="applicationId" value="Server"/>
-		<property name="longName" value="RDF4J Server"/>
+		<property name="applicationId" value="Server" />
+		<property name="longName" value="RDF4J Server" />
 		<!--  'version' property no longer declared here, but read at runtime from META-INF maven properties -->
 	</bean>
 	<bean id="rdf4jRepositoryManager" class="org.eclipse.rdf4j.repository.manager.LocalRepositoryManager" init-method="init" destroy-method="shutDown" scope="singleton">
 		<constructor-arg>
-			<bean factory-bean="commonAppConfig" factory-method="getDataDir"/>
+			<bean factory-bean="commonAppConfig" factory-method="getDataDir" />
 		</constructor-arg>
 	</bean>
 	<!-- Inject the local repository manager as RepositoryResolver into FedX for tests -->
 	<bean id="fedxRepositoryResolver" class="org.eclipse.rdf4j.federated.server.FedXRepositoryResolverBean" scope="singleton" init-method="init" destroy-method="destroy">
-		<property name="repositoryResolver" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryResolver" ref="rdf4jRepositoryManager" />
 	</bean>
 	<!-- INTERCEPTORS -->
 	<bean id="rdf4jRepositoryInterceptor" class="org.eclipse.rdf4j.http.server.repository.RepositoryInterceptor" scope="request">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
-		<aop:scoped-proxy proxy-target-class="false"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
+		<aop:scoped-proxy proxy-target-class="false" />
 	</bean>
 	<!-- MAPPINGS -->
 	<bean id="rdf4jProtocolUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="0"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="0" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/protocol">rdf4jProtocolController</prop>
@@ -41,13 +41,13 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<bean class="org.eclipse.rdf4j.http.server.protocol.ProtocolInterceptor"/>
+				<bean class="org.eclipse.rdf4j.http.server.protocol.ProtocolInterceptor" />
 			</list>
 		</property>
 	</bean>
 	<bean id="rdf4jRepositoryListUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="1"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="1" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/repositories">rdf4jRepositoryListController</prop>
@@ -55,8 +55,8 @@
 		</property>
 	</bean>
 	<bean id="rdf4jRepositoryUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="2"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="2" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/repositories/*/namespaces/*">rdf4jRepositoryNamespaceController</prop>
@@ -73,7 +73,7 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<ref bean="rdf4jRepositoryInterceptor"/>
+				<ref bean="rdf4jRepositoryInterceptor" />
 			</list>
 		</property>
 	</bean>
@@ -97,21 +97,21 @@
 	</bean>
 -->
 	<!-- EXCEPTION RESOLVERS -->
-	<bean id="rdf4jHandlerExceptionResolver" class="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver"/>
+	<bean id="rdf4jHandlerExceptionResolver" class="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver" />
 	<!-- CONTROLLERS -->
-	<bean id="rdf4jProtocolController" class="org.eclipse.rdf4j.http.server.protocol.ProtocolController"/>
+	<bean id="rdf4jProtocolController" class="org.eclipse.rdf4j.http.server.protocol.ProtocolController" />
 	<bean id="rdf4jRepositoryListController" class="org.eclipse.rdf4j.http.server.repository.RepositoryListController">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
 	</bean>
 	<bean id="rdf4jRepositoryController" class="org.eclipse.rdf4j.http.server.repository.RepositoryController">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
 	</bean>
-	<bean id="rdf4jRepositoryContextsController" class="org.eclipse.rdf4j.http.server.repository.contexts.ContextsController"/>
-	<bean id="rdf4jRepositoryNamespacesController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespacesController"/>
-	<bean id="rdf4jRepositoryNamespaceController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespaceController"/>
-	<bean id="rdf4jRepositorySizeController" class="org.eclipse.rdf4j.http.server.repository.size.SizeController"/>
-	<bean id="rdf4jRepositoryStatementsController" class="org.eclipse.rdf4j.http.server.repository.statements.StatementsController"/>
-	<bean id="rdf4jRepositoryGraphController" class="org.eclipse.rdf4j.http.server.repository.graph.GraphController"/>
-	<bean id="rdf4jRepositoryTransactionController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionController"/>
-	<bean id="rdf4jRepositoryTransactionStartController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionStartController"/>
+	<bean id="rdf4jRepositoryContextsController" class="org.eclipse.rdf4j.http.server.repository.contexts.ContextsController" />
+	<bean id="rdf4jRepositoryNamespacesController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespacesController" />
+	<bean id="rdf4jRepositoryNamespaceController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespaceController" />
+	<bean id="rdf4jRepositorySizeController" class="org.eclipse.rdf4j.http.server.repository.size.SizeController" />
+	<bean id="rdf4jRepositoryStatementsController" class="org.eclipse.rdf4j.http.server.repository.statements.StatementsController" />
+	<bean id="rdf4jRepositoryGraphController" class="org.eclipse.rdf4j.http.server.repository.graph.GraphController" />
+	<bean id="rdf4jRepositoryTransactionController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionController" />
+	<bean id="rdf4jRepositoryTransactionStartController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionStartController" />
 </beans>
diff --git a/tools/federation/src/test/resources/logback-test.xml b/tools/federation/src/test/resources/logback-test.xml
index b5975d50453..f29f05b5c57 100644
--- a/tools/federation/src/test/resources/logback-test.xml
+++ b/tools/federation/src/test/resources/logback-test.xml
@@ -5,11 +5,11 @@
 			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.eclipse.rdf4j.federated" level="WARN"/>
-	<logger name="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver" level="OFF"/>
-	<logger name="org.eclipse.rdf4j.http.server.repository.RepositoryController" level="OFF"/>
+	<logger name="org.eclipse.rdf4j.federated" level="WARN" />
+	<logger name="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver" level="OFF" />
+	<logger name="org.eclipse.rdf4j.http.server.repository.RepositoryController" level="OFF" />
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/runtime-osgi/build.xml b/tools/runtime-osgi/build.xml
index 86f7d51921c..cbc9ac37984 100644
--- a/tools/runtime-osgi/build.xml
+++ b/tools/runtime-osgi/build.xml
@@ -2,18 +2,18 @@
 <project name="rdf4j" basedir=".">
 	<target name="enrich-artifact-with-provider-configuration-files">
 		<!-- Unzip the archive containing the provider-configuration files gathered from RDF4J's modules -->
-		<unzip src="${serviceresources.raw.jar}" dest="${serviceresources.raw.dir}"/>
+		<unzip src="${serviceresources.raw.jar}" dest="${serviceresources.raw.dir}" />
 		<!-- Copy the provider-configurations files and remove duplicate entries inside each of them -->
 		<copy todir="${serviceresources.fixed.dir}">
-			<fileset id="serviceFiles" dir="${serviceresources.raw.dir}" includes="META-INF/services/*"/>
+			<fileset id="serviceFiles" dir="${serviceresources.raw.dir}" includes="META-INF/services/*" />
 			<filterchain>
-				<sortfilter/>
-				<uniqfilter/>
+				<sortfilter />
+				<uniqfilter />
 			</filterchain>
 		</copy>
 		<!-- Add the fixed provider-configuration files to the main artifact of this project -->
 		<jar destfile="${jarToEnhance}" update="true">
-			<fileset dir="${serviceresources.fixed.dir}"/>
+			<fileset dir="${serviceresources.fixed.dir}" />
 		</jar>
 	</target>
 </project>
diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml
index 1cdc0897ec7..99b75da61e8 100644
--- a/tools/runtime-osgi/pom.xml
+++ b/tools/runtime-osgi/pom.xml
@@ -65,7 +65,7 @@
 								</filter>
 							</filters>
 							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
 							</transformers>
 							<outputFile>${serviceresources.raw.jar}</outputFile>
 						</configuration>
@@ -83,7 +83,7 @@
 						</goals>
 						<configuration>
 							<target>
-								<ant antfile="build.xml" target="enrich-artifact-with-provider-configuration-files" dir="${basedir}"/>
+								<ant antfile="build.xml" target="enrich-artifact-with-provider-configuration-files" dir="${basedir}" />
 							</target>
 						</configuration>
 					</execution>
diff --git a/tools/server-boot/src/main/dist/config/logback-spring.xml b/tools/server-boot/src/main/dist/config/logback-spring.xml
index 4992b9d9d08..7009d1ee18b 100644
--- a/tools/server-boot/src/main/dist/config/logback-spring.xml
+++ b/tools/server-boot/src/main/dist/config/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="30 seconds">
-	<property name="RDF4J_BASE" value="${org.eclipse.rdf4j.server.base:-${user.dir}}"/>
-	<property name="LOG_DIR" value="${org.eclipse.rdf4j.server.logdir:-${RDF4J_BASE}/logs}"/>
+	<property name="RDF4J_BASE" value="${org.eclipse.rdf4j.server.base:-${user.dir}}" />
+	<property name="LOG_DIR" value="${org.eclipse.rdf4j.server.logdir:-${RDF4J_BASE}/logs}" />
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
 			<pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX} [%thread] %-5level %logger{64} - %msg%n</pattern>
@@ -19,13 +19,13 @@
 		</rollingPolicy>
 	</appender>
 	<logger name="org.eclipse.rdf4j.http.server" level="INFO" additivity="false">
-		<appender-ref ref="CONSOLE"/>
-		<appender-ref ref="FILE"/>
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="FILE" />
 	</logger>
-	<logger name="org.eclipse.rdf4j.workbench" level="INFO"/>
-	<logger name="org.springframework.boot.web.embedded.tomcat.TomcatWebServer" level="INFO"/>
+	<logger name="org.eclipse.rdf4j.workbench" level="INFO" />
+	<logger name="org.springframework.boot.web.embedded.tomcat.TomcatWebServer" level="INFO" />
 	<root level="WARN">
-		<appender-ref ref="CONSOLE"/>
-		<appender-ref ref="FILE"/>
+		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="FILE" />
 	</root>
 </configuration>
diff --git a/tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java b/tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java
index cf79e07a70a..a7419e4e754 100644
--- a/tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java
+++ b/tools/server-boot/src/test/java/org/eclipse/rdf4j/tools/serverboot/ServerBootSignalIT.java
@@ -12,7 +12,6 @@
 package org.eclipse.rdf4j.tools.serverboot;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
diff --git a/tools/server-boot/src/test/resources/logback-test.xml b/tools/server-boot/src/test/resources/logback-test.xml
index 40ced8210b0..d835d50feb5 100644
--- a/tools/server-boot/src/test/resources/logback-test.xml
+++ b/tools/server-boot/src/test/resources/logback-test.xml
@@ -5,9 +5,9 @@
 			<pattern>%d %green([%thread]) %highlight(%level) %logger{50} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.eclipse.rdf4j.sail.shacl" level="info"/>
+	<logger name="org.eclipse.rdf4j.sail.shacl" level="info" />
 	<root>
-		<level value="info"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="info" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/handler/DefaultQueryRequestHandler.java b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/handler/DefaultQueryRequestHandler.java
index 8dcc5dfb98c..fdbecbbf60e 100644
--- a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/handler/DefaultQueryRequestHandler.java
+++ b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/handler/DefaultQueryRequestHandler.java
@@ -14,7 +14,6 @@
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE;
-
 import static org.eclipse.rdf4j.http.protocol.Protocol.BINDING_PREFIX;
 import static org.eclipse.rdf4j.http.protocol.Protocol.DEFAULT_GRAPH_PARAM_NAME;
 import static org.eclipse.rdf4j.http.protocol.Protocol.INCLUDE_INFERRED_PARAM_NAME;
diff --git a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/statements/StatementsController.java b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/statements/StatementsController.java
index 9c4424952fc..097e5155f91 100644
--- a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/statements/StatementsController.java
+++ b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/statements/StatementsController.java
@@ -13,7 +13,6 @@
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 import static javax.servlet.http.HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE;
-
 import static org.eclipse.rdf4j.http.protocol.Protocol.BASEURI_PARAM_NAME;
 import static org.eclipse.rdf4j.http.protocol.Protocol.BINDING_PREFIX;
 import static org.eclipse.rdf4j.http.protocol.Protocol.CONTEXT_PARAM_NAME;
diff --git a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/transaction/TransactionController.java b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/transaction/TransactionController.java
index f0a2b46612b..dbe57447db8 100644
--- a/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/transaction/TransactionController.java
+++ b/tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/transaction/TransactionController.java
@@ -14,7 +14,6 @@
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
 import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
-
 import static org.eclipse.rdf4j.http.protocol.Protocol.BINDING_PREFIX;
 import static org.eclipse.rdf4j.http.protocol.Protocol.CONTEXT_PARAM_NAME;
 import static org.eclipse.rdf4j.http.protocol.Protocol.DEFAULT_GRAPH_PARAM_NAME;
diff --git a/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/namespaces/NamespaceControllerTest.java b/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/namespaces/NamespaceControllerTest.java
index bcdfd3dd41f..4d27907ea5d 100644
--- a/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/namespaces/NamespaceControllerTest.java
+++ b/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/namespaces/NamespaceControllerTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.http.server.repository.namespaces;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
diff --git a/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/statements/TestExportStatementsView.java b/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/statements/TestExportStatementsView.java
index 5db64f684d3..4e6e47d3a68 100644
--- a/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/statements/TestExportStatementsView.java
+++ b/tools/server-spring/src/test/java/org/eclipse/rdf4j/http/server/repository/statements/TestExportStatementsView.java
@@ -11,7 +11,6 @@
 package org.eclipse.rdf4j.http.server.repository.statements;
 
 import static javax.servlet.http.HttpServletResponse.SC_OK;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/tools/server-spring/src/test/resources/logback-test.xml b/tools/server-spring/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/tools/server-spring/src/test/resources/logback-test.xml
+++ b/tools/server-spring/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/server-spring/src/test/resources/navigation.xml b/tools/server-spring/src/test/resources/navigation.xml
index 2a5ebc915be..6e4d371aba1 100644
--- a/tools/server-spring/src/test/resources/navigation.xml
+++ b/tools/server-spring/src/test/resources/navigation.xml
@@ -2,7 +2,7 @@
 <navigation id="admin">
 	<!-- Default prefixes and suffixes -->
 	<!-- for views -->
-	<path-prefix/>
+	<path-prefix />
 	<path-separator>/</path-separator>
 	<view-suffix>.view</view-suffix>
 	<!-- for icons -->
@@ -10,15 +10,15 @@
 	<icon-separator>_</icon-separator>
 	<icon-suffix>.png</icon-suffix>
 	<!-- for I18N keys -->
-	<i18n-prefix/>
+	<i18n-prefix />
 	<i18n-separator>.</i18n-separator>
 	<i18n-suffix>.title</i18n-suffix>
 	<!-- Group definitions -->
 	<group id="system">
 		<group id="logging" hidden="true">
-			<view id="overview" enabled="false"/>
+			<view id="overview" enabled="false" />
 		</group>
-		<view id="overview"/>
-		<view id="logging" view-suffix=".form"/>
+		<view id="overview" />
+		<view id="logging" view-suffix=".form" />
 	</group>
 </navigation>
diff --git a/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/navigation.xml b/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/navigation.xml
index 91a1d84d2c2..3176dbc47df 100644
--- a/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/navigation.xml
+++ b/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/navigation.xml
@@ -2,7 +2,7 @@
 <navigation id="">
 	<!-- Default prefixes and suffixes -->
 	<!-- for views -->
-	<path-prefix/>
+	<path-prefix />
 	<path-separator>/</path-separator>
 	<view-suffix>.view</view-suffix>
 	<!-- for icons -->
@@ -10,7 +10,7 @@
 	<icon-separator>_</icon-separator>
 	<icon-suffix>.png</icon-suffix>
 	<!-- for I18N keys -->
-	<i18n-prefix/>
+	<i18n-prefix />
 	<i18n-separator>.</i18n-separator>
 	<i18n-suffix>.title</i18n-suffix>
 </navigation>
diff --git a/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/system/navigation.xml b/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/system/navigation.xml
index 581b17320d5..e8fc247365b 100644
--- a/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/system/navigation.xml
+++ b/tools/server/src/main/resources/org/eclipse/rdf4j/common/webapp/system/navigation.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <navigation id="system">
 	<group id="system">
-		<view id="overview"/>
+		<view id="overview" />
 		<group id="logging">
-			<view id="overview"/>
+			<view id="overview" />
 		</group>
 		<group id="info">
-			<view id="overview"/>
-			<view id="debug" hidden="true"/>
+			<view id="overview" />
+			<view id="debug" hidden="true" />
 		</group>
 	</group>
 </navigation>
diff --git a/tools/server/src/main/resources/org/eclipse/rdf4j/http/server/navigation.xml b/tools/server/src/main/resources/org/eclipse/rdf4j/http/server/navigation.xml
index c3a2dfb7b22..396f89961c8 100644
--- a/tools/server/src/main/resources/org/eclipse/rdf4j/http/server/navigation.xml
+++ b/tools/server/src/main/resources/org/eclipse/rdf4j/http/server/navigation.xml
@@ -2,6 +2,6 @@
 <navigation id="rdf4j-server">
 	<!-- Group definitions -->
 	<group id="home">
-		<view id="overview"/>
+		<view id="overview" />
 	</group>
 </navigation>
diff --git a/tools/server/src/main/webapp/WEB-INF/classes/logback.xml b/tools/server/src/main/webapp/WEB-INF/classes/logback.xml
index 962f9889af5..e87f252dfe9 100644
--- a/tools/server/src/main/webapp/WEB-INF/classes/logback.xml
+++ b/tools/server/src/main/webapp/WEB-INF/classes/logback.xml
@@ -2,11 +2,11 @@
 <configuration>
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-			<layout class="org.eclipse.rdf4j.common.logging.file.logback.StackTracePatternLayout"/>
+			<layout class="org.eclipse.rdf4j.common.logging.file.logback.StackTracePatternLayout" />
 		</encoder>
 	</appender>
 	<root>
-		<level value="WARN"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="WARN" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/server/src/main/webapp/WEB-INF/common-webapp-servlet.xml b/tools/server/src/main/webapp/WEB-INF/common-webapp-servlet.xml
index a188b8ef4d4..aa8c93dc0f8 100644
--- a/tools/server/src/main/webapp/WEB-INF/common-webapp-servlet.xml
+++ b/tools/server/src/main/webapp/WEB-INF/common-webapp-servlet.xml
@@ -10,14 +10,14 @@
 	</bean>
 	<!-- Version information for the application. Intended to be overriden by webapps based on this one. -->
 	<bean id="commonAppVersion" class="org.eclipse.rdf4j.common.app.AppVersion">
-		<property name="major" value="3"/>
-		<property name="minor" value="2"/>
-		<property name="modifier" value="SNAPSHOT"/>
+		<property name="major" value="3" />
+		<property name="minor" value="2" />
+		<property name="modifier" value="SNAPSHOT" />
 	</bean>
 	<!-- Configuration information for the application. Intended to be overridden by webapps based on this one. -->
 	<bean id="commonAppConfig" class="org.eclipse.rdf4j.common.app.AppConfiguration" init-method="init" destroy-method="destroy">
-		<property name="applicationId" value="webapp-base"/>
-		<property name="version" ref="commonAppVersion"/>
+		<property name="applicationId" value="webapp-base" />
+		<property name="version" ref="commonAppVersion" />
 	</bean>
 	<!--
 		Navigation model for the application. Intended to be extended by webapps based on this one.
@@ -33,18 +33,18 @@
 	</bean>
 	<!-- INTERCEPTORS -->
 	<!-- Inserts common values into the request for convenience. -->
-	<bean id="commonWebappCommonValuesInserter" class="org.eclipse.rdf4j.common.webapp.CommonValuesHandlerInterceptor"/>
-	<bean id="commonWebappMessageInserter" class="org.eclipse.rdf4j.common.webapp.MessageHandlerInterceptor"/>
+	<bean id="commonWebappCommonValuesInserter" class="org.eclipse.rdf4j.common.webapp.CommonValuesHandlerInterceptor" />
+	<bean id="commonWebappMessageInserter" class="org.eclipse.rdf4j.common.webapp.MessageHandlerInterceptor" />
 	<!-- Inserts the navigation model into the request. -->
 	<bean id="commonWebappNavigationInserter" class="org.eclipse.rdf4j.common.webapp.navigation.NavigationHandlerInterceptor">
-		<property name="navigationModel" ref="commonWebappNavigation"/>
+		<property name="navigationModel" ref="commonWebappNavigation" />
 	</bean>
 	<!-- CONTROLLERS -->
-	<bean id="filenameViewController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
+	<bean id="filenameViewController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
 	<!-- RESOLVERS -->
 	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-		<property name="prefix" value="/WEB-INF/views/"/>
-		<property name="suffix" value=".jsp"/>
+		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
+		<property name="prefix" value="/WEB-INF/views/" />
+		<property name="suffix" value=".jsp" />
 	</bean>
 </beans>
diff --git a/tools/server/src/main/webapp/WEB-INF/common-webapp-system-servlet.xml b/tools/server/src/main/webapp/WEB-INF/common-webapp-system-servlet.xml
index bd48d92ff4c..b116ec96669 100644
--- a/tools/server/src/main/webapp/WEB-INF/common-webapp-system-servlet.xml
+++ b/tools/server/src/main/webapp/WEB-INF/common-webapp-system-servlet.xml
@@ -25,8 +25,8 @@
 	<!-- MAPPINGS -->
 	<!-- Mappings for the "system configuration" part of a webapp. -->
 	<bean id="commonWebappSystemUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="0"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="0" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/system/overview.view">commonWebappSystemOverviewController</prop>
@@ -37,22 +37,22 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<ref bean="commonWebappCommonValuesInserter"/>
-				<ref bean="commonWebappMessageInserter"/>
-				<ref bean="commonWebappNavigationInserter"/>
+				<ref bean="commonWebappCommonValuesInserter" />
+				<ref bean="commonWebappMessageInserter" />
+				<ref bean="commonWebappNavigationInserter" />
 			</list>
 		</property>
 	</bean>
 	<!-- CONTROLLERS -->
 	<bean id="commonWebappSystemOverviewController" class="org.eclipse.rdf4j.common.webapp.system.SystemOverviewController">
-		<property name="view" value="system/overview"/>
-		<property name="config" ref="commonAppConfig"/>
+		<property name="view" value="system/overview" />
+		<property name="config" ref="commonAppConfig" />
 	</bean>
 	<bean id="commonWebappLoggingOverviewController" class="org.eclipse.rdf4j.common.webapp.system.logging.LoggingOverviewController">
-		<property name="config" ref="commonAppConfig"/>
+		<property name="config" ref="commonAppConfig" />
 	</bean>
 	<bean id="commonWebappSystemInfoController" class="org.eclipse.rdf4j.common.webapp.system.SystemInfoController">
-		<property name="view" value="system/info/overview"/>
-		<property name="config" ref="commonAppConfig"/>
+		<property name="view" value="system/info/overview" />
+		<property name="config" ref="commonAppConfig" />
 	</bean>
 </beans>
diff --git a/tools/server/src/main/webapp/WEB-INF/glassfish-web.xml b/tools/server/src/main/webapp/WEB-INF/glassfish-web.xml
index 45beceaf63e..e2e88920816 100644
--- a/tools/server/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/tools/server/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glassfish-web-app>
-	<class-loader delegate="false"/>
+	<class-loader delegate="false" />
 </glassfish-web-app>
diff --git a/tools/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/tools/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index e062f05dfcf..f17defbac27 100644
--- a/tools/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/tools/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -3,8 +3,8 @@
 	<deployment>
 		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies     -->
 		<exclusions>
-			<module name="org.slf4j"/>
-			<module name="org.slf4j.impl"/>
+			<module name="org.slf4j" />
+			<module name="org.slf4j.impl" />
 		</exclusions>
 	</deployment>
 </jboss-deployment-structure>
diff --git a/tools/server/src/main/webapp/WEB-INF/rdf4j-http-server-servlet.xml b/tools/server/src/main/webapp/WEB-INF/rdf4j-http-server-servlet.xml
index 2407de03367..2649567ec72 100644
--- a/tools/server/src/main/webapp/WEB-INF/rdf4j-http-server-servlet.xml
+++ b/tools/server/src/main/webapp/WEB-INF/rdf4j-http-server-servlet.xml
@@ -7,7 +7,7 @@
 				<value>classpath:org/eclipse/rdf4j/http/server/application.properties</value>
 			</list>
 		</property>
-		<property name="ignoreUnresolvablePlaceholders" value="true"/>
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 	<!-- RESOURCES -->
 	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
@@ -20,8 +20,8 @@
 		</property>
 	</bean>
 	<bean id="commonAppConfig" class="org.eclipse.rdf4j.common.app.AppConfiguration" init-method="init" destroy-method="destroy">
-		<property name="applicationId" value="Server"/>
-		<property name="longName" value="RDF4J Server"/>
+		<property name="applicationId" value="Server" />
+		<property name="longName" value="RDF4J Server" />
 		<!--  'version' property no longer declared here, but read at runtime from META-INF maven properties -->
 	</bean>
 	<bean id="commonWebappNavigation" class="org.eclipse.rdf4j.common.webapp.navigation.NavigationModel">
@@ -35,18 +35,18 @@
 	</bean>
 	<bean id="rdf4jRepositoryManager" class="org.eclipse.rdf4j.repository.manager.LocalRepositoryManager" init-method="init" destroy-method="shutDown" scope="singleton">
 		<constructor-arg>
-			<bean factory-bean="commonAppConfig" factory-method="getDataDir"/>
+			<bean factory-bean="commonAppConfig" factory-method="getDataDir" />
 		</constructor-arg>
 	</bean>
 	<!-- INTERCEPTORS -->
 	<bean id="rdf4jRepositoryInterceptor" class="org.eclipse.rdf4j.http.server.repository.RepositoryInterceptor" scope="request">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
-		<aop:scoped-proxy/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
+		<aop:scoped-proxy />
 	</bean>
 	<!-- MAPPINGS -->
 	<bean id="rdf4jProtocolUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="0"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="0" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/protocol">rdf4jProtocolController</prop>
@@ -54,13 +54,13 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<bean class="org.eclipse.rdf4j.http.server.protocol.ProtocolInterceptor"/>
+				<bean class="org.eclipse.rdf4j.http.server.protocol.ProtocolInterceptor" />
 			</list>
 		</property>
 	</bean>
 	<bean id="rdf4jRepositoryListUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="1"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="1" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/repositories">rdf4jRepositoryListController</prop>
@@ -68,8 +68,8 @@
 		</property>
 	</bean>
 	<bean id="rdf4jRepositoryUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="2"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="2" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/repositories/*/namespaces/*">rdf4jRepositoryNamespaceController</prop>
@@ -87,13 +87,13 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<ref bean="rdf4jRepositoryInterceptor"/>
+				<ref bean="rdf4jRepositoryInterceptor" />
 			</list>
 		</property>
 	</bean>
 	<bean id="rdf4jServerHomeUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="order" value="3"/>
-		<property name="alwaysUseFullPath" value="true"/>
+		<property name="order" value="3" />
+		<property name="alwaysUseFullPath" value="true" />
 		<property name="mappings">
 			<props>
 				<prop key="/overview.view">filenameViewController</prop>
@@ -102,32 +102,32 @@
 		</property>
 		<property name="interceptors">
 			<list>
-				<ref bean="commonWebappCommonValuesInserter"/>
-				<ref bean="commonWebappNavigationInserter"/>
+				<ref bean="commonWebappCommonValuesInserter" />
+				<ref bean="commonWebappNavigationInserter" />
 			</list>
 		</property>
 	</bean>
 	<!-- EXCEPTION RESOLVERS -->
-	<bean id="rdf4jHandlerExceptionResolver" class="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver"/>
+	<bean id="rdf4jHandlerExceptionResolver" class="org.eclipse.rdf4j.http.server.ProtocolExceptionResolver" />
 	<!-- CONTROLLERS -->
-	<bean id="rdf4jProtocolController" class="org.eclipse.rdf4j.http.server.protocol.ProtocolController"/>
+	<bean id="rdf4jProtocolController" class="org.eclipse.rdf4j.http.server.protocol.ProtocolController" />
 	<bean id="rdf4jRepositoryListController" class="org.eclipse.rdf4j.http.server.repository.RepositoryListController">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
 	</bean>
 	<bean id="rdf4jRepositoryController" class="org.eclipse.rdf4j.http.server.repository.RepositoryController">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
 	</bean>
 	<bean id="rdf4jRepositoryConfigController" class="org.eclipse.rdf4j.http.server.repository.config.ConfigController">
-		<property name="repositoryManager" ref="rdf4jRepositoryManager"/>
+		<property name="repositoryManager" ref="rdf4jRepositoryManager" />
 	</bean>
-	<bean id="rdf4jRepositoryContextsController" class="org.eclipse.rdf4j.http.server.repository.contexts.ContextsController"/>
-	<bean id="rdf4jRepositoryNamespacesController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespacesController"/>
-	<bean id="rdf4jRepositoryNamespaceController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespaceController"/>
-	<bean id="rdf4jRepositorySizeController" class="org.eclipse.rdf4j.http.server.repository.size.SizeController"/>
-	<bean id="rdf4jRepositoryStatementsController" class="org.eclipse.rdf4j.http.server.repository.statements.StatementsController"/>
-	<bean id="rdf4jRepositoryGraphController" class="org.eclipse.rdf4j.http.server.repository.graph.GraphController"/>
-	<bean id="rdf4jRepositoryTransactionController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionController"/>
+	<bean id="rdf4jRepositoryContextsController" class="org.eclipse.rdf4j.http.server.repository.contexts.ContextsController" />
+	<bean id="rdf4jRepositoryNamespacesController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespacesController" />
+	<bean id="rdf4jRepositoryNamespaceController" class="org.eclipse.rdf4j.http.server.repository.namespaces.NamespaceController" />
+	<bean id="rdf4jRepositorySizeController" class="org.eclipse.rdf4j.http.server.repository.size.SizeController" />
+	<bean id="rdf4jRepositoryStatementsController" class="org.eclipse.rdf4j.http.server.repository.statements.StatementsController" />
+	<bean id="rdf4jRepositoryGraphController" class="org.eclipse.rdf4j.http.server.repository.graph.GraphController" />
+	<bean id="rdf4jRepositoryTransactionController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionController" />
 	<bean id="rdf4jRepositoryTransactionStartController" class="org.eclipse.rdf4j.http.server.repository.transaction.TransactionStartController">
-		<property name="externalUrl" value="${rdf4j.externalurl:#{null}}"/>
+		<property name="externalUrl" value="${rdf4j.externalurl:#{null}}" />
 	</bean>
 </beans>
diff --git a/tools/server/src/test/resources/logback-test.xml b/tools/server/src/test/resources/logback-test.xml
index 64b3764879e..529015dafd9 100644
--- a/tools/server/src/test/resources/logback-test.xml
+++ b/tools/server/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
 		</encoder>
 	</appender>
 	<root>
-		<level value="warn"/>
-		<appender-ref ref="STDOUT"/>
+		<level value="warn" />
+		<appender-ref ref="STDOUT" />
 	</root>
 </configuration>
diff --git a/tools/workbench/src/main/webapp/WEB-INF/glassfish-web.xml b/tools/workbench/src/main/webapp/WEB-INF/glassfish-web.xml
index 45beceaf63e..e2e88920816 100644
--- a/tools/workbench/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/tools/workbench/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glassfish-web-app>
-	<class-loader delegate="false"/>
+	<class-loader delegate="false" />
 </glassfish-web-app>