Merge main into develop

.codex/skills/mvnf/scripts/mvnf.py

@@ -276,7 +276,7 @@ def main() -> int:
         print(f"Test selector: {test_selector} ({'failsafe' if args.it else 'surefire'})")
 
     clean_cmd = mvn_cmd + common_flags + ["-pl", module, "clean"]
-    install_cmd = mvn_cmd + (offline_flag + ["-T", "1C", "-Dmaven.repo.local=.m2_repo", "-Pquick", "clean", "install"])
+    install_cmd = mvn_cmd + (offline_flag + ["-T", "1C", "-Dmaven.repo.local=.m2_repo", "-Pquick", "install"])
 
     verify_cmd = mvn_cmd + common_flags + ["-pl", module]
     if test_selector is not None:
@@ -298,7 +298,7 @@ def main() -> int:
 
     rc, _ = _run(install_cmd, repo_root, args.tail, log_paths[1], args.stream)
     if rc != 0:
-        print("\n[mvnf] Root clean install failed.")
+        print("\n[mvnf] Root install failed.")
         return rc
 
     rc, _ = _run(verify_cmd, repo_root, args.tail, log_paths[2], args.stream)

.gitignore

@@ -55,3 +55,4 @@ e2e/test-results
 .m2_repo/
 .serena/
 .vscode
+/.codex/environments/environment.toml

core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/CONFIG.java

@@ -342,6 +342,12 @@ public static final class Shacl {
 		public final static IRI rdfsSubClassReasoning = createIRI(NAMESPACE,
 				"shacl.rdfsSubClassReasoning");
 
+		/**
+		 * <code>tag:rdf4j.org,2023:config/shacl.includeInferredStatements</code>
+		 */
+		public final static IRI includeInferredStatements = createIRI(NAMESPACE,
+				"shacl.includeInferredStatements");
+
 		/**
 		 * <code>tag:rdf4j.org,2023:config/shacl.performanceLogging</code>
 		 */

core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/RSX.java

@@ -40,6 +40,9 @@ public class RSX {
 	/** <var>http://rdf4j.org/shacl-extensions#targetShape</var> */
 	public final static IRI targetShape = create("targetShape");
 
+	public final static IRI rdfsSubClassReasoning = create("rdfsSubClassReasoning");
+	public final static IRI includeInferredStatements = create("includeInferredStatements");
+
 	public final static IRI dataGraph = create("dataGraph");
 	public final static IRI shapesGraph = create("shapesGraph");
 

core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/SchemaCachingRDFSInferencerConnection.java

@@ -114,7 +114,7 @@ void processForSchemaCache(Statement statement) {
 			sail.addSubPropertyOfStatement(
 					sail.getValueFactory().createStatement(subject, RDFS.SUBPROPERTYOF, RDFS.MEMBER));
 			schemaChange = true;
-		} else if (predicate.equals(RDF.TYPE)) {
+		} else if (predicate.equals(RDF.TYPE) && object instanceof Resource) {
 			if (!sail.hasType(((Resource) object))) {
 				sail.addType((Resource) object);
 				schemaChange = true;
@@ -276,11 +276,7 @@ private void addStatement(boolean actuallyAdd, Resource subject, IRI predicate,
 
 			}
 
-			if (predicate.equals(RDF.TYPE)) {
-				if (!(object instanceof Resource)) {
-					throw new SailException("Expected object to a a Resource: " + object.toString());
-				}
-
+			if (predicate.equals(RDF.TYPE) && object instanceof Resource) {
 				sail.resolveTypes((Resource) object)
 						.stream()
 						.peek(inferredType -> {

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailBaseConfiguration.java

@@ -35,6 +35,7 @@ abstract class ShaclSailBaseConfiguration extends NotifyingSailWrapper {
 	private boolean validationEnabled = ShaclSailConfig.VALIDATION_ENABLED_DEFAULT;
 	private boolean cacheSelectNodes = ShaclSailConfig.CACHE_SELECT_NODES_DEFAULT;
 	private boolean rdfsSubClassReasoning = ShaclSailConfig.RDFS_SUB_CLASS_REASONING_DEFAULT;
+	private boolean includeInferredStatements = true;
 	private boolean serializableValidation = ShaclSailConfig.SERIALIZABLE_VALIDATION_DEFAULT;
 	private boolean performanceLogging = ShaclSailConfig.PERFORMANCE_LOGGING_DEFAULT;
 	private boolean eclipseRdf4jShaclExtensions = ShaclSailConfig.ECLIPSE_RDF4J_SHACL_EXTENSIONS_DEFAULT;
@@ -146,6 +147,25 @@ public void setRdfsSubClassReasoning(boolean rdfsSubClassReasoning) {
 		this.rdfsSubClassReasoning = rdfsSubClassReasoning;
 	}
 
+	/**
+	 * Check if inferred statements from the base sail should be used during SHACL validation when
+	 * {@link #isRdfsSubClassReasoning()} is disabled.
+	 *
+	 * @return <code>true</code> if inferred statements should be considered, <code>false</code> otherwise.
+	 */
+	public boolean isIncludeInferredStatements() {
+		return includeInferredStatements;
+	}
+
+	/**
+	 * Allow SHACL validation to use inferred statements from the base sail when RDFS subclass reasoning is disabled.
+	 *
+	 * @param includeInferredStatements default true
+	 */
+	public void setIncludeInferredStatements(boolean includeInferredStatements) {
+		this.includeInferredStatements = includeInferredStatements;
+	}
+
 	/**
 	 * Disable the SHACL validation on commit()
 	 */