Merge pull request #38 from com-pas/develop

New Release

Author: Dennis Labordus

.github/workflows/release-project.yml

@@ -55,10 +55,17 @@ jobs:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
       - name: Set version with Maven
+        # Only set the version for the CoMPAS Modules, excluding the RiseClipse Modules.
         run: ./mvnw -B versions:set -DgroupId=org.lfenergy.compas.scl.validator -DnewVersion=${{ steps.extract_tagname.outputs.tagname }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Deploy with Maven to GitHub Packages and Docker Hub
-        run: ./mvnw -B -s custom_maven_settings.xml -Prelease clean deploy
+        # We need to pass the Repository information, because these are missing/need to be overwritten for the
+        # RiseClipse Submodules for which we can't update the POM files.
+        run: |
+          ./mvnw -B -s custom_maven_settings.xml \
+                 -DaltDeploymentRepository=github-packages-compas::default::https://maven.pkg.github.com/com-pas/compas-scl-validator \
+                 -Dmaven.deploy.skip=snapshots \
+                 -Prelease clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/src/main/resources/application.properties

@@ -22,6 +22,12 @@ quarkus.log.category."org.lfenergy.compas.scl.validator".level = INFO
 %dev.quarkus.log.level = DEBUG
 %dev.quarkus.log.category."org.lfenergy.compas.scl.validator".level = DEBUG
 
+# Test Profile overrides.
+%test.compas.validator.ocl.custom.directory = ./src/test/data/ocl
+%test.compas.validator.temp.directory       = ./target/data/temp
+
+%test.quarkus.log.category."org.lfenergy.compas.scl.validator.collector.CompasOclFileCollector".level = WARN
+
 # Smallrye JWT Properties (Microprofile)
 smallrye.jwt.verify.key.location = ${JWT_VERIFY_KEY:http://localhost:8089/auth/realms/compas/protocol/openid-connect/certs}
 mp.jwt.verify.issuer             = ${JWT_VERIFY_ISSUER:http://localhost:8089/auth/realms/compas}

riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java

@@ -80,7 +80,7 @@ protected List<URI> getDefaultOclFilesFromClasspath() {
      * Search (recursively) for all files in the directory passed. The filter can be used to filter files from the List.
      *
      * @param directoryName The directory in which top search for files (recursively).
-     * @param filter        The filter used to filter the list of file, use '(path) -> true' to return them all.
+     * @param filter        The filter used to filter the list of file, use '(path) -&gt; true' to return them all.
      * @return The list of Files as URI found.
      */
     protected List<URI> getFilesFromDirectory(String directoryName, Predicate<Path> filter) {

riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/SclModelLoaderTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.lfenergy.compas.scl.validator.exception.SclValidatorException;
+import org.lfenergy.compas.scl.validator.util.OclUtil;
 
 import java.io.IOException;
 
@@ -18,6 +19,9 @@ class SclModelLoaderTest {
 
     @BeforeEach
     void setup() {
+        // Initialize the OCL Libraries
+        OclUtil.setupOcl();
+
         loader = new SclModelLoader();
     }
 

riseclipse/validator-riseclipse/src/test/resources/simplelogger.properties

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+
+org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=true
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
+
+org.slf4j.simpleLogger.defaultLogLevel=debug
+
+org.slf4j.simpleLogger.log.org.lfenergy.compas.scl.validator.collector.CompasOclFileCollector=warn
+org.slf4j.simpleLogger.log.org.lfenergy.compas.scl.validator.util.OclUtil=info