Skip to content

Commit 4faa981

Browse files
juancho0202juancho0202
authored
Merge pull request #292 from com-pas/develop
merge develop into main
2 parents 2dda752 + b2cbb49 commit 4faa981

File tree

12 files changed

+75
-43
lines changed

12 files changed

+75
-43
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
uses: actions/checkout@v4
2525

2626
- name: Cache Docker Register
27-
uses: actions/cache@v3
27+
uses: actions/cache@v4
2828
with:
2929
path: /tmp/.buildx-cache
3030
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
3131
- name: Cache Maven packages
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: ~/.m2
3535
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -39,13 +39,13 @@ jobs:
3939
id: buildx
4040
uses: docker/setup-buildx-action@v3
4141
- name: Set up JDK 17
42-
uses: actions/setup-java@v3.11.0
42+
uses: actions/setup-java@v4
4343
with:
4444
distribution: 'zulu'
4545
java-version: '17'
4646

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

‎.github/workflows/release-project.yml‎ renamed to ‎.github/workflows/release-please.yml‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,81 @@
1-
# SPDX-FileCopyrightText: 2022 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2023 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
4+
on:
5+
push:
6+
branches:
7+
- main
48

5-
name: Release Project
9+
permissions:
10+
contents: write
11+
pull-requests: write
612

7-
on:
8-
release:
9-
types: [ released ]
13+
name: release-please
1014

1115
jobs:
12-
push_to_registry:
13-
name: Build and publish
16+
release_please:
1417
runs-on: ubuntu-latest
15-
1618
steps:
19+
- uses: google-github-actions/release-please-action@v4
20+
id: release
21+
with:
22+
release-type: maven
23+
package-name: compas-scl-auto-alignment
1724
- name: Checkout
25+
if: ${{ steps.release.outputs.release_created }}
1826
uses: actions/checkout@v4
1927

2028
- name: Cache Docker Register
21-
uses: actions/cache@v3
29+
if: ${{ steps.release.outputs.release_created }}
30+
uses: actions/cache@v4
2231
with:
2332
path: /tmp/.buildx-cache
2433
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
2534
- name: Cache Maven packages
26-
uses: actions/cache@v3
35+
if: ${{ steps.release.outputs.release_created }}
36+
uses: actions/cache@v4
2737
with:
2838
path: ~/.m2
2939
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3040
restore-keys: ${{ runner.os }}-m2
3141

3242
- name: Extract tag name
43+
if: ${{ steps.release.outputs.release_created }}
3344
id: extract_tagname
3445
shell: bash
3546
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
3647
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
3748

3849
- name: Set up JDK 17
39-
uses: actions/[email protected]
50+
if: ${{ steps.release.outputs.release_created }}
51+
uses: actions/setup-java@v4
4052
with:
4153
distribution: 'zulu'
4254
java-version: '17'
4355
- name: Set up Docker Buildx
56+
if: ${{ steps.release.outputs.release_created }}
4457
id: buildx
4558
uses: docker/setup-buildx-action@v3
4659
- name: Login to Docker Hub
60+
if: ${{ steps.release.outputs.release_created }}
4761
uses: docker/login-action@v3
4862
with:
4963
username: ${{ secrets.DOCKER_HUB_USERNAME }}
5064
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5165

5266
- name: Create custom Maven Settings.xml
53-
uses: whelk-io/maven-settings-xml-action@v21
67+
if: ${{ steps.release.outputs.release_created }}
68+
uses: whelk-io/maven-settings-xml-action@v22
5469
with:
5570
output_file: custom_maven_settings.xml
5671
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5772
- name: Set version with Maven
73+
if: ${{ steps.release.outputs.release_created }}
5874
run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }}
5975
env:
6076
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6177
- name: Deploy with Maven to GitHub Packages and Docker Hub
78+
if: ${{ steps.release.outputs.release_created }}
6279
run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
6380
env:
6481
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sonarcloud-analysis.yml‎

Lines changed: 5 additions & 5 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,20 +54,20 @@ 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') }}
6767
restore-keys: ${{ runner.os }}-m2
6868

6969
- name: Set up JDK 17
70-
uses: actions/setup-java@v3.11.0
70+
uses: actions/setup-java@v4
7171
with:
7272
distribution: 'zulu'
7373
java-version: '17'
@@ -79,7 +79,7 @@ jobs:
7979
-Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ 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') }}
4444
restore-keys: ${{ runner.os }}-m2
4545

4646
- name: Set up JDK 17
47-
uses: actions/setup-java@v3
47+
uses: actions/setup-java@v4
4848
with:
4949
distribution: 'zulu'
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

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2023 Alliander N.V.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
For older changelogs, please check the release tag on GitHub.

‎SECURITY.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2023 Alliander N.V.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
# Security Policy
7+
8+
## Reporting a Vulnerability
9+
10+
Please go to [Security Advisories](https://github.com/com-pas/compas-scl-auto-alignment/security/advisories) to privately report a security vulnerability,
11+
our contributors will try to respond within a week of your report with a rough plan for a fix and new tests.

‎app/src/main/docker/Dockerfile.jvm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

‎app/src/main/docker/Dockerfile.native‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# docker run -i --rm -p 8080:8080 quarkus/app
1515
#
1616
###
17-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121

22-
<compiler-plugin.version>3.11.0</compiler-plugin.version>
23-
<surefire-plugin.version>3.2.2</surefire-plugin.version>
22+
<compiler-plugin.version>3.12.1</compiler-plugin.version>
23+
<surefire-plugin.version>3.2.5</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

2626
<compas.core.version>0.16.0</compas.core.version>
2727

28-
<quarkus.platform.version>3.5.1</quarkus.platform.version>
29-
<log4j2.version>2.21.1</log4j2.version>
30-
<powsybl.sld.version>3.3.2</powsybl.sld.version>
28+
<quarkus.platform.version>3.7.1</quarkus.platform.version>
29+
<log4j2.version>2.23.0</log4j2.version>
30+
<powsybl.sld.version>4.0.0</powsybl.sld.version>
3131
<gson.version>2.10.1</gson.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>
@@ -240,7 +240,7 @@ SPDX-License-Identifier: Apache-2.0
240240
<plugin>
241241
<groupId>org.apache.maven.plugins</groupId>
242242
<artifactId>maven-javadoc-plugin</artifactId>
243-
<version>3.6.2</version>
243+
<version>3.6.3</version>
244244
<executions>
245245
<execution>
246246
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)