Skip to content

Commit f971db6

Browse files
authored
Updated Java Minimum version to 17 (#686)
1 parent 8f497dd commit f971db6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM docker.io/library/maven:3.9.4-eclipse-temurin-17 AS build-hapi
1+
FROM docker.io/library/maven:3.9.6-eclipse-temurin-17 AS build-hapi
22
WORKDIR /tmp/hapi-fhir-jpaserver-starter
33

4-
ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.31.0
4+
ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3
55
RUN curl -LSsO https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar
66

77
COPY pom.xml .
@@ -18,7 +18,7 @@ RUN mkdir /app && cp /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /app/main.
1818

1919
########### bitnami tomcat version is suitable for debugging and comes with a shell
2020
########### it can be built using eg. `docker build --target tomcat .`
21-
FROM bitnami/tomcat:9.0 AS tomcat
21+
FROM bitnami/tomcat:10.1 AS tomcat
2222

2323
RUN rm -rf /opt/bitnami/tomcat/webapps/ROOT && \
2424
mkdir -p /opt/bitnami/hapi/data/hapi/lucenefiles && \
@@ -36,7 +36,7 @@ COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/opente
3636
ENV ALLOW_EMPTY_PASSWORD=yes
3737

3838
########### distroless brings focus on security and runs on plain spring boot - this is the default image
39-
FROM gcr.io/distroless/java17-debian11:nonroot AS default
39+
FROM gcr.io/distroless/java17-debian12:nonroot AS default
4040
# 65532 is the nonroot user's uid
4141
# used here instead of the name to allow Kubernetes to easily detect that the container
4242
# is running as a non-root (uid != 0) user.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<packaging>war</packaging>
2222

2323
<properties>
24-
<java.version>11</java.version>
24+
<java.version>17</java.version>
2525
</properties>
2626

2727
<prerequisites>
@@ -393,7 +393,7 @@
393393
<plugin>
394394
<groupId>org.apache.maven.plugins</groupId>
395395
<artifactId>maven-surefire-plugin</artifactId>
396-
<version>3.1.2</version>
396+
<version>3.2.5</version>
397397
</plugin>
398398
</plugins>
399399
</pluginManagement>

0 commit comments

Comments
 (0)