Merge pull request #333 from com-pas/develop

Update Main
com-pas · Feb 28, 2024 · cd4ce8e · cd4ce8e
2 parents 8fbf32b + d575f1c
commit cd4ce8e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml
@@ -14,14 +14,14 @@ jobs:
     steps:
       - name: add-new-issues-to-organization-based-project-column
         if: github.event_name == 'issues' && github.event.action == 'opened'
-        uses: alex-page/github-project-automation-plus@v0.8.3
+        uses: alex-page/github-project-automation-plus@v0.9.0
         with:
           project: CoMPAS Issues Overview Board
           column: To do
           repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
       - name: add-new-pull-request-to-organization-based-project-column
         if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
-        uses: alex-page/github-project-automation-plus@v0.8.3
+        uses: alex-page/github-project-automation-plus@v0.9.0
         with:
           project: CoMPAS Pull Request Overview Board
           column: To do

diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -30,7 +30,7 @@ jobs:
           java-version: '17'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -16,7 +16,7 @@ jobs:
   release_please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         id: release
         with:
           release-type: maven
@@ -42,7 +42,7 @@ jobs:
           java-version: '17'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         if: ${{ steps.release.outputs.release_created }}
         with:
           output_file: custom_maven_settings.xml

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -31,7 +31,7 @@ jobs:
           java-version: '17'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -19,7 +19,7 @@ jobs:
         run: cat $GITHUB_EVENT_PATH
       - name: Download PR number artifact
         if: github.event.workflow_run.event == 'pull_request'
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           workflow: SonarCloud Build
           run_id: ${{ github.event.workflow_run.id }}
@@ -54,13 +54,13 @@ jobs:
           git checkout ${{ github.event.workflow_run.head_branch }}
           git clean -ffdx && git reset --hard HEAD
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -79,7 +79,7 @@ jobs:
             -Dsonar.projectKey=com-pas_compas-core \
             -Dsonar.organization=com-pas )"
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml
@@ -31,13 +31,13 @@ jobs:
           fetch-depth: 0
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -50,7 +50,7 @@ jobs:
           java-version: '17'
 
       - name: Create custom Maven Settings.xml
-        uses: whelk-io/maven-settings-xml-action@v21
+        uses: whelk-io/maven-settings-xml-action@v22
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
@@ -71,7 +71,7 @@ jobs:
         run: echo ${{ github.event.number }} > PR_NUMBER.txt
       - name: Archive PR number
         if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PR_NUMBER
           path: PR_NUMBER.txt
diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
-        <quarkus.platform.version>3.6.1</quarkus.platform.version>
-        <log4j2.version>2.22.0</log4j2.version>
+        <quarkus.platform.version>3.7.4</quarkus.platform.version>
+        <log4j2.version>2.23.0</log4j2.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 
@@ -139,13 +139,13 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.2.5</version>
                 </plugin>
 
                 <plugin>

diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
@@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0
             Version 1.4 Release 2023/02/28
             Version 1.5 Release 2023/04/05
             Version 1.6 Release 2023/12/06
+            Version 1.7 Release 2024/02/07
         </xs:documentation>
     </xs:annotation>
 
@@ -127,10 +128,19 @@ SPDX-License-Identifier: Apache-2.0
             <xs:enumeration value="AUT"/>
             <xs:enumeration value="PDIF"/>
             <xs:enumeration value="GRP"/>
+            <xs:enumeration value="GRPR"/>
             <xs:enumeration value="ASLD"/>
             <xs:enumeration value="GW"/>
             <xs:enumeration value="TG"/>
             <xs:enumeration value="TOPO"/>
+            <xs:enumeration value="SWC"/>
+            <xs:enumeration value="SWT"/>
+            <xs:enumeration value="SW"/>
+            <xs:enumeration value="OUT"/>
+            <xs:enumeration value="CLUS"/>
+            <xs:enumeration value="VIRT"/>
+            <xs:enumeration value="ICT"/>
+            <xs:enumeration value="SYN"/>
             <xs:enumeration value="ADEFINIR"/>
             <xs:enumeration value="IEDTEST"/>
         </xs:restriction>
@@ -387,4 +397,4 @@ SPDX-License-Identifier: Apache-2.0
     <xs:element name="SystemVersion" type="tCompasSystemVersion"/>
     <xs:element name="Function" type="tCompasFunction"/>
     <xs:element name="Topo" type="tCompasTopo"/>
-</xs:schema>
+</xs:schema>