From 12cc40dfcee7a4367f25381ac6357a4a06bcf243 Mon Sep 17 00:00:00 2001 From: Flurb Date: Wed, 4 May 2022 13:40:01 +0200 Subject: [PATCH 1/9] Added Docker scan for Dependabot Signed-off-by: Flurb --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e10dd9..c3b2e4a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -33,3 +33,9 @@ updates: versions: [ "[7.0,)" ] - dependency-name: org.glassfish:jakarta.el versions: [ "[4.0,)" ] + + - package-ecosystem: "docker" + directory: "/app/src/main/docker/" + schedule: + interval: "daily" + open-pull-requests-limit: 5 From a9ee7af231d8fc2e099315b0551ffeae070d3372 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 11:43:42 +0000 Subject: [PATCH 2/9] Bump ubi8/ubi-minimal from 8.4 to 8.5 in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.4 to 8.5. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index fcd9ec4..2b4b1e8 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/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.4 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 211c60f..ade4ec3 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/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.4 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 36c50ac65ede1b4ee937071df4da3cf2f0a85a41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 15:15:44 +0000 Subject: [PATCH 3/9] Bump docker/setup-buildx-action from 1 to 2 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 7e2ba54..a65ed10 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Cache Docker Register uses: actions/cache@v3 with: diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 6547753..978af1c 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v1 with: From 76f33d85de99cdba7c8f507974a1209211ec6899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 May 2022 16:29:23 +0000 Subject: [PATCH 4/9] Bump docker/login-action from 1 to 2 Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 978af1c..01bdff7 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -19,7 +19,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} From e9ba3375b70aa8bf7ca074a9a1ae199469aa3f26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 07:53:09 +0000 Subject: [PATCH 5/9] Bump quarkus.platform.version from 2.8.2.Final to 2.8.3.Final Bumps `quarkus.platform.version` from 2.8.2.Final to 2.8.3.Final. Updates `quarkus-universe-bom` from 2.8.2.Final to 2.8.3.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.8.2.Final...2.8.3.Final) Updates `quarkus-maven-plugin` from 2.8.2.Final to 2.8.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 621ca5d..b4d2ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.9.0 - 2.8.2.Final + 2.8.3.Final 3.0 1.7.36 4.8.0 From 6a44a69e8ff55592635ee2df494cb90a31d745e8 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Mon, 9 May 2022 10:22:39 +0200 Subject: [PATCH 6/9] Changed build of jvm/native image in POM and Actions. Signed-off-by: Dennis Labordus --- .github/workflows/build-project.yml | 8 +-- .github/workflows/release-project.yml | 4 +- app/pom.xml | 55 +++++++++++++++++-- ...eHealthCheckIT.java => HealthCheckIT.java} | 2 +- 4 files changed, 56 insertions(+), 13 deletions(-) rename app/src/test/java/org/lfenergy/compas/cim/mapping/rest/{NativeHealthCheckIT.java => HealthCheckIT.java} (83%) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 7e2ba54..96fc8a8 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -48,11 +48,11 @@ jobs: with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - - name: Build Native with Maven + - name: Build with Maven (Pull Request) if: ${{ github.event_name == 'pull_request' }} # See issue https://github.com/com-pas/compas-cim-mapping/issues/218 - # run: ./mvnw -s custom_maven_settings.xml -B -Pnative clean verify - run: ./mvnw -s custom_maven_settings.xml -B clean verify - - name: Build with Maven + # run: ./mvnw -s custom_maven_settings.xml -B -Pnative-image clean verify + run: ./mvnw -s custom_maven_settings.xml -B -Pjvm-image clean verify + - name: Build with Maven (Push) if: ${{ github.event_name == 'push' }} run: ./mvnw -s custom_maven_settings.xml -B clean verify diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 6547753..9229a26 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -57,7 +57,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy with Maven to GitHub Packages and Docker Hub # See issue https://github.com/com-pas/compas-cim-mapping/issues/218 - # run: ./mvnw -B -s custom_maven_settings.xml -Prelease,native clean deploy - run: ./mvnw -B -s custom_maven_settings.xml -Prelease clean deploy + # run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy + run: ./mvnw -B -s custom_maven_settings.xml -Pjvm-image,release clean deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/app/pom.xml b/app/pom.xml index 011aa21..db727cb 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -136,12 +136,50 @@ SPDX-License-Identifier: Apache-2.0 - native + jvm-image + + true + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire-plugin.version} + + + + integration-test + verify + + + + + org.jboss.logmanager.LogManager + + ${maven.home} + + + + + + + + + + + native-image + + + + true + native - true - true + + true @@ -158,8 +196,11 @@ SPDX-License-Identifier: Apache-2.0 - ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager + + ${project.build.directory}/${project.build.finalName}-runner + + org.jboss.logmanager.LogManager + ${maven.home} @@ -185,8 +226,10 @@ SPDX-License-Identifier: Apache-2.0 release - + true + + true latest diff --git a/app/src/test/java/org/lfenergy/compas/cim/mapping/rest/NativeHealthCheckIT.java b/app/src/test/java/org/lfenergy/compas/cim/mapping/rest/HealthCheckIT.java similarity index 83% rename from app/src/test/java/org/lfenergy/compas/cim/mapping/rest/NativeHealthCheckIT.java rename to app/src/test/java/org/lfenergy/compas/cim/mapping/rest/HealthCheckIT.java index 002fc46..adb3034 100644 --- a/app/src/test/java/org/lfenergy/compas/cim/mapping/rest/NativeHealthCheckIT.java +++ b/app/src/test/java/org/lfenergy/compas/cim/mapping/rest/HealthCheckIT.java @@ -7,6 +7,6 @@ import io.quarkus.test.junit.QuarkusIntegrationTest; @QuarkusIntegrationTest -class NativeHealthCheckIT extends HealthCheckTest { +class HealthCheckIT extends HealthCheckTest { // Execute the same tests but in native mode. } \ No newline at end of file From 4005415cd53013d156a1e478797ae607057daf97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 15:21:32 +0000 Subject: [PATCH 7/9] Bump quarkus.platform.version from 2.8.3.Final to 2.9.0.Final Bumps `quarkus.platform.version` from 2.8.3.Final to 2.9.0.Final. Updates `quarkus-universe-bom` from 2.8.3.Final to 2.9.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.8.3.Final...2.9.0.Final) Updates `quarkus-maven-plugin` from 2.8.3.Final to 2.9.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4d2ad6..989b590 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.9.0 - 2.8.3.Final + 2.9.0.Final 3.0 1.7.36 4.8.0 From f02e221658601bb173397f7dd21d1b7f0231158b Mon Sep 17 00:00:00 2001 From: Flurb Date: Wed, 11 May 2022 17:27:45 +0200 Subject: [PATCH 8/9] Added CII Best Practices Badge + removed unused LFX Security Tool badge Signed-off-by: Flurb --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0aa30d..bf017a5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0 [![Maven Build Github Action Status]()](https://github.com/com-pas/compas-cim-mapping/actions?query=workflow%3A%22Maven+Build%22) [![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) [![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) -[![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) +[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5925/badge)](https://bestpractices.coreinfrastructure.org/projects/5925) [![Slack](https://raw.githubusercontent.com/com-pas/compas-architecture/master/public/LFEnergy-slack.svg)](http://lfenergy.slack.com/) # compas-cim-mapping From 4f2972b4880c2171648e88ef8179c4ff996a57c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 May 2022 15:28:50 +0000 Subject: [PATCH 9/9] Bump ubi8/ubi-minimal from 8.5 to 8.6 in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.5 to 8.6. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 2b4b1e8..2fb5f43 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/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.5 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index ade4ec3..f4d420a 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/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.5 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \