Merge pull request #72 from com-pas/develop

New release
com-pas · Mar 30, 2022 · ae34da7 · ae34da7
2 parents b3384d9 + 171501d
commit ae34da7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -26,12 +26,12 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker Register
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -25,12 +25,12 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: Cache Docker Register
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -36,13 +36,13 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties
@@ -12,11 +12,14 @@ quarkus.log.level = INFO
 quarkus.log.category."org.lfenergy.compas.scl.auto.alignment".level = INFO
 
 # Add scanning these dependencies for scanning, also used by native compilation.
-quarkus.index-dependency.scl2007b4.group-id=org.lfenergy.compas.core
-quarkus.index-dependency.scl2007b4.artifact-id=commons
+quarkus.index-dependency.compas-commons.group-id    = org.lfenergy.compas.core
+quarkus.index-dependency.compas-commons.artifact-id = commons
 
-quarkus.index-dependency.jaxb-api.group-id=org.jboss.spec.javax.xml.bind
-quarkus.index-dependency.jaxb-api.artifact-id=jboss-jaxb-api_2.3_spec
+quarkus.index-dependency.jaxrs-commons.group-id    = org.lfenergy.compas.core
+quarkus.index-dependency.jaxrs-commons.artifact-id = jaxrs-commons
+
+quarkus.index-dependency.jaxb-api.group-id    = org.jboss.spec.javax.xml.bind
+quarkus.index-dependency.jaxb-api.artifact-id = jboss-jaxb-api_2.3_spec
 
 quarkus.index-dependency.powsybl-single-line-diagram-core.group-id=com.powsybl
 quarkus.index-dependency.powsybl-single-line-diagram-core.artifact-id=powsybl-single-line-diagram-core

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0
 
         <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <powsybl.sld.version>2.9.0</powsybl.sld.version>
+        <powsybl.sld.version>2.9.1</powsybl.sld.version>
         <gson.version>2.9.0</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>