Skip to content

Commit

Permalink
Merge pull request #330 from com-pas/develop
Browse files Browse the repository at this point in the history
Merge Develop into Main
  • Loading branch information
pascalwilbrink authored May 2, 2023
2 parents 17acc4e + e4a466a commit 2e16b39
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion app/src/main/docker/Dockerfile.jvm
Original file line number Diff line number Diff line change
Expand Up @@ -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.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/docker/Dockerfile.native
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# docker run -i --rm -p 8080:8080 quarkus/app
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ SPDX-License-Identifier: Apache-2.0
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<compiler-plugin.version>3.10.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<surefire-plugin.version>3.0.0</surefire-plugin.version>
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>

<compas.core.version>0.11.0</compas.core.version>

<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
<quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
<microprofile-openapi-api.version>3.1</microprofile-openapi-api.version>
<powsybl.version>5.1.1</powsybl.version>
<log4j2.version>2.20.0</log4j2.version>
<mapstruct.version>1.5.3.Final</mapstruct.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<openpojo.version>0.9.1</openpojo.version>
</properties>

Expand Down Expand Up @@ -193,7 +193,7 @@ SPDX-License-Identifier: Apache-2.0
<sonar.language>java</sonar.language>

<!-- JaCoCo Properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacoco.version>0.8.10</jacoco.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.coverage.jacoco.xmlReportPaths>
target/site/jacoco/jacoco.xml,
Expand Down

0 comments on commit 2e16b39

Please sign in to comment.