Skip to content

Commit c8cb3b4

Browse files
authored
Merge branch 'develop' into dependabot/maven/com.powsybl-powsybl-single-line-diagram-core-4.0.0
Signed-off-by: Juan Munoz <[email protected]>
2 parents 7396bfd + 1e3c28d commit c8cb3b4

File tree

5 files changed

+38
-9
lines changed

5 files changed

+38
-9
lines changed

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
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:
16+
release_please:
17+
runs-on: ubuntu-latest
18+
outputs:
19+
release_created: ${{ steps.release.outputs.release_created }}
20+
steps:
21+
- uses: google-github-actions/release-please-action@v3
22+
id: release
23+
with:
24+
release-type: maven
25+
package-name: compas-scl-auto-alignment
26+
# The logic below handles the docker hub publication:
1227
push_to_registry:
28+
needs: release_please
29+
if: needs.release_please.outputs.release_created == "true"
1330
name: Build and publish
1431
runs-on: ubuntu-latest
32+
timeout-minutes: 15
1533

1634
steps:
1735
- name: Checkout

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-1029
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-1029
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ SPDX-License-Identifier: Apache-2.0
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>
28+
<quarkus.platform.version>3.5.3</quarkus.platform.version>
29+
<log4j2.version>2.22.0</log4j2.version>
3030
<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>

0 commit comments

Comments
 (0)