Skip to content

Commit 5d3647b

Browse files
author
Dennis Labordus
authored
Merge pull request #281 from com-pas/develop
New release
2 parents 3933f97 + ac4f611 commit 5d3647b

File tree

92 files changed

+3217
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+3217
-116
lines changed

‎.github/workflows/automate-projects.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
steps:
1515
- name: add-new-issues-to-organization-based-project-column
1616
if: github.event_name == 'issues' && github.event.action == 'opened'
17-
uses: alex-page/[email protected].1
17+
uses: alex-page/[email protected].2
1818
with:
1919
project: CoMPAS Issues Overview Board
2020
column: To do
2121
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
2222
- name: add-new-pull-request-to-organization-based-project-column
2323
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
24-
uses: alex-page/[email protected].1
24+
uses: alex-page/[email protected].2
2525
with:
2626
project: CoMPAS Pull Request Overview Board
2727
column: To do

‎.github/workflows/build-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jobs:
4545
java-version: '17'
4646

4747
- name: Create custom Maven Settings.xml
48-
uses: whelk-io/maven-settings-xml-action@v20
48+
uses: whelk-io/maven-settings-xml-action@v21
4949
with:
5050
output_file: custom_maven_settings.xml
5151
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5252
- name: Build with Maven (Pull Request)
5353
if: ${{ github.event_name == 'pull_request' }}
54-
run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify
54+
run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify
5555
- name: Build with Maven (Push)
5656
if: ${{ github.event_name == 'push' }}
5757
run: ./mvnw -s custom_maven_settings.xml -B clean verify

‎.github/workflows/release-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5252

5353
- name: Create custom Maven Settings.xml
54-
uses: whelk-io/maven-settings-xml-action@v20
54+
uses: whelk-io/maven-settings-xml-action@v21
5555
with:
5656
output_file: custom_maven_settings.xml
5757
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
@@ -60,6 +60,6 @@ jobs:
6060
env:
6161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6262
- name: Deploy with Maven to GitHub Packages and Docker Hub
63-
run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
63+
run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy
6464
env:
6565
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sonarcloud-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
-Dsonar.projectKey=com-pas_compas-scl-data-service \
5757
-Dsonar.organization=com-pas )"
5858
- name: Create custom Maven Settings.xml
59-
uses: whelk-io/maven-settings-xml-action@v20
59+
uses: whelk-io/maven-settings-xml-action@v21
6060
with:
6161
output_file: custom_maven_settings.xml
6262
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

‎app/pom.xml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ SPDX-License-Identifier: Apache-2.0
5050
</dependency>
5151
<dependency>
5252
<groupId>org.lfenergy.compas.core</groupId>
53-
<artifactId>jaxrs-commons</artifactId>
53+
<artifactId>rest-commons</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.lfenergy.compas.core</groupId>
57+
<artifactId>websocket-commons</artifactId>
5458
</dependency>
5559

5660
<dependency>
@@ -59,16 +63,17 @@ SPDX-License-Identifier: Apache-2.0
5963
</dependency>
6064
<dependency>
6165
<groupId>io.quarkus</groupId>
62-
<artifactId>quarkus-resteasy</artifactId>
66+
<artifactId>quarkus-resteasy-reactive</artifactId>
6367
</dependency>
6468
<dependency>
6569
<groupId>io.quarkus</groupId>
66-
<artifactId>quarkus-resteasy-jaxb</artifactId>
70+
<artifactId>quarkus-resteasy-reactive-jaxb</artifactId>
6771
</dependency>
6872
<dependency>
6973
<groupId>io.quarkus</groupId>
70-
<artifactId>quarkus-hibernate-validator</artifactId>
74+
<artifactId>quarkus-websockets</artifactId>
7175
</dependency>
76+
7277
<dependency>
7378
<groupId>io.quarkus</groupId>
7479
<artifactId>quarkus-smallrye-jwt</artifactId>
@@ -81,6 +86,11 @@ SPDX-License-Identifier: Apache-2.0
8186
<groupId>io.quarkus</groupId>
8287
<artifactId>quarkus-smallrye-health</artifactId>
8388
</dependency>
89+
90+
<dependency>
91+
<groupId>io.quarkus</groupId>
92+
<artifactId>quarkus-hibernate-validator</artifactId>
93+
</dependency>
8494
<dependency>
8595
<groupId>io.quarkus</groupId>
8696
<artifactId>quarkus-agroal</artifactId>

‎app/src/main/docker/Dockerfile-basex.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.6
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

‎app/src/main/docker/Dockerfile-basex.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.6
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

‎app/src/main/docker/Dockerfile-postgresql.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.6
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

‎app/src/main/docker/Dockerfile-postgresql.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.6
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* Create Beans from other dependencies that are used in the application.
1515
*/
1616
@RegisterForReflection(targets = {
17-
org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
18-
org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class
17+
org.lfenergy.compas.core.commons.model.ErrorResponse.class,
18+
org.lfenergy.compas.core.commons.model.ErrorMessage.class
1919
})
2020
public class CompasSclDataServiceConfiguration {
2121
@Produces

0 commit comments

Comments
 (0)