Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JDK to Temurin 21 #84

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Update JDK to Temurin 21 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0681604
Update JDK to Temurin 21
wendigo Nov 4, 2024
4c75289
Remove redundant property
wendigo Nov 4, 2024
934762f
Update airbase to 195
wendigo Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
fetch-depth: 0 # checkout tags so version in Manifest is set properly
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17
distribution: 'temurin'
java-version: 21
- name: Maven Install Dependencies
run: ./mvnw install -B -V -DskipTests -Dair.check.skip-all -P docker-images
- name: Maven Test
Expand Down
2 changes: 1 addition & 1 deletion benchto-service/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazoncorretto:17
FROM eclipse-temurin:21.0.5_11-jre-ubi9-minimal
VOLUME /tmp
ADD /maven/benchto-service-${project.version}.jar benchto-service.jar
RUN bash -c 'touch /benchto-service.jar'
Expand Down
46 changes: 4 additions & 42 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>175</version>
<version>195</version>
</parent>

<groupId>io.trino.benchto</groupId>
<artifactId>benchto-base</artifactId>
<version>0.31-SNAPSHOT</version>
<packaging>pom</packaging>
<name>benchto-base</name>
<description>Benchto parent POM</description>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -48,8 +49,8 @@
</distributionManagement>

<properties>
<java.version>17</java.version>
<project.build.targetJdk>17</project.build.targetJdk>
<java.version>21</java.version>
<project.build.targetJdk>21</project.build.targetJdk>

<encoding>UTF-8</encoding>

Expand Down Expand Up @@ -89,7 +90,6 @@
<dep.javax.el>3.0.0</dep.javax.el>
<dep.org.apache.httpcomponents.version>4.5.13</dep.org.apache.httpcomponents.version>
<dep.jakarta.persistence.api.version>3.1.0</dep.jakarta.persistence.api.version>
<dep.jakarta.servlet.api.version>5.0.0</dep.jakarta.servlet.api.version>
<dep.testcontainers.version>1.20.1</dep.testcontainers.version>
<dep.javassist.version>3.29.2-GA</dep.javassist.version>
<dep.jna.version>5.12.1</dep.jna.version>
Expand All @@ -106,44 +106,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${dep.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate6</artifactId>
<version>${dep.jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-java8</artifactId>
<version>${dep.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${dep.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
Expand Down
Loading