Skip to content

Commit

Permalink
[#186993968] Update to JDK21 and Spring Boot 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpanik
mpanik committed Feb 22, 2024
1 parent 29f7627 commit a126817
Show file tree
Hide file tree
Showing 18 changed files with 220 additions and 232 deletions.
13 changes: 3 additions & 10 deletions ci/e2e-tests/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

# This stage depends on a JDK image and uses Maven Wrapper to pull in dependencies and build the project
# from source.
FROM amazoncorretto:17-alpine AS build
FROM amazoncorretto:21-al2023 AS build

ARG APP_NAME
ARG APP_VERSION

Expand Down Expand Up @@ -47,10 +48,7 @@ RUN ./mvnw -P -dnastack -B -o process-test-classes

# This stage uses a JRE rather than JDK because it doesn't have to build anything; it just runs the fat jar
# produced by the previous stage.
FROM amazoncorretto:17-alpine

ARG APP_NAME
ARG APP_VERSION
FROM amazoncorretto:21-alpine

# Create a non-root user
RUN adduser -D -h /home/testuser testuser
Expand All @@ -71,9 +69,4 @@ WORKDIR /home/testuser

ENV E2E_SCREENSHOT_DIR /target

# If the container has a memory limit, that limit (in bytes) is present in a file under /sys/fs/cgroup
# In Linux 5.10.76, the value comes from memory.max.
# If the container doesn't have a set memory limit, the file contains "max", hence we fall back to a default value of 2GiB
# In Linux 5.4.129, the value comes from memory/memory.limit_in_bytes
# If the container doesn't have a set memory limit, the file will be blank, hence we fall back to a default value of 2Gib
ENTRYPOINT ["./mvnw", "-B", "-o", "-DreportsDirectory=/target/surefire-reports", "test"]
4 changes: 2 additions & 2 deletions ci/impl/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# This stage depends on a JDK image and uses Maven Wrapper to pull in dependencies and build the project
# from source.
FROM azul/zulu-openjdk:17.0.3 AS build
FROM amazoncorretto:21-al2023 AS build
ARG APP_NAME
ARG APP_VERSION

Expand Down Expand Up @@ -46,7 +46,7 @@ RUN ./mvnw -P -dnastack -B -o package

# This stage uses a JRE rather than JDK because it doesn't have to build anything; it just runs the fat jar
# produced by the previous stage.
FROM azul/zulu-openjdk:17.0.3-jre
FROM amazoncorretto:21-alpine
ARG APP_NAME
ARG APP_VERSION

Expand Down
96 changes: 39 additions & 57 deletions e2e-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@
<description>E2E tests for DNAstack WES Translator</description>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<reportsDirectory/>
<junit.version>5.8.2</junit.version>
<restassured.version>4.5.1</restassured.version>
<slf4j.version>2.0.1</slf4j.version>
<jackson.version>2.13.2</jackson.version>
<jackson-databind.version>2.13.4</jackson-databind.version>
<groovy.version>3.0.13</groovy.version>
<awaitility.version>4.0.3</awaitility.version>
<awaitility.version>4.0.3</awaitility.version>
<lombok.version>1.18.24</lombok.version>
<actuator-e2e-test.version>1.0.3</actuator-e2e-test.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
<maven.go-offline.plugin.version>1.2.8</maven.go-offline.plugin.version>
<!-- DNAstack Libs -->
<dnastack.actuator-e2e-test.version>1.0.4</dnastack.actuator-e2e-test.version>
<!-- Other -->
<lombok.version>1.18.30</lombok.version>
<junit.version>5.10.1</junit.version>
<webdriver.version>5.6.3</webdriver.version>
<selenium.version>4.16.1</selenium.version>
<restassured.version>5.4.0</restassured.version>
<slf4j.version>2.0.10</slf4j.version>
<awaitility.version>4.2.0</awaitility.version>
<jackson.version>2.16.1</jackson.version>
<jfairy.version>0.5.9</jfairy.version>
<gcloud.version>1.3.2</gcloud.version>
</properties>

<dependencyManagement>
Expand All @@ -54,22 +56,12 @@
<dependency>
<groupId>com.dnastack</groupId>
<artifactId>actuator-e2e-test</artifactId>
<version>${actuator-e2e-test.version}</version>
<version>${dnastack.actuator-e2e-test.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
<version>${gcloud.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -85,7 +77,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -108,27 +100,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-path</artifactId>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>xml-path</artifactId>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured-common</artifactId>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-schema-validator</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -141,10 +112,21 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-resourcemanager</artifactId>
<version>1.3.2</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>

Expand All @@ -165,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<release>${java.version}</release>
<compilerArgs>
Expand All @@ -177,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<reportsDirectory>${reportsDirectory}</reportsDirectory>
<dependenciesToScan>
Expand All @@ -189,15 +171,15 @@
<plugin>
<groupId>de.qaware.maven</groupId>
<artifactId>go-offline-maven-plugin</artifactId>
<version>1.2.8</version>
<version>${maven.go-offline.plugin.version}</version>
<configuration>
<downloadSources>false</downloadSources>
<downloadJavadoc>false</downloadJavadoc>
<dynamicDependencies>
<DynamicDependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>3.0.0-M5</version>
<version>${maven.surefire.plugin.version}</version>
<repositoryType>PLUGIN</repositoryType>
</DynamicDependency>
<dynamicDependency>
Expand Down
Loading

0 comments on commit a126817

Please sign in to comment.