Skip to content

Commit

Permalink
Merge pull request #237 from com-pas/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
pascalwilbrink authored Oct 5, 2023
2 parents dd96fc4 + e938ef3 commit f0c50d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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-1107
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072

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-1107
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ SPDX-License-Identifier: Apache-2.0

<compas.core.version>0.16.0</compas.core.version>

<quarkus.platform.version>3.0.4.Final</quarkus.platform.version>
<quarkus.platform.version>3.4.2</quarkus.platform.version>
<log4j2.version>2.20.0</log4j2.version>
<powsybl.sld.version>3.2.0</powsybl.sld.version>
<powsybl.sld.version>3.3.2</powsybl.sld.version>
<gson.version>2.10.1</gson.version>
<openpojo.version>0.9.1</openpojo.version>
</properties>
Expand Down

0 comments on commit f0c50d2

Please sign in to comment.