Merge branch 'main' into contribute-frequency-and-angle-qks

.github/workflows/format.yml

@@ -36,7 +36,13 @@ jobs:
 
       # Check formatting and exit early (with success) if format is ok
       - name: Check formatting
-        run: mvn spotless:check && ( echo "Source was already formatted, nothing was touched." >> $GITHUB_STEP_SUMMARY ; exit 0 )
+        run: |
+          if mvn spotless:check; then
+            echo "Source was already formatted, nothing was touched." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          else
+            echo "Sources need formatting, we'll do that now"
+          fi
 
       # Apply formatting (changelog was touched)
       - name: Apply formatting

pom.xml

@@ -43,7 +43,7 @@
             Here are the phases and the execution ids that are linked to them (executed in the order they appear in this file):
                   validate                 defineAdditionalProperties, check-source-format
                   initialize               delete-applicable-units, format-sources, copy-rdf, copy-docs, copy-root-files
-                  generate-sources
+                  generate-sources         validate-shacl-files
                   process-sources          replace-version-placeholder
                   generate-resources
                   process-resources
@@ -176,8 +176,8 @@
                         SHACL-that the SHACL definition conform to SHACL
                         writes the validation report target/validation/validationReportShacl.ttl
                         -->
-                        <id>shacl-validate-shacl</id>
-                        <phase>test</phase>
+                        <id>validate-shacl-files</id>
+                        <phase>generate-sources</phase>
                         <goals>
                             <goal>validate</goal>
                         </goals>
@@ -186,13 +186,13 @@
                                 <validation>
                                     <!--skip>true</skip-->
                                     <shapes>
-                                        <include>target/dist/validation/SHACL-SHACL.ttl</include>
+                                        <include>src/build/validation/SHACL-SHACL.ttl</include>
                                     </shapes>
                                     <data>
                                         <include>
-                                            target/dist/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
-                                            target/dist/validation/COLLECTION_QUDT_USER_TESTS.ttl
-                                            target/dist/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
+                                            src/main/rdf/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
+                                            src/main/rdf/validation/COLLECTION_QUDT_USER_TESTS.ttl
+                                            src/main/rdf/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
                                         </include>
                                     </data>
                                     <outputFile>target/validation/validationReportShacl.ttl</outputFile>