Skip to content

Commit c0595f2

Browse files
author
Dennis Labordus
committed
Merge branch 'develop' of github.com:com-pas/compas-scl-auto-alignment into develop
2 parents bf915bb + b00c803 commit c0595f2

File tree

11 files changed

+27
-174
lines changed

11 files changed

+27
-174
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
if: github.event_name == 'issues' && github.event.action == 'opened'
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18-
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/2
18+
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
1919
GITHUB_PROJECT_COLUMN_NAME: To do
2020
- name: add-new-pull-request-to-repository-based-project-column
2121
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
2222
if: github.event_name == 'pull_request' && github.event.action == 'opened'
2323
env:
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25-
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/2
25+
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
2626
GITHUB_PROJECT_COLUMN_NAME: To do
2727
- name: add-new-issues-to-organization-based-project-column
2828
uses: docker://takanabe/github-actions-automate-projects:v0.0.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
restore-keys: ${{ runner.os }}-m2
4141

4242
- name: Set up JDK 1.11
43-
uses: actions/setup-java@v2.3.1
43+
uses: actions/setup-java@v2.4.0
4444
with:
4545
distribution: 'zulu'
4646
java-version: '11'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
4242
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
4343
- name: Set up JDK 1.11
44-
uses: actions/setup-java@v2.3.1
44+
uses: actions/setup-java@v2.4.0
4545
with:
4646
distribution: 'zulu'
4747
java-version: '11'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fetch-depth: 0
2828

2929
- name: Set up JDK 1.11
30-
uses: actions/setup-java@v2.3.1
30+
uses: actions/setup-java@v2.4.0
3131
with:
3232
distribution: 'zulu'
3333
java-version: '11'

‎app/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,12 @@ SPDX-License-Identifier: Apache-2.0
1818
<packaging>jar</packaging>
1919

2020
<properties>
21-
<quarkus.platform.version>2.4.1.Final</quarkus.platform.version>
22-
2321
<quarkus.container-image.group>lfenergy</quarkus.container-image.group>
2422
<quarkus.container-image.name>compas-scl-auto-alignment</quarkus.container-image.name>
2523
</properties>
2624

2725
<dependencyManagement>
2826
<dependencies>
29-
<dependency>
30-
<groupId>io.quarkus</groupId>
31-
<artifactId>quarkus-universe-bom</artifactId>
32-
<version>${quarkus.platform.version}</version>
33-
<type>pom</type>
34-
<scope>import</scope>
35-
</dependency>
3627
</dependencies>
3728
</dependencyManagement>
3829

‎app/src/main/docker/Dockerfile.legacy-jar‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎app/src/main/docker/Dockerfile.native-distroless‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎app/src/native-test/java/org/lfenergy/compas/scl/auto/alignment/NativeHealthCheckIT.java‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/src/native-test/java/org/lfenergy/compas/scl/auto/alignment/rest/NativeHealthCheckIT.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// SPDX-FileCopyrightText: 2021 Alliander N.V.
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
package org.lfenergy.compas.scl.auto.alignment.rest;
5+
6+
import io.quarkus.test.junit.NativeImageTest;
7+
8+
@NativeImageTest
9+
class NativeHealthCheckIT extends HealthCheckTest {
10+
// Execute the same tests but in native mode.
11+
}

‎pom.xml‎

Lines changed: 11 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,10 @@ SPDX-License-Identifier: Apache-2.0
2525
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2626

2727
<compas.core.version>0.6.0</compas.core.version>
28-
<jakarta-cdi-api.version>2.0.2</jakarta-cdi-api.version>
29-
<apache.commons-io.version>2.11.0</apache.commons-io.version>
30-
<slf4j.version>1.7.32</slf4j.version>
31-
<powsybl.version>4.5.0</powsybl.version>
32-
<mapstruct.version>1.4.2.Final</mapstruct.version>
3328

34-
<!-- Test -->
35-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
36-
<mockito-junit-jupiter.version>4.0.0</mockito-junit-jupiter.version>
29+
<quarkus.platform.version>2.5.1.Final</quarkus.platform.version>
30+
<slf4j.version>1.7.32</slf4j.version>
31+
<powsybl.version>4.5.1</powsybl.version>
3732
<openpojo.version>0.9.1</openpojo.version>
3833
</properties>
3934

@@ -60,6 +55,14 @@ SPDX-License-Identifier: Apache-2.0
6055

6156
<dependencyManagement>
6257
<dependencies>
58+
<dependency>
59+
<groupId>io.quarkus</groupId>
60+
<artifactId>quarkus-universe-bom</artifactId>
61+
<version>${quarkus.platform.version}</version>
62+
<type>pom</type>
63+
<scope>import</scope>
64+
</dependency>
65+
6366
<dependency>
6467
<groupId>org.lfenergy.compas.scl.auto.alignment</groupId>
6568
<artifactId>service</artifactId>
@@ -88,79 +91,23 @@ SPDX-License-Identifier: Apache-2.0
8891
<version>${powsybl.version}</version>
8992
</dependency>
9093

91-
<dependency>
92-
<groupId>org.mapstruct</groupId>
93-
<artifactId>mapstruct</artifactId>
94-
<version>${mapstruct.version}</version>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>commons-io</groupId>
99-
<artifactId>commons-io</artifactId>
100-
<version>${apache.commons-io.version}</version>
101-
</dependency>
102-
103-
<dependency>
104-
<groupId>jakarta.enterprise</groupId>
105-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
106-
<version>${jakarta-cdi-api.version}</version>
107-
</dependency>
10894
<dependency>
10995
<groupId>org.eclipse.microprofile.openapi</groupId>
11096
<artifactId>microprofile-openapi-api</artifactId>
11197
<version>2.0</version>
11298
</dependency>
11399

114-
<dependency>
115-
<groupId>org.slf4j</groupId>
116-
<artifactId>slf4j-api</artifactId>
117-
<version>${slf4j.version}</version>
118-
</dependency>
119100
<dependency>
120101
<groupId>org.slf4j</groupId>
121102
<artifactId>slf4j-simple</artifactId>
122103
<version>${slf4j.version}</version>
123104
</dependency>
124-
<dependency>
125-
<groupId>commons-logging</groupId>
126-
<artifactId>commons-logging</artifactId>
127-
<version>1.2</version>
128-
</dependency>
129105

130-
<!-- Test -->
131-
<dependency>
132-
<groupId>org.junit.jupiter</groupId>
133-
<artifactId>junit-jupiter-api</artifactId>
134-
<version>${junit-jupiter.version}</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.junit.jupiter</groupId>
138-
<artifactId>junit-jupiter-engine</artifactId>
139-
<version>${junit-jupiter.version}</version>
140-
</dependency>
141-
<dependency>
142-
<groupId>org.mockito</groupId>
143-
<artifactId>mockito-junit-jupiter</artifactId>
144-
<version>${mockito-junit-jupiter.version}</version>
145-
</dependency>
146106
<dependency>
147107
<groupId>com.openpojo</groupId>
148108
<artifactId>openpojo</artifactId>
149109
<version>${openpojo.version}</version>
150110
</dependency>
151-
152-
<dependency>
153-
<groupId>org.hibernate.validator</groupId>
154-
<artifactId>hibernate-validator</artifactId>
155-
<version>6.2.0.Final</version>
156-
<scope>test</scope>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.glassfish</groupId>
160-
<artifactId>jakarta.el</artifactId>
161-
<version>3.0.4</version>
162-
<scope>test</scope>
163-
</dependency>
164111
</dependencies>
165112
</dependencyManagement>
166113

0 commit comments

Comments
 (0)