Merge pull request #332 from com-pas/develop

chore: Merge develop into main

.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/<tag_name>.
-        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

.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
 

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.5.1"
+}

.release-please-manifest.json.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0

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

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 \

pom.xml

@@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <compiler-plugin.version>3.12.1</compiler-plugin.version>
+        <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <surefire-plugin.version>3.2.5</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
         <compas.core.version>0.16.0</compas.core.version>
 
-        <quarkus.platform.version>3.7.1</quarkus.platform.version>
-        <log4j2.version>2.23.0</log4j2.version>
-        <powsybl.sld.version>4.0.0</powsybl.sld.version>
+        <quarkus.platform.version>3.9.3</quarkus.platform.version>
+        <log4j2.version>2.23.1</log4j2.version>
+        <powsybl.sld.version>4.4.0</powsybl.sld.version>
         <gson.version>2.10.1</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
@@ -158,7 +158,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0
                 <sonar.language>java</sonar.language>
 
                 <!-- JaCoCo Properties -->
-                <jacoco.version>0.8.11</jacoco.version>
+                <jacoco.version>0.8.12</jacoco.version>
                 <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                 <sonar.coverage.jacoco.xmlReportPaths>
                     target/site/jacoco/jacoco.xml,
@@ -226,7 +226,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-source-plugin</artifactId>
-                            <version>3.3.0</version>
+                            <version>3.3.1</version>
                             <executions>
                                 <execution>
                                     <id>attach-sources</id>

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"
+    }
+  }
+}

release-please-config.json.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0

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);
     }
 }