refactor: streamline spring boot configuration.

Author: Mateusz Czeladka

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

@@ -10,11 +10,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up Amazon Corretto
-        uses: actions/setup-java@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
         with:
-          distribution: 'corretto'
-          java-version: 24
+          java-version: '21'
+          distribution: 'temurin'
           cache: maven
 
       - name: Build project

api/Dockerfile

@@ -3,19 +3,9 @@ WORKDIR /build
 
 # Install necessary tools but not OpenJDK from apt
 RUN apt update --fix-missing \
-    && apt install -y --no-install-recommends maven curl ca-certificates \
+    && apt install -y --no-install-recommends openjdk-21-jdk maven curl ca-certificates \
     && apt clean
 
-# Download and setup JDK 24.0.1
-RUN mkdir -p /opt/java \
-    && 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 \
-    && tar -xzf /opt/jdk.tar.gz -C /opt/java \
-    && rm /opt/jdk.tar.gz
-
-# Set JAVA_HOME and update PATH
-ENV JAVA_HOME=/opt/java/jdk-24.0.1
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
 COPY ./pom.xml /build/pom.xml
 COPY ./api /build/api
 COPY ./yaci-indexer /build/yaci-indexer

api/pom.xml

@@ -226,7 +226,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${version.maven-compiler-plugin}</version>
                 <configuration>
-                    <release>24</release>
+                    <release>21</release>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>

docker/Dockerfile

@@ -11,16 +11,6 @@ RUN apt update --fix-missing \
     g++ tmux git jq wget libncursesw5-dev libtool autoconf liblmdb-dev curl ca-certificates pkg-config \
     && apt-get clean
 
-# Download and setup JDK 24.0.1
-RUN mkdir -p /opt/java \
-    && 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 \
-    && tar -xzf /opt/jdk.tar.gz -C /opt/java \
-    && rm /opt/jdk.tar.gz
-
-# Set JAVA_HOME and update PATH
-ENV JAVA_HOME=/opt/java/jdk-24.0.1
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
 WORKDIR /root/src
 
 # Install ghcup
@@ -159,7 +149,7 @@ FROM ubuntu:22.04 AS java-builder
 WORKDIR /root/app
 
 RUN apt update --fix-missing \
-    && apt install -y --no-install-recommends maven \
+    && apt install -y --no-install-recommends openjdk-21-jdk maven \
     && apt-get clean
 
 COPY ./pom.xml /root/app/pom.xml
@@ -207,16 +197,6 @@ RUN rm -rf /var/lib/postgresql/${PG_VERSION}/main
 RUN apt install -y --no-install-recommends jq bc sudo curl \
     && apt clean
 
-# Download and setup JDK 24.0.1
-RUN mkdir -p /opt/java \
-    && 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 \
-    && tar -xzf /opt/jdk.tar.gz -C /opt/java \
-    && rm /opt/jdk.tar.gz
-
-# Set JAVA_HOME and update PATH
-ENV JAVA_HOME=/opt/java/jdk-24.0.1
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
 # Copy cardano node
 COPY --from=cardano-builder /usr/local/lib /usr/local/lib
 COPY --from=cardano-builder /root/.local/bin/cardano-* /usr/local/bin/

pom.xml

@@ -28,7 +28,7 @@
     <properties>
         <maven.compiler.proc>full</maven.compiler.proc>
         <revision>1.2.6</revision>
-        <java.version>24</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.spring-boot>3.4.3</version.spring-boot>
         <version.springdoc-openapi-ui>1.6.15</version.springdoc-openapi-ui>

test-data-generator/pom.xml

@@ -62,7 +62,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${version.maven-compiler-plugin}</version>
                 <configuration>
-                    <release>24</release>
+                    <release>21</release>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>

yaci-indexer/Dockerfile

@@ -2,19 +2,9 @@ FROM ubuntu:22.04 AS build-common
 WORKDIR /build
 
 RUN apt update --fix-missing \
-    && apt install -y --no-install-recommends maven curl \
+    && apt install -y --no-install-recommends openjdk-21-jdk maven curl \
     && apt clean
 
-# Download and setup JDK 24.0.1
-RUN mkdir -p /opt/java \
-    && 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 \
-    && tar -xzf /opt/jdk.tar.gz -C /opt/java \
-    && rm /opt/jdk.tar.gz
-
-# Set JAVA_HOME and update PATH
-ENV JAVA_HOME=/opt/java/jdk-24.0.1
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
 COPY ./pom.xml /build/pom.xml
 COPY ./api /build/api
 COPY ./yaci-indexer /build/yaci-indexer

yaci-indexer/pom.xml

@@ -16,7 +16,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>24</java.version>
+        <java.version>21</java.version>
         <maven.compiler.proc>full</maven.compiler.proc>
         <yaci-store.version>0.1.2</yaci-store.version>
         <sonar.exclusions>src/main/java/org/cardanofoundation/rosetta/yaciindexer/stores/txsize/model/*</sonar.exclusions>
@@ -116,7 +116,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${version.maven-compiler-plugin}</version>
                 <configuration>
-                    <release>24</release>
+                    <release>21</release>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>