fix ci and minor shacl caching fix (eclipse-rdf4j#5270)

Author: hmottestad

.github/workflows/develop-status.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         java-version: ${{ matrix.jdk }}
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/main-status.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         java-version: ${{ matrix.jdk }}
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/pr-verify.yml

@@ -15,7 +15,7 @@ jobs:
       with:
         java-version: ${{ matrix.jdk }}
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -48,7 +48,7 @@ jobs:
       with:
         java-version: 11
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
@@ -81,7 +81,7 @@ jobs:
       with:
         java-version: 11
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
@@ -107,7 +107,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
@@ -133,7 +133,7 @@ jobs:
         with:
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}

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

@@ -25,6 +25,7 @@
 public class ShaclSailValidationException extends SailException implements ValidationException {
 
 	private final ValidationReport validationReport;
+	private Model cachedModel = null;
 
 	ShaclSailValidationException(ValidationReport validationReport) {
 		super("Failed SHACL validation");
@@ -36,6 +37,9 @@ public class ShaclSailValidationException extends SailException implements Valid
 	 */
 	@Override
 	public Model validationReportAsModel() {
+		if (cachedModel != null) {
+			return cachedModel;
+		}
 		Model model = getValidationReport().asModel();
 
 		model.setNamespace(RSX.NS);
@@ -45,6 +49,8 @@ public Model validationReportAsModel() {
 		model.setNamespace(RDF.NS);
 		model.setNamespace(RDFS.NS);
 
+		cachedModel = model;
+
 		return model;
 	}