Merge pull request #316 from entando/ESB-808

ESB-808 jump to java 17 - jakartaEE10

Author: ffalqui

.github/build.sh

@@ -5,6 +5,16 @@ mvn -B clean
 (mvn org.codehaus.mojo:license-maven-plugin:2.5.0:aggregate-download-licenses &> ./license-maven-plugin.log) &
 BKMVNPID="$!"
 
+# Check if parent has PR version and purge if needed
+PARENT_VERSION=$(mvn help:evaluate -Dexpression=project.parent.version -q -DforceStdout)
+if [[ "$PARENT_VERSION" == *"-PR"* ]]; then
+  echo "~> Parent PR version detected ($PARENT_VERSION), purging parent dependency cache"
+  mvn dependency:purge-local-repository \
+    -DmanualInclude=org.entando:entando-maven-root \
+    -DreResolve=false \
+    -DactTransitively=false
+fi
+
 mvn versions:set -DnewVersion="$ARTIFACT_VERSION"
 
 mvn -B package;

.github/test-and-scan.sh

@@ -22,6 +22,16 @@ else
   SONAR_ORG=""
 fi
 
+# Check if parent has PR version and purge if needed
+PARENT_VERSION=$(mvn help:evaluate -Dexpression=project.parent.version -q -DforceStdout)
+if [[ "$PARENT_VERSION" == *"-PR"* ]]; then
+  echo "~> Parent PR version detected ($PARENT_VERSION), purging parent dependency cache"
+  mvn dependency:purge-local-repository \
+    -DmanualInclude=org.entando:entando-maven-root \
+    -DreResolve=false \
+    -DactTransitively=false
+fi
+
 # ~ version set
 mvn versions:set -DnewVersion="$ARTIFACT_VERSION"
 

.github/workflows/build.yml

@@ -6,7 +6,7 @@ env:
   GH_PR_TITLE: ${{ github.event.pull_request.title }}
   GH_PR_NUMBER: ${{ github.event.pull_request.number }}
   GH_PR_RUN_NUMBER: ${{ github.run_number }}
-  IMAGES_TO_BUILD: "Dockerfile.eap:entando-de-app-eap,Dockerfile.wildfly:entando-de-app-wildfly,Dockerfile.tomcat:entando-de-app-tomcat"
+  IMAGES_TO_BUILD: "Dockerfile.tomcat:entando-de-app-tomcat"
   ENTANDO_CRANE_VERSION: ${{ vars.ENTANDO_CRANE_VERSION || 'v0.10.0' }}
   GITHUB_REF: ${{ github.ref }}
 
@@ -29,10 +29,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
 
@@ -85,10 +85,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 

Dockerfile.eap

@@ -1,19 +1,21 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.3.0-ENG-5554-PR-31-KB-release-2F-7.3.0
+FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.0-ENG-5316-PR-34-BB-develop
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="[email protected]" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.3.0-fix.2" \
+      release="7.5.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 
 COPY target/generated-resources/licenses /licenses
 COPY target/generated-resources/licenses.xml /
 
 COPY --chown=185:0 webapp/target/*.war /usr/local/tomcat/webapps/
+# Copy CookieProcessor JAR if it exists
+COPY --chown=185:0 webapp/target/*-jsessionid-cookie-processor.jar /usr/local/tomcat/lib/
 
 RUN $ENTANDO_COMMON_PATH/init-derby-from-war.sh
 

Dockerfile.tomcat

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-admin-console</artifactId>
@@ -237,7 +237,7 @@
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
-            <artifactId>jdom</artifactId>
+            <artifactId>jdom2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.entando.entando</groupId>
@@ -258,18 +258,6 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-request-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-ognl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -300,17 +288,26 @@
             <artifactId>mockito-junit-jupiter</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Dockerfile.wildfly

@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.entando.entando.ent.exception.EntException;
 import org.entando.entando.ent.util.EntLogging.EntLogger;

admin-console/pom.xml

@@ -15,7 +15,7 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 import com.agiletec.aps.system.services.category.Category;

admin-console/src/main/java/com/agiletec/apsadmin/category/helper/CategoryActionHelper.java

@@ -21,7 +21,7 @@
 import org.entando.entando.ent.util.EntLogging.EntLogger;
 import org.entando.entando.ent.util.EntLogging.EntLogFactory;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * Action specifica per la gestione delle operazioni di login.