Merge main into develop (#5450)

Author: hmottestad

AGENTS.md

@@ -593,16 +593,19 @@ Do **not** modify existing headers’ years.
     * `mvn -o verify` (long; only when appropriate)
 * Slow tests (entire repo):
 
-    * `mvn -o verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
+    * `mvn -o verify -PslowTestsOnly,-skipSlowTests | tail -500`
 * Slow tests (by module):
 
-    * `mvn -o -pl <module> verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
+    * `mvn -o -pl <module> verify -PslowTestsOnly,-skipSlowTests | tail -500`
+* Slow tests (specific test):
+
+  * `mvn -o -pl core/sail/shacl -PslowTestsOnly,-skipSlowTests -Dtest=ClassName#method verify | tail -500`
 * Integration tests (entire repo):
 
-    * `mvn -o verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
+    * `mvn -o verify -PskipUnitTests | tail -500`
 * Integration tests (by module):
 
-    * `mvn -o -pl <module> verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
+    * `mvn -o -pl <module> verify -PskipUnitTests | tail -500`
 * Useful flags:
 
     * `-Dtest=ClassName`

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShutdownDuringValidationIT.java

@@ -39,6 +39,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -127,7 +128,7 @@ public void shutdownDuringValidation(int sleepMillis) {
 				commitAndExpect(connection, EXPECTED_REPOSITORY_SIZE, 0);
 
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					return;
 				}
 				logger.error("Error during test execution", e);
@@ -146,15 +147,15 @@ public void shutdownDuringValidation(int sleepMillis) {
 				}
 
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				} else {
 					throw e;
 				}
 			}
 		} catch (Exception e) {
-			if (e instanceof RepositoryException && e.getCause() instanceof InterruptedException) {
+			if (e instanceof RepositoryException && causedByInterruptedException(e)) {
 				System.out.println(e);
 				return;
 			}
@@ -193,7 +194,7 @@ public void shutdownDuringValidationTransactional(int sleepMillis) {
 
 				commitAndExpect(connection, EXPECTED_REPOSITORY_SIZE + 1, 1);
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				}
@@ -211,15 +212,15 @@ public void shutdownDuringValidationTransactional(int sleepMillis) {
 						.isIn(0L, 1L, (long) (EXPECTED_REPOSITORY_SIZE + 1));
 
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				} else {
 					throw e;
 				}
 			}
 		} catch (Exception e) {
-			if (e instanceof RepositoryException && e.getCause() instanceof InterruptedException) {
+			if (e instanceof RepositoryException && causedByInterruptedException(e)) {
 				System.out.println(e);
 				return;
 			}
@@ -256,7 +257,7 @@ public void shutdownDuringValidationFailure(int sleepMillis) {
 
 				commitAndExpect(connection, 0, 0);
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				}
@@ -270,15 +271,15 @@ public void shutdownDuringValidationFailure(int sleepMillis) {
 				assertEquals(0, size,
 						"The repository should be empty because the transaction always fails validation.");
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				} else {
 					throw e;
 				}
 			}
 		} catch (Exception e) {
-			if (e instanceof RepositoryException && e.getCause() instanceof InterruptedException) {
+			if (e instanceof RepositoryException && causedByInterruptedException(e)) {
 				System.out.println(e);
 				return;
 			}
@@ -314,7 +315,7 @@ public void shutdownDuringValidationFailureNonParallel(int sleepMillis) {
 
 				commitAndExpect(connection, 0, 0);
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				}
@@ -329,15 +330,15 @@ public void shutdownDuringValidationFailureNonParallel(int sleepMillis) {
 				assertEquals(0, size,
 						"The repository should be empty because the transaction always fails validation.");
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				} else {
 					throw e;
 				}
 			}
 		} catch (Exception e) {
-			if (e instanceof RepositoryException && e.getCause() instanceof InterruptedException) {
+			if (e instanceof RepositoryException && causedByInterruptedException(e)) {
 				System.out.println(e);
 				return;
 			}
@@ -382,7 +383,7 @@ public void shutdownDuringValidationTransactionalNonParallel(int sleepMillis) {
 					// ignore this exception
 					return;
 				}
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				}
@@ -403,15 +404,15 @@ public void shutdownDuringValidationTransactionalNonParallel(int sleepMillis) {
 						.as("Repository size")
 						.isIn(0L, 1L, (long) (EXPECTED_REPOSITORY_SIZE + 1));
 			} catch (RepositoryException e) {
-				if (e.getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 					return;
 				} else {
 					throw e;
 				}
 			}
 		} catch (Exception e) {
-			if (e instanceof RepositoryException && e.getCause() instanceof InterruptedException) {
+			if (e instanceof RepositoryException && causedByInterruptedException(e)) {
 				System.out.println(e);
 				return;
 			}
@@ -427,6 +428,40 @@ public void shutdownDuringValidationTransactionalNonParallel(int sleepMillis) {
 		}
 	}
 
+	@Test
+	void nestedInterruptedExceptionShouldBeDetected() {
+		InterruptedException interruptedException = new InterruptedException("nested");
+		SailException sailException = new SailException("wrapper", new SailException("inner", interruptedException));
+		RepositoryException repositoryException = new RepositoryException("top", sailException);
+
+		boolean handled = causedByInterruptedException(repositoryException);
+
+		assertThat(handled).as("Should detect nested InterruptedException").isTrue();
+	}
+
+	private static boolean causedByInterruptedException(Throwable throwable) {
+		return causedByInterruptedExceptionRecursion(throwable, 10);
+	}
+
+	private static boolean causedByInterruptedExceptionRecursion(Throwable throwable, int maxDepth) {
+		if (maxDepth < 0) {
+			throw new IllegalStateException("Too deep");
+		}
+		if (throwable == null) {
+			return false;
+		}
+		if (throwable instanceof InterruptedException) {
+			return true;
+		}
+		if (throwable instanceof InterruptedSailException) {
+			return true;
+		}
+		if (throwable.getCause() == throwable) {
+			return false;
+		}
+		return causedByInterruptedExceptionRecursion(throwable.getCause(), maxDepth - 1);
+	}
+
 	private static void commitAndExpect(SailRepositoryConnection connection, long expected, long failedExpected) {
 		try {
 			connection.commit();
@@ -442,9 +477,7 @@ private static void commitAndExpect(SailRepositoryConnection connection, long ex
 			try {
 				connection.rollback();
 			} catch (Exception e) {
-				if (e.getCause() instanceof InterruptedException) {
-					// ignore this exception
-				} else if (e.getCause() != null && e.getCause().getCause() instanceof InterruptedException) {
+				if (causedByInterruptedException(e)) {
 					// ignore this exception
 				} else {
 					throw e;

site/content/download.md

@@ -5,15 +5,15 @@ toc: true
 
 You can either retrieve RDF4J via Apache Maven, or download the SDK or onejar directly.
 
-## RDF4J 5.1.5 (latest)
+## RDF4J 5.1.6 (latest)
 
-RDF4J 5.1.5 is our latest stable release. It requires Java 11 minimally.
-For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.5).
+RDF4J 5.1.6 is our latest stable release. It requires Java 11 minimally.
+For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.6).
 
-- [RDF4J 5.1.5 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.5-sdk.zip)<br/>
+- [RDF4J 5.1.6 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.6-sdk.zip)<br/>
   Full Eclipse RDF4J SDK, containing all libraries, RDF4J Server, Workbench, and Console applications, and Javadoc API.
 
-- [RDF4J 5.1.5 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.5-onejar.jar)<br/>
+- [RDF4J 5.1.6 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.6-onejar.jar)<br/>
   Single jar file for easy inclusion of the full RDF4J toolkit in your Java project.
 
 - [RDF4J artifacts](https://search.maven.org/search?q=org.eclipse.rdf4j) on the [Maven Central Repository](http://search.maven.org/)
@@ -28,7 +28,7 @@ You can include RDF4J as a Maven dependency in your Java project by including th
         <dependency>
             <groupId>org.eclipse.rdf4j</groupId>
             <artifactId>rdf4j-bom</artifactId>
-            <version>5.1.5</version>
+            <version>5.1.6</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

site/content/news/rdf4j-516.md

@@ -0,0 +1,14 @@
+---
+title: "RDF4J 5.1.6 released"
+date: 2025-09-24T22:00:30+0200
+layout: "single"
+categories: ["news"]
+---
+RDF4J 5.1.6 is now available. This is a patch release fixing 12 bugs.
+
+For more details, have a look at the [release notes](/release-notes/5.1.6).
+<!--more-->
+### Links
+
+- [Download RDF4J](/download/)
+- [release notes](/release-notes/5.1.6).

site/content/release-notes/5.1.6.md

@@ -0,0 +1,11 @@
+---
+title: "5.1.6"
+toc: true
+---
+RDF4J 5.1.6 is a patch release that fixes 12 issues.
+
+For a complete overview, see [all issues fixed in 5.1.6](https://github.com/eclipse/rdf4j/milestone/122?closed=1).
+
+### Acknowledgements
+
+This release was made possible by contributions from [Jerven Bolleman](https://github.com/JervenBolleman), [Piotr Sowiński](https://github.com/Ostrzyciel), [Håvard M. Ottestad](https://github.com/hmottestad) and [kenwenzel](https://github.com/kenwenzel).