Skip to content

Commit 4986aa4

Browse files
authored
Merge pull request #332 from com-pas/develop
chore: Merge develop into main
2 parents 4faa981 + 6e74242 commit 4986aa4

File tree

11 files changed

+40
-56
lines changed

11 files changed

+40
-56
lines changed

.github/workflows/automate-projects.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/release-please.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
permissions:
1010
contents: write
11+
packages: write
1112
pull-requests: write
1213

1314
name: release-please
@@ -19,8 +20,7 @@ jobs:
1920
- uses: google-github-actions/release-please-action@v4
2021
id: release
2122
with:
22-
release-type: maven
23-
package-name: compas-scl-auto-alignment
23+
target-branch: main
2424
- name: Checkout
2525
if: ${{ steps.release.outputs.release_created }}
2626
uses: actions/checkout@v4
@@ -39,13 +39,6 @@ jobs:
3939
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
4040
restore-keys: ${{ runner.os }}-m2
4141

42-
- name: Extract tag name
43-
if: ${{ steps.release.outputs.release_created }}
44-
id: extract_tagname
45-
shell: bash
46-
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
47-
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
48-
4942
- name: Set up JDK 17
5043
if: ${{ steps.release.outputs.release_created }}
5144
uses: actions/setup-java@v4
@@ -69,11 +62,6 @@ jobs:
6962
with:
7063
output_file: custom_maven_settings.xml
7164
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
72-
- name: Set version with Maven
73-
if: ${{ steps.release.outputs.release_created }}
74-
run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }}
75-
env:
76-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7765
- name: Deploy with Maven to GitHub Packages and Docker Hub
7866
if: ${{ steps.release.outputs.release_created }}
7967
run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ 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
1717

.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "0.5.1"
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2024 Alliander N.V.
2+
3+
SPDX-License-Identifier: Apache-2.0

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.9-1137
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154
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.9-1137
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

pom.xml

Lines changed: 7 additions & 7 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.12.1</compiler-plugin.version>
22+
<compiler-plugin.version>3.13.0</compiler-plugin.version>
2323
<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.7.1</quarkus.platform.version>
29-
<log4j2.version>2.23.0</log4j2.version>
30-
<powsybl.sld.version>4.0.0</powsybl.sld.version>
28+
<quarkus.platform.version>3.9.3</quarkus.platform.version>
29+
<log4j2.version>2.23.1</log4j2.version>
30+
<powsybl.sld.version>4.4.0</powsybl.sld.version>
3131
<gson.version>2.10.1</gson.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>
@@ -158,7 +158,7 @@ SPDX-License-Identifier: Apache-2.0
158158
<plugin>
159159
<groupId>org.apache.maven.plugins</groupId>
160160
<artifactId>maven-jar-plugin</artifactId>
161-
<version>3.3.0</version>
161+
<version>3.4.0</version>
162162
</plugin>
163163
</plugins>
164164
</pluginManagement>
@@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0
172172
<sonar.language>java</sonar.language>
173173

174174
<!-- JaCoCo Properties -->
175-
<jacoco.version>0.8.11</jacoco.version>
175+
<jacoco.version>0.8.12</jacoco.version>
176176
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
177177
<sonar.coverage.jacoco.xmlReportPaths>
178178
target/site/jacoco/jacoco.xml,
@@ -226,7 +226,7 @@ SPDX-License-Identifier: Apache-2.0
226226
<plugin>
227227
<groupId>org.apache.maven.plugins</groupId>
228228
<artifactId>maven-source-plugin</artifactId>
229-
<version>3.3.0</version>
229+
<version>3.3.1</version>
230230
<executions>
231231
<execution>
232232
<id>attach-sources</id>

release-please-config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"bootstrap-sha": "2dda752cf0d0ed71492731d76ff83acd4f903e10",
4+
"include-component-in-tag": false,
5+
"packages": {
6+
".": {
7+
"release-type": "maven",
8+
"package-name": "compas-scl-auto-alignment",
9+
"initial-version": "0.5.1"
10+
}
11+
}
12+
}

release-please-config.json.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2024 Alliander N.V.
2+
3+
SPDX-License-Identifier: Apache-2.0

0 commit comments

Comments
 (0)