Skip to content

Commit 7d37626

Browse files
author
Mateusz Czeladka
committed
chore:OpenJDK 24 LTS for api and indexer.
1 parent 27794a5 commit 7d37626

File tree

9 files changed

+77
-17
lines changed

9 files changed

+77
-17
lines changed

.github/workflows/feature-mvn-build.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@ jobs:
1010
- name: Checkout
1111
uses: actions/checkout@v3
1212

13-
- name: Set up JDK 21
14-
uses: actions/setup-java@v3
13+
# - name: Set up JDK 21
14+
# uses: actions/setup-java@v3
15+
# with:
16+
# java-version: '21'
17+
# distribution: 'temurin'
18+
# cache: maven
19+
20+
- name: Set up Amazon Corretto
21+
uses: actions/setup-java@v4
1522
with:
16-
java-version: '21'
17-
distribution: 'temurin'
23+
distribution: 'corretto'
24+
java-version: 24
1825
cache: maven
1926

2027
- name: Build project

.github/workflows/sonar-cloud-report.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,20 @@ jobs:
1313
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
16-
- name: Set up JDK 21
17-
uses: actions/setup-java@v3
16+
# - name: Set up JDK 21
17+
# uses: actions/setup-java@v3
18+
# with:
19+
# java-version: '21'
20+
# distribution: 'temurin'
21+
# cache: maven
22+
23+
- name: Set up Amazon Corretto
24+
uses: actions/setup-java@v4
1825
with:
19-
java-version: '21'
20-
distribution: 'temurin'
26+
distribution: 'corretto'
27+
java-version: 24
2128
cache: maven
29+
2230
- name: Build
2331
env:
2432
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

api/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
FROM ubuntu:24.04 AS build-common
22
WORKDIR /build
33

4+
# Install necessary tools but not OpenJDK from apt
45
RUN apt update --fix-missing \
5-
&& apt install -y --no-install-recommends openjdk-21-jdk maven curl ca-certificates \
6+
&& apt install -y --no-install-recommends maven curl ca-certificates \
67
&& apt clean
78

9+
# Download and setup JDK 24.0.1
10+
RUN mkdir -p /opt/java \
11+
&& curl -L https://download.java.net/java/GA/jdk24.0.1/24a58e0e276943138bf3e963e6291ac2/9/GPL/openjdk-24.0.1_linux-x64_bin.tar.gz -o /opt/jdk.tar.gz \
12+
&& tar -xzf /opt/jdk.tar.gz -C /opt/java \
13+
&& rm /opt/jdk.tar.gz
14+
15+
# Set JAVA_HOME and update PATH
16+
ENV JAVA_HOME=/opt/java/jdk-24.0.1
17+
ENV PATH="${JAVA_HOME}/bin:${PATH}"
18+
819
COPY ./pom.xml /build/pom.xml
920
COPY ./api /build/api
1021
COPY ./yaci-indexer /build/yaci-indexer
1122
COPY ./test-data-generator /build/test-data-generator
1223
COPY ./.git .git
1324

1425
RUN --mount=type=cache,target=/root/.m2 mvn -U clean package -DskipTests
26+
RUN java --version
1527

1628
WORKDIR /app
1729
RUN cp /build/api/target/*.jar /app/api.jar

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
<artifactId>maven-compiler-plugin</artifactId>
231231
<version>${version.maven-compiler-plugin}</version>
232232
<configuration>
233-
<release>21</release>
233+
<release>24</release>
234234
<annotationProcessorPaths>
235235
<path>
236236
<groupId>org.projectlombok</groupId>

docker/Dockerfile

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ RUN apt update --fix-missing \
1111
g++ tmux git jq wget libncursesw5-dev libtool autoconf liblmdb-dev curl ca-certificates pkg-config \
1212
&& apt-get clean
1313

14+
# Download and setup JDK 24.0.1
15+
RUN mkdir -p /opt/java \
16+
&& curl -L https://download.java.net/java/GA/jdk24.0.1/24a58e0e276943138bf3e963e6291ac2/9/GPL/openjdk-24.0.1_linux-x64_bin.tar.gz -o /opt/jdk.tar.gz \
17+
&& tar -xzf /opt/jdk.tar.gz -C /opt/java \
18+
&& rm /opt/jdk.tar.gz
19+
20+
# Set JAVA_HOME and update PATH
21+
ENV JAVA_HOME=/opt/java/jdk-24.0.1
22+
ENV PATH="${JAVA_HOME}/bin:${PATH}"
23+
1424
WORKDIR /root/src
1525

1626
# Install ghcup
@@ -149,7 +159,7 @@ FROM ubuntu:24.04 AS java-builder
149159
WORKDIR /root/app
150160

151161
RUN apt update --fix-missing \
152-
&& apt install -y --no-install-recommends openjdk-21-jdk maven \
162+
&& apt install -y --no-install-recommends maven \
153163
&& apt-get clean
154164

155165
COPY ./pom.xml /root/app/pom.xml
@@ -159,7 +169,9 @@ COPY ./yaci-indexer /root/app/yaci-indexer
159169
COPY ./test-data-generator /root/app/test-data-generator
160170
COPY ./.git /root/app/.git
161171

162-
RUN --mount=type=cache,target=/root/.m2 mvn -U clean package -DskipTests
172+
RUN java --version
173+
174+
RUN --mount=type=cache,target=/root/.m2 mvn clean package -am -DskipTests
163175

164176
# Main
165177
FROM ubuntu:24.04
@@ -195,6 +207,16 @@ RUN rm -rf /var/lib/postgresql/${PG_VERSION}/main
195207
RUN apt install -y --no-install-recommends jq bc sudo curl \
196208
&& apt clean
197209

210+
# Download and setup JDK 24.0.1
211+
RUN mkdir -p /opt/java \
212+
&& curl -L https://download.java.net/java/GA/jdk24.0.1/24a58e0e276943138bf3e963e6291ac2/9/GPL/openjdk-24.0.1_linux-x64_bin.tar.gz -o /opt/jdk.tar.gz \
213+
&& tar -xzf /opt/jdk.tar.gz -C /opt/java \
214+
&& rm /opt/jdk.tar.gz
215+
216+
# Set JAVA_HOME and update PATH
217+
ENV JAVA_HOME=/opt/java/jdk-24.0.1
218+
ENV PATH="${JAVA_HOME}/bin:${PATH}"
219+
198220
# Copy cardano node
199221
COPY --from=cardano-builder /usr/local/lib /usr/local/lib
200222
COPY --from=cardano-builder /root/.local/bin/cardano-* /usr/local/bin/

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<maven.compiler.proc>full</maven.compiler.proc>
3030
<revision>1.2.8</revision>
31-
<java.version>21</java.version>
31+
<java.version>24</java.version>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<version.spring-boot>3.4.4</version.spring-boot>
3434
<version.springdoc-openapi-ui>1.6.15</version.springdoc-openapi-ui>

test-data-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<artifactId>maven-compiler-plugin</artifactId>
6363
<version>${version.maven-compiler-plugin}</version>
6464
<configuration>
65-
<release>21</release>
65+
<release>24</release>
6666
<annotationProcessorPaths>
6767
<path>
6868
<groupId>org.projectlombok</groupId>

yaci-indexer/Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,27 @@ FROM ubuntu:24.04 AS build-common
22
WORKDIR /build
33

44
RUN apt update --fix-missing \
5-
&& apt install -y --no-install-recommends openjdk-21-jdk maven curl \
5+
&& apt install -y --no-install-recommends maven curl \
66
&& apt clean
77

8+
# Download and setup JDK 24.0.1
9+
RUN mkdir -p /opt/java \
10+
&& curl -L https://download.java.net/java/GA/jdk24.0.1/24a58e0e276943138bf3e963e6291ac2/9/GPL/openjdk-24.0.1_linux-x64_bin.tar.gz -o /opt/jdk.tar.gz \
11+
&& tar -xzf /opt/jdk.tar.gz -C /opt/java \
12+
&& rm /opt/jdk.tar.gz
13+
14+
# Set JAVA_HOME and update PATH
15+
ENV JAVA_HOME=/opt/java/jdk-24.0.1
16+
ENV PATH="${JAVA_HOME}/bin:${PATH}"
17+
818
COPY ./pom.xml /build/pom.xml
919
COPY ./api /build/api
1020
COPY ./yaci-indexer /build/yaci-indexer
1121
COPY ./test-data-generator /build/test-data-generator
1222
COPY ./.git .git
1323

1424
RUN --mount=type=cache,target=/root/.m2 mvn -U clean package -DskipTests
25+
RUN java --version
1526

1627
WORKDIR /app
1728
RUN cp /build/yaci-indexer/target/*.jar /app/yaci-indexer.jar

yaci-indexer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<packaging>jar</packaging>
1818

1919
<properties>
20-
<java.version>21</java.version>
20+
<java.version>24</java.version>
2121
<maven.compiler.proc>full</maven.compiler.proc>
2222
<yaci-store.version>0.1.2</yaci-store.version>
2323
<sonar.exclusions>src/main/java/org/cardanofoundation/rosetta/yaciindexer/stores/txsize/model/*</sonar.exclusions>
@@ -121,7 +121,7 @@
121121
<artifactId>maven-compiler-plugin</artifactId>
122122
<version>${version.maven-compiler-plugin}</version>
123123
<configuration>
124-
<release>21</release>
124+
<release>24</release>
125125
<annotationProcessorPaths>
126126
<path>
127127
<groupId>org.projectlombok</groupId>

0 commit comments

Comments
 (0)