Merge branch 'develop' into fix-release-action

Author: Dennis Labordus

.github/workflows/build-project.yml

@@ -28,12 +28,12 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker Register
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/release-project.yml

@@ -27,12 +27,12 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: Cache Docker Register
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/sonarcloud-analysis.yml

@@ -37,13 +37,13 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

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

@@ -26,12 +26,27 @@ public CompasOclFileCollector(String oclCustomDirectory) {
     @Override
     public List<URI> getOclFiles() {
         LOGGER.debug("Searching for OCL Files in classpath.");
-
         var oclFiles = new ArrayList<>(getDefaultOclFilesFromClasspath());
+
         if (oclCustomDirectory != null) {
             LOGGER.debug("Searching for OCL Files in custom directory '{}'.", oclCustomDirectory);
             oclFiles.addAll(getFilesFromDirectory(oclCustomDirectory, path -> path.toString().endsWith(".ocl")));
         }
+
+        logListOfFiles(oclFiles);
         return oclFiles;
     }
+
+    /**
+     * Log the list of files found during startup.
+     *
+     * @param oclFiles The List of Files found.
+     */
+    protected void logListOfFiles(ArrayList<URI> oclFiles) {
+        if (oclFiles != null && !oclFiles.isEmpty()) {
+            oclFiles.forEach(oclFile -> LOGGER.info("Found OCL File '{}'", oclFile));
+        } else {
+            LOGGER.warn("No OCL Files found!");
+        }
+    }
 }