diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml deleted file mode 100644 index ec1a05d..0000000 --- a/.github/workflows/automate-projects.yml +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Alliander N.V. -# -# SPDX-License-Identifier: Apache-2.0 - -name: Add issues and pull request to project boards - -on: [ issues, pull_request, pull_request_target ] - -jobs: - github-actions-automate-projects: - runs-on: ubuntu-latest - - if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} - steps: - - name: add-new-issues-to-organization-based-project-column - if: github.event_name == 'issues' && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.9.0 - with: - project: CoMPAS Issues Overview Board - column: To do - repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} - - name: add-new-pull-request-to-organization-based-project-column - if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.9.0 - with: - project: CoMPAS Pull Request Overview Board - column: To do - repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 3e265c1..bccbe0b 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -8,6 +8,7 @@ on: permissions: contents: write + packages: write pull-requests: write name: release-please @@ -19,8 +20,7 @@ jobs: - uses: google-github-actions/release-please-action@v4 id: release with: - release-type: maven - package-name: compas-scl-auto-alignment + target-branch: main - name: Checkout if: ${{ steps.release.outputs.release_created }} uses: actions/checkout@v4 @@ -39,13 +39,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Extract tag name - if: ${{ steps.release.outputs.release_created }} - id: extract_tagname - shell: bash - # Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/. - run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - - name: Set up JDK 17 if: ${{ steps.release.outputs.release_created }} uses: actions/setup-java@v4 @@ -69,11 +62,6 @@ jobs: with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - - name: Set version with Maven - if: ${{ steps.release.outputs.release_created }} - run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy with Maven to GitHub Packages and Docker Hub if: ${{ steps.release.outputs.release_created }} run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 41ba9b2..1036061 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -13,5 +13,5 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v2 + uses: fsfe/reuse-action@v3 diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..210d290 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "0.5.1" +} diff --git a/.release-please-manifest.json.license b/.release-please-manifest.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/.release-please-manifest.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 77d1348..7a2a030 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 9ccb5d5..90c502b 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/pom.xml b/pom.xml index 65c7831..a268e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 UTF-8 - 3.12.1 + 3.13.0 3.2.5 3.2.0 0.16.0 - 3.7.1 - 2.23.0 - 4.0.0 + 3.9.3 + 2.23.1 + 4.4.0 2.10.1 0.9.1 @@ -158,7 +158,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.11 + 0.8.12 jacoco target/site/jacoco/jacoco.xml, @@ -226,7 +226,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..1c1ced4 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "bootstrap-sha": "2dda752cf0d0ed71492731d76ff83acd4f903e10", + "include-component-in-tag": false, + "packages": { + ".": { + "release-type": "maven", + "package-name": "compas-scl-auto-alignment", + "initial-version": "0.5.1" + } + } +} diff --git a/release-please-config.json.license b/release-please-config.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/release-please-config.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index 8f52e03..ed45265 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -6,6 +6,7 @@ import com.powsybl.sld.layout.HorizontalSubstationLayoutFactory; import com.powsybl.sld.layout.LayoutParameters; import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory; +import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactoryParameters; import com.powsybl.sld.library.ConvergenceComponentLibrary; import com.powsybl.sld.model.graphs.SubstationGraph; import com.powsybl.sld.svg.SvgParameters; @@ -114,10 +115,12 @@ private LayoutParameters getLayoutParameters() { } private void configureLayout(SubstationGraph graph, LayoutParameters layoutParameters) { + PositionVoltageLevelLayoutFactoryParameters parameters = new PositionVoltageLevelLayoutFactoryParameters(); + parameters.setFeederStacked(false) + .setHandleShunts(true); new HorizontalSubstationLayoutFactory().create(graph, - new PositionVoltageLevelLayoutFactory() - .setFeederStacked(false) - .setHandleShunts(true)) - .run(layoutParameters); + new PositionVoltageLevelLayoutFactory(parameters) + ) + .run(layoutParameters); } }