Skip to content

Commit 52bf518

Browse files
author
Dennis Labordus
authored
Merge pull request #230 from com-pas/develop
New release
2 parents 5dbe2ec + faed843 commit 52bf518

File tree

9 files changed

+69
-20
lines changed

9 files changed

+69
-20
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ updates:
3333
versions: [ "[7.0,)" ]
3434
- dependency-name: org.glassfish:jakarta.el
3535
versions: [ "[4.0,)" ]
36+
37+
- package-ecosystem: "docker"
38+
directory: "/app/src/main/docker/"
39+
schedule:
40+
interval: "daily"
41+
open-pull-requests-limit: 5

‎.github/workflows/build-project.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
- name: Set up Docker Buildx
2626
id: buildx
27-
uses: docker/setup-buildx-action@v1
27+
uses: docker/setup-buildx-action@v2
2828
- name: Cache Docker Register
2929
uses: actions/cache@v3
3030
with:
@@ -48,11 +48,11 @@ jobs:
4848
with:
4949
output_file: custom_maven_settings.xml
5050
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
51-
- name: Build Native with Maven
51+
- name: Build with Maven (Pull Request)
5252
if: ${{ github.event_name == 'pull_request' }}
5353
# See issue https://github.com/com-pas/compas-cim-mapping/issues/218
54-
# run: ./mvnw -s custom_maven_settings.xml -B -Pnative clean verify
55-
run: ./mvnw -s custom_maven_settings.xml -B clean verify
56-
- name: Build with Maven
54+
# run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify
55+
run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify
56+
- name: Build with Maven (Push)
5757
if: ${{ github.event_name == 'push' }}
5858
run: ./mvnw -s custom_maven_settings.xml -B clean verify

‎.github/workflows/release-project.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
uses: actions/checkout@v3
1818
- name: Set up Docker Buildx
1919
id: buildx
20-
uses: docker/setup-buildx-action@v1
20+
uses: docker/setup-buildx-action@v2
2121
- name: Login to Docker Hub
22-
uses: docker/login-action@v1
22+
uses: docker/login-action@v2
2323
with:
2424
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2525
password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -57,7 +57,7 @@ jobs:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
- name: Deploy with Maven to GitHub Packages and Docker Hub
5959
# See issue https://github.com/com-pas/compas-cim-mapping/issues/218
60-
# run: ./mvnw -B -s custom_maven_settings.xml -Prelease,native clean deploy
61-
run: ./mvnw -B -s custom_maven_settings.xml -Prelease clean deploy
60+
# run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
61+
run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy
6262
env:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
[![Maven Build Github Action Status](<https://img.shields.io/github/workflow/status/com-pas/compas-cim-mapping/Maven%20Build?logo=GitHub>)](https://github.com/com-pas/compas-cim-mapping/actions?query=workflow%3A%22Maven+Build%22)
88
[![REUSE status](https://api.reuse.software/badge/github.com/com-pas/compas-cim-mapping)](https://api.reuse.software/info/github.com/com-pas/compas-cim-mapping)
99
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com-pas_compas-cim-mapping&metric=alert_status)](https://sonarcloud.io/dashboard?id=com-pas_compas-cim-mapping)
10-
[![LFX Security Status](https://img.shields.io/badge/dynamic/json?color=orange&label=LFX%20Security%20Tool&query=issues%5B%3F%28%40%5B%27repository-name%27%5D%20%3D%3D%20%27compas-cim-mapping%27%29%5D%5B%27high-open-issues%27%5D&suffix=%20High%20open%20issues&url=https%3A%2F%2Fapi.security.lfx.linuxfoundation.org%2Fv1%2Fproject%2Fe8b6fdf9-2686-44c5-bbaa-6965d04ad3e1%2Fissues)](https://security.lfx.linuxfoundation.org/#/e8b6fdf9-2686-44c5-bbaa-6965d04ad3e1/issues)
10+
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5925/badge)](https://bestpractices.coreinfrastructure.org/projects/5925)
1111
[![Slack](https://raw.githubusercontent.com/com-pas/compas-architecture/master/public/LFEnergy-slack.svg)](http://lfenergy.slack.com/)
1212

1313
# compas-cim-mapping

‎app/pom.xml

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,50 @@ SPDX-License-Identifier: Apache-2.0
136136

137137
<profiles>
138138
<profile>
139-
<id>native</id>
139+
<id>jvm-image</id>
140140

141141
<properties>
142+
<!-- Make a Docker Image, so the integration tests will be executed against the container -->
143+
<quarkus.container-image.build>true</quarkus.container-image.build>
144+
</properties>
145+
146+
<build>
147+
<plugins>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-failsafe-plugin</artifactId>
151+
<version>${surefire-plugin.version}</version>
152+
<executions>
153+
<execution>
154+
<goals>
155+
<goal>integration-test</goal>
156+
<goal>verify</goal>
157+
</goals>
158+
<configuration>
159+
<systemPropertyVariables>
160+
<java.util.logging.manager>
161+
org.jboss.logmanager.LogManager
162+
</java.util.logging.manager>
163+
<maven.home>${maven.home}</maven.home>
164+
</systemPropertyVariables>
165+
</configuration>
166+
</execution>
167+
</executions>
168+
</plugin>
169+
</plugins>
170+
</build>
171+
</profile>
172+
173+
<profile>
174+
<id>native-image</id>
175+
176+
<properties>
177+
<!-- Make a Docker Image, so the integration tests will be executed against the container -->
178+
<quarkus.container-image.build>true</quarkus.container-image.build>
179+
142180
<quarkus.package.type>native</quarkus.package.type>
143-
<quarkus.native.container-build>true</quarkus.native.container-build> <!-- Allows for creating a Linux executable without GraalVM being installed -->
144-
<quarkus.container-image.build>true</quarkus.container-image.build> <!-- Also make a Docker Image, so the native test will be executed against the container -->
181+
<!-- Allows for creating a Linux executable without GraalVM being installed -->
182+
<quarkus.native.container-build>true</quarkus.native.container-build>
145183
</properties>
146184

147185
<build>
@@ -158,8 +196,11 @@ SPDX-License-Identifier: Apache-2.0
158196
</goals>
159197
<configuration>
160198
<systemPropertyVariables>
161-
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
162-
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
199+
<native.image.path>
200+
${project.build.directory}/${project.build.finalName}-runner
201+
</native.image.path>
202+
<java.util.logging.manager>org.jboss.logmanager.LogManager
203+
</java.util.logging.manager>
163204
<maven.home>${maven.home}</maven.home>
164205
</systemPropertyVariables>
165206
</configuration>
@@ -185,8 +226,10 @@ SPDX-License-Identifier: Apache-2.0
185226
<id>release</id>
186227

187228
<properties>
188-
<!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
229+
<!-- Make a Docker Image from the component -->
189230
<quarkus.container-image.build>true</quarkus.container-image.build>
231+
232+
<!-- Properties only used for publishing a native docker image (default to Docker Hub) -->
190233
<quarkus.container-image.push>true</quarkus.container-image.push>
191234
<quarkus.container-image.additional-tags>latest</quarkus.container-image.additional-tags>
192235
</properties>

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

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

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

‎app/src/test/java/org/lfenergy/compas/cim/mapping/rest/NativeHealthCheckIT.java renamed to ‎app/src/test/java/org/lfenergy/compas/cim/mapping/rest/HealthCheckIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
import io.quarkus.test.junit.QuarkusIntegrationTest;
88

99
@QuarkusIntegrationTest
10-
class NativeHealthCheckIT extends HealthCheckTest {
10+
class HealthCheckIT extends HealthCheckTest {
1111
// Execute the same tests but in native mode.
1212
}

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0
2626

2727
<compas.core.version>0.9.0</compas.core.version>
2828

29-
<quarkus.platform.version>2.8.2.Final</quarkus.platform.version>
29+
<quarkus.platform.version>2.9.0.Final</quarkus.platform.version>
3030
<microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
3131
<slf4j.version>1.7.36</slf4j.version>
3232
<powsybl.version>4.8.0</powsybl.version>

0 commit comments

Comments
 (0)