Skip to content

Commit a66e151

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #376 from com-pas/develop
Release
2 parents 9657b6d + bc15f8f commit a66e151

File tree

57 files changed

+325
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+325
-465
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ 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') }}
@@ -33,14 +33,14 @@ jobs:
3333
id: buildx
3434
uses: docker/setup-buildx-action@v3
3535
- name: Set up JDK 17
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
distribution: 'zulu'
3939
java-version: '17'
4040
cache: 'maven'
4141

4242
- name: Create custom Maven Settings.xml
43-
uses: whelk-io/maven-settings-xml-action@v21
43+
uses: whelk-io/maven-settings-xml-action@v22
4444
with:
4545
output_file: custom_maven_settings.xml
4646
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: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,75 @@
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-
release_project:
13-
name: Release project
16+
release_please:
1417
runs-on: ubuntu-latest
15-
timeout-minutes: 30
16-
1718
steps:
19+
- uses: google-github-actions/release-please-action@v4
20+
id: release
21+
with:
22+
release-type: maven
23+
package-name: compas-scl-data-service
1824
- name: Checkout
25+
if: ${{ steps.release.outputs.release_created }}
1926
uses: actions/checkout@v4
2027

2128
- name: Cache Docker Register
22-
uses: actions/cache@v3
29+
if: ${{ steps.release.outputs.release_created }}
30+
uses: actions/cache@v4
2331
with:
2432
path: /tmp/.buildx-cache
2533
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
2634

2735
- name: Extract tag name
36+
if: ${{ steps.release.outputs.release_created }}
2837
id: extract_tagname
2938
shell: bash
3039
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
3140
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
3241

3342
- name: Set up JDK 17
34-
uses: actions/setup-java@v3
43+
if: ${{ steps.release.outputs.release_created }}
44+
uses: actions/setup-java@v4
3545
with:
3646
distribution: 'zulu'
3747
java-version: '17'
3848
cache: 'maven'
3949
- name: Set up Docker Buildx
50+
if: ${{ steps.release.outputs.release_created }}
4051
id: buildx
4152
uses: docker/setup-buildx-action@v3
4253
- name: Login to Docker Hub
54+
if: ${{ steps.release.outputs.release_created }}
4355
uses: docker/login-action@v3
4456
with:
4557
username: ${{ secrets.DOCKER_HUB_USERNAME }}
4658
password: ${{ secrets.DOCKER_HUB_TOKEN }}
4759

4860
- name: Create custom Maven Settings.xml
49-
uses: whelk-io/maven-settings-xml-action@v21
61+
if: ${{ steps.release.outputs.release_created }}
62+
uses: whelk-io/maven-settings-xml-action@v22
5063
with:
5164
output_file: custom_maven_settings.xml
5265
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5366
- name: Set version with Maven
67+
if: ${{ steps.release.outputs.release_created }}
5468
run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }}
5569
env:
5670
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5771
- name: Deploy with Maven to GitHub Packages and Docker Hub
72+
if: ${{ steps.release.outputs.release_created }}
5873
run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy
5974
env:
6075
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/reuse.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@v4
1515
- name: REUSE Compliance Check
16-
uses: fsfe/reuse-action@v2
16+
uses: fsfe/reuse-action@v3

‎.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,21 +54,21 @@ 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

6363
- name: Cache Maven packages
64-
uses: actions/cache@v3
64+
uses: actions/cache@v4
6565
with:
6666
path: ~/.m2
6767
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
6868
restore-keys: ${{ runner.os }}-m2
6969

7070
- name: Set up JDK 17
71-
uses: actions/setup-java@v3
71+
uses: actions/setup-java@v4
7272
with:
7373
distribution: 'zulu'
7474
java-version: '17'
@@ -79,7 +79,7 @@ jobs:
7979
-Dsonar.projectKey=com-pas_compas-scl-data-service \
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-data-service/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-postgresql.jvm‎

Lines changed: 2 additions & 2 deletions
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
@@ -37,7 +37,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
3737
&& chown 1001:root /deployments \
3838
&& curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
3939
&& chown 1001 /deployments/run-java.sh \
40-
&& chmod 540 /deployments/run-java.sh \
40+
&& chmod 755 /deployments/run-java.sh \
4141
&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security
4242

4343
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.

‎app/src/main/docker/Dockerfile-postgresql.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 \

0 commit comments

Comments
 (0)