Skip to content

Commit cd4ce8e

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #333 from com-pas/develop
Update Main
2 parents 8fbf32b + d575f1c commit cd4ce8e

File tree

8 files changed

+29
-19
lines changed

8 files changed

+29
-19
lines changed

‎.github/workflows/automate-projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
steps:
1515
- name: add-new-issues-to-organization-based-project-column
1616
if: github.event_name == 'issues' && github.event.action == 'opened'
17-
uses: alex-page/github-project-automation-plus@v0.8.3
17+
uses: alex-page/github-project-automation-plus@v0.9.0
1818
with:
1919
project: CoMPAS Issues Overview Board
2020
column: To do
2121
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
2222
- name: add-new-pull-request-to-organization-based-project-column
2323
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
24-
uses: alex-page/github-project-automation-plus@v0.8.3
24+
uses: alex-page/github-project-automation-plus@v0.9.0
2525
with:
2626
project: CoMPAS Pull Request Overview Board
2727
column: To do

‎.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java-version: '17'
3131

3232
- name: Create custom Maven Settings.xml
33-
uses: whelk-io/maven-settings-xml-action@v21
33+
uses: whelk-io/maven-settings-xml-action@v22
3434
with:
3535
output_file: custom_maven_settings.xml
3636
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

‎.github/workflows/release-please.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
release_please:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: google-github-actions/release-please-action@v3
19+
- uses: google-github-actions/release-please-action@v4
2020
id: release
2121
with:
2222
release-type: maven
@@ -42,7 +42,7 @@ jobs:
4242
java-version: '17'
4343

4444
- name: Create custom Maven Settings.xml
45-
uses: whelk-io/maven-settings-xml-action@v21
45+
uses: whelk-io/maven-settings-xml-action@v22
4646
if: ${{ steps.release.outputs.release_created }}
4747
with:
4848
output_file: custom_maven_settings.xml

‎.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
java-version: '17'
3232

3333
- name: Create custom Maven Settings.xml
34-
uses: whelk-io/maven-settings-xml-action@v21
34+
uses: whelk-io/maven-settings-xml-action@v22
3535
with:
3636
output_file: custom_maven_settings.xml
3737
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

‎.github/workflows/sonarcloud-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: cat $GITHUB_EVENT_PATH
2020
- name: Download PR number artifact
2121
if: github.event.workflow_run.event == 'pull_request'
22-
uses: dawidd6/action-download-artifact@v2
22+
uses: dawidd6/action-download-artifact@v3
2323
with:
2424
workflow: SonarCloud Build
2525
run_id: ${{ github.event.workflow_run.id }}
@@ -54,13 +54,13 @@ jobs:
5454
git checkout ${{ github.event.workflow_run.head_branch }}
5555
git clean -ffdx && git reset --hard HEAD
5656
- name: Cache SonarCloud packages
57-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5858
with:
5959
path: ~/.sonar/cache
6060
key: ${{ runner.os }}-sonar
6161
restore-keys: ${{ runner.os }}-sonar
6262
- name: Cache Maven packages
63-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.m2
6666
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -79,7 +79,7 @@ jobs:
7979
-Dsonar.projectKey=com-pas_compas-core \
8080
-Dsonar.organization=com-pas )"
8181
- name: Create custom Maven Settings.xml
82-
uses: whelk-io/maven-settings-xml-action@v21
82+
uses: whelk-io/maven-settings-xml-action@v22
8383
with:
8484
output_file: custom_maven_settings.xml
8585
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

‎.github/workflows/sonarcloud-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
fetch-depth: 0
3232

3333
- name: Cache SonarCloud packages
34-
uses: actions/cache@v3
34+
uses: actions/cache@v4
3535
with:
3636
path: ~/.sonar/cache
3737
key: ${{ runner.os }}-sonar
3838
restore-keys: ${{ runner.os }}-sonar
3939
- name: Cache Maven packages
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ~/.m2
4343
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -50,7 +50,7 @@ jobs:
5050
java-version: '17'
5151

5252
- name: Create custom Maven Settings.xml
53-
uses: whelk-io/maven-settings-xml-action@v21
53+
uses: whelk-io/maven-settings-xml-action@v22
5454
with:
5555
output_file: custom_maven_settings.xml
5656
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
@@ -71,7 +71,7 @@ jobs:
7171
run: echo ${{ github.event.number }} > PR_NUMBER.txt
7272
- name: Archive PR number
7373
if: github.event_name == 'pull_request'
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: PR_NUMBER
7777
path: PR_NUMBER.txt

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818

1919
<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
20-
<quarkus.platform.version>3.6.1</quarkus.platform.version>
21-
<log4j2.version>2.22.0</log4j2.version>
20+
<quarkus.platform.version>3.7.4</quarkus.platform.version>
21+
<log4j2.version>2.23.0</log4j2.version>
2222
<openpojo.version>0.9.1</openpojo.version>
2323
</properties>
2424

@@ -139,13 +139,13 @@ SPDX-License-Identifier: Apache-2.0
139139
<plugin>
140140
<groupId>org.apache.maven.plugins</groupId>
141141
<artifactId>maven-compiler-plugin</artifactId>
142-
<version>3.11.0</version>
142+
<version>3.12.1</version>
143143
</plugin>
144144

145145
<plugin>
146146
<groupId>org.apache.maven.plugins</groupId>
147147
<artifactId>maven-surefire-plugin</artifactId>
148-
<version>3.2.2</version>
148+
<version>3.2.5</version>
149149
</plugin>
150150

151151
<plugin>

‎scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0
1818
Version 1.4 Release 2023/02/28
1919
Version 1.5 Release 2023/04/05
2020
Version 1.6 Release 2023/12/06
21+
Version 1.7 Release 2024/02/07
2122
</xs:documentation>
2223
</xs:annotation>
2324

@@ -127,10 +128,19 @@ SPDX-License-Identifier: Apache-2.0
127128
<xs:enumeration value="AUT"/>
128129
<xs:enumeration value="PDIF"/>
129130
<xs:enumeration value="GRP"/>
131+
<xs:enumeration value="GRPR"/>
130132
<xs:enumeration value="ASLD"/>
131133
<xs:enumeration value="GW"/>
132134
<xs:enumeration value="TG"/>
133135
<xs:enumeration value="TOPO"/>
136+
<xs:enumeration value="SWC"/>
137+
<xs:enumeration value="SWT"/>
138+
<xs:enumeration value="SW"/>
139+
<xs:enumeration value="OUT"/>
140+
<xs:enumeration value="CLUS"/>
141+
<xs:enumeration value="VIRT"/>
142+
<xs:enumeration value="ICT"/>
143+
<xs:enumeration value="SYN"/>
134144
<xs:enumeration value="ADEFINIR"/>
135145
<xs:enumeration value="IEDTEST"/>
136146
</xs:restriction>
@@ -387,4 +397,4 @@ SPDX-License-Identifier: Apache-2.0
387397
<xs:element name="SystemVersion" type="tCompasSystemVersion"/>
388398
<xs:element name="Function" type="tCompasFunction"/>
389399
<xs:element name="Topo" type="tCompasTopo"/>
390-
</xs:schema>
400+
</xs:schema>

0 commit comments

Comments
 (0)