ENG-5316: Upgrade java to version 17

.ent/enp-build-key.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-TMP="$(cat Dockerfile.eap Dockerfile.tomcat Dockerfile.wildfly  | sha256sum --zero | cut -d' ' -f1)"
+TMP="$(cat Dockerfile.tomcat | sha256sum --zero | cut -d' ' -f1)"
 TMP+="${PPL_COMMIT_ID}_${ENTANDO_PRJ_VERSION}"
 echo "$TMP"

.github/workflows/ga-publication.yml

@@ -38,15 +38,15 @@ jobs:
             --id "CHECKOUT FOR GA PUBLICATION" \
             --lcd "$LOCAL_CLONE_DIR"
       - name: "Cache Maven packages"
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: "Configure GA Repository"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: maven-central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

.github/workflows/pr.yml

@@ -80,7 +80,7 @@ jobs:
       #~ BUILD CACHE
       - name: "Cache Build Dir"
         id: build-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: "${{ env.LOCAL_CLONE_DIR}}/${{ env.BUILD_TARGET_DIR }}/"
           key: "${{ runner.os }}-enp-build-${{ env.BUILD_CACHE_KEY }}"

.github/workflows/publication.yml

@@ -10,15 +10,10 @@ env:
   ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
   PR_CHECKER_PATH: ".github/pr-title-checker-config.json"
 
-  DOCKER_EAP_IMAGE_BASE_NAME: entando/entando-eap73-clustered-base
   DOCKER_TOMCAT_IMAGE_BASE_NAME: entando/entando-tomcat-base
-  DOCKER_WILDFLY_IMAGE_BASE_NAME: entando/entando-wildfly17-base
-  DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE: linux/amd64
   DOCKER_TOMCAT_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64
   DOCKER_IMAGE_CONTEXT: .
-  DOCKER_EAP_IMAGE_FILE: Dockerfile.eap
   DOCKER_TOMCAT_IMAGE_FILE: Dockerfile.tomcat
-  DOCKER_WILDFLY_IMAGE_FILE: Dockerfile.wildfly
   DOCKER_IMAGE_PUSH: true
 
 jobs:
@@ -39,23 +34,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Docker meta-eap
-        id: meta-eap
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_EAP_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
-
       - name: Docker meta-tomcat
         id: meta-tomcat
         uses: docker/metadata-action@v4
@@ -73,23 +51,6 @@ jobs:
             type=sha
             type=raw,event=pr,value={{base_ref}}
 
-      - name: Docker meta-wildfly
-        id: meta-wildfly
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_WILDFLY_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -111,16 +72,6 @@ jobs:
           username: ${{ secrets.ENTANDO_RHT_DOCKER_USERNAME }}
           password: ${{ secrets.ENTANDO_RHT_DOCKER_PASSWORD }}
 
-      - name: Build and publish EAP image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_EAP_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-eap.outputs.tags }}
-          labels: ${{ steps.meta-eap.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
-
       - name: Build and publish Tomcat image
         uses: docker/build-push-action@v4
         with:
@@ -129,14 +80,4 @@ jobs:
           push: ${{ env.DOCKER_IMAGE_PUSH }}
           tags: ${{ steps.meta-tomcat.outputs.tags }}
           labels: ${{ steps.meta-tomcat.outputs.labels }}
-          platforms: ${{ env.DOCKER_TOMCAT_IMAGE_ARCHITECTURE }}
-
-      - name: Build and publish Wildfly image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_WILDFLY_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-wildfly.outputs.tags }}
-          labels: ${{ steps.meta-wildfly.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
+          platforms: ${{ env.DOCKER_TOMCAT_IMAGE_ARCHITECTURE }}

Dockerfile.tomcat

@@ -1,7 +1,7 @@
-FROM tomcat:9.0.71-jdk11-temurin
+FROM tomcat:10.1.46-jdk17-temurin
 
-LABEL io.k8s.description="Platform for building and running Entando clustered applications on Apache Tomcat 9.0" \
-      io.k8s.display-name="Entando on Apache Tomcat 9.0"
+LABEL io.k8s.description="Platform for building and running Entando clustered applications on Apache Tomcat 10" \
+      io.k8s.display-name="Entando on Apache Tomcat 10"
 
 ENV USERID_TO_USE=185 \
     STI_SCRIPTS_PATH="/usr/local/tomcat/bin" \
@@ -58,9 +58,19 @@ RUN apt-get update && \
     chmod -R ug+w /usr/local/tomcat
 
 
-#######################################    
+#######################################
+# Download Jetty Home 12 for database initialization
+#######################################
+ARG JETTY_VERSION=12.0.27
+RUN wget -O /tmp/jetty-home.tar.gz https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_VERSION}/jetty-home-${JETTY_VERSION}.tar.gz && \
+    tar -xzf /tmp/jetty-home.tar.gz -C /tmp && \
+    mv /tmp/jetty-home-${JETTY_VERSION} /jetty-home && \
+    rm /tmp/jetty-home.tar.gz && \
+    chown -R 185:0 /jetty-home
+
+#######################################
 # Copy scripts to prepare and run
-#######################################    
+#######################################
 COPY --chown=185:0 ./common/entando-common "${ENTANDO_COMMON_PATH}"
 COPY --chown=185:0 ./common/jetty-runner /jetty-runner
 COPY --chown=185:0 tomcat/conf/setenv.sh /usr/local/tomcat/bin/setenv.sh
@@ -69,19 +79,21 @@ COPY --chown=185:0 tomcat/run ${STI_SCRIPTS_PATH}/run
 #######################################    
 # Download and copy dbms drivers
 #######################################    
-ARG DERBY_JDBC_DRIVER_VERSION=10.9.1.0
-ARG POSTGRESQL_JDBC_DRIVER_VERSION=42.2.25
-ARG MYSQL_JDBC_DRIVER_VERSION=8.0.28
-ARG ORACLE_JDBC_DRIVER_VERSION=21.4.0.0.1
+ARG DERBY_JDBC_DRIVER_VERSION=10.16.1.1
+ARG POSTGRESQL_JDBC_DRIVER_VERSION=42.7.8
+ARG MYSQL_JDBC_DRIVER_VERSION=9.4.0
+ARG ORACLE_JDBC_DRIVER_VERSION=23.9.0.25.07
 RUN curl https://repo1.maven.org/maven2/org/apache/derby/derby/${DERBY_JDBC_DRIVER_VERSION}/derby-${DERBY_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/derby.jar
+RUN curl https://repo1.maven.org/maven2/org/apache/derby/derbytools/${DERBY_JDBC_DRIVER_VERSION}/derbytools-${DERBY_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/derbytools.jar
+RUN curl https://repo1.maven.org/maven2/org/apache/derby/derbyshared/${DERBY_JDBC_DRIVER_VERSION}/derbyshared-${DERBY_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/derbyshared.jar
+RUN curl https://repo1.maven.org/maven2/org/apache/derby/derbynet/${DERBY_JDBC_DRIVER_VERSION}/derbynet-${DERBY_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/derbynet.jar
 RUN curl https://repo1.maven.org/maven2/org/apache/derby/derbyclient/${DERBY_JDBC_DRIVER_VERSION}/derbyclient-${DERBY_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/derbyclient.jar
 RUN curl https://repo1.maven.org/maven2/org/postgresql/postgresql/${POSTGRESQL_JDBC_DRIVER_VERSION}/postgresql-${POSTGRESQL_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/postgresql.jar
-RUN curl https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_DRIVER_VERSION}/mysql-connector-java-${MYSQL_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/mysql-connector-java.jar
+RUN curl https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_DRIVER_VERSION}/mysql-connector-j-${MYSQL_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/mysql-connector-java.jar
 RUN curl https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/${ORACLE_JDBC_DRIVER_VERSION}/ojdbc8-${ORACLE_JDBC_DRIVER_VERSION}.jar -o /jetty-runner/ojdbc8.jar
 
 RUN cp /jetty-runner/postgresql.jar /usr/local/tomcat/lib/ && \
-    cp /jetty-runner/derby.jar /usr/local/tomcat/lib/ && \
-    cp /jetty-runner/derbyclient.jar /usr/local/tomcat/lib/ && \
+    cp /jetty-runner/derby*.jar /usr/local/tomcat/lib/ && \
     cp /jetty-runner/mysql-connector-java.jar /usr/local/tomcat/lib/ && \
     cp /jetty-runner/ojdbc8.jar /usr/local/tomcat/lib/
 
@@ -114,4 +126,4 @@ USER $USERID_TO_USE
 
 CMD "${STI_SCRIPTS_PATH}/run"
 
-VOLUME /entando-data
+VOLUME /entando-data