ENG-5316: Upgrade java to version 17

Author: eugeniosant

.github/workflows/ga-publication.yml

@@ -46,7 +46,7 @@ jobs:
       - 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

@@ -72,10 +72,10 @@ jobs:
             --token "$ENTANDO_BOT_TOKEN" \
           ;
       #~ JDK
-      - name: "Set up JDK 11"
+      - name: "Set up JDK 17"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       #~ MAVEN CACHE
       - name: "Cache Maven packages"
         uses: actions/cache@v2
@@ -119,10 +119,10 @@ jobs:
 #          ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
 #          ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
 #      #~ JDK
-#      - name: "Set up JDK 11"
+#      - name: "Set up JDK 17"
 #        uses: actions/setup-java@v1
 #        with:
-#          java-version: 11
+#          java-version: 17
 #      #~ MAVEN CACHE
 #      - name: "Cache Maven packages"
 #        id: maven-cache

.github/workflows/publication.yml

@@ -10,7 +10,7 @@ env:
   ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
   PR_CHECKER_PATH: ".github/pr-title-checker-config.json"
 
-  JDK_VERSION: 11
+  JDK_VERSION: 17
   BUILD_COMMANDS: mvn clean install;
   DOCKER_EAP_IMAGE_BASE_NAME: entando/entando-de-app-eap
   DOCKER_TOMCAT_IMAGE_BASE_NAME: entando/entando-de-app-tomcat

Dockerfile.eap

@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/entando/entando-eap73-clustered-base:7.2.0
+FROM registry.hub.docker.com/entando/entando-eap73-clustered-base:7.4.0-ENG-5316-PR-28
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

Dockerfile.tomcat

@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:7.2.0-IT-410-PR-26
+FROM registry.hub.docker.com/entando/entando-tomcat-base:7.4.0-ENG-5316-PR-28
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

Dockerfile.wildfly

@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/entando/entando-wildfly17-base:7.2.0
+FROM registry.hub.docker.com/entando/entando-wildfly17-base:7.4.0-ENG-5316-PR-28
 
 ARG VERSION
 
@@ -7,7 +7,7 @@ LABEL name="Entando App" \
       maintainer="dev@entando.com" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.0.0" \
+      release="7.4.0" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

admin-console/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-admin-console</artifactId>

cds-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>entando-plugin-jpcds</artifactId>
     <groupId>org.entando.entando.plugins</groupId>

cms-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <groupId>org.entando.entando.plugins</groupId>
     <artifactId>entando-plugin-jacms</artifactId>

cms-plugin/src/main/java/com/agiletec/plugins/jacms/aps/system/services/content/ContentManager.java

@@ -14,7 +14,6 @@
 package com.agiletec.plugins.jacms.aps.system.services.content;
 
 import com.agiletec.aps.system.ApsSystemUtils;
-import com.agiletec.aps.system.SystemConstants;
 import com.agiletec.aps.system.common.entity.ApsEntityManager;
 import com.agiletec.aps.system.common.entity.IEntityDAO;
 import com.agiletec.aps.system.common.entity.IEntitySearcherDAO;
@@ -53,8 +52,9 @@
  * Contents manager. This implements all the methods needed to create and manage
  * the contents.
  */
-public class ContentManager extends ApsEntityManager
-                            implements IContentManager, GroupUtilizer<String>, PageUtilizer, ContentUtilizer, ResourceUtilizer, CategoryUtilizer {
+public class ContentManager extends ApsEntityManager 
+        implements IContentManager, GroupUtilizer<String>, PageUtilizer, 
+        ContentUtilizer<String>, ResourceUtilizer<String>, CategoryUtilizer<String, String> {
 
     private static final EntLogger logger = EntLogFactory.getSanitizedLogger(ContentManager.class);
 
@@ -615,7 +615,7 @@ public List getPageUtilizers(String pageCode) throws EntException {
     }
 
     @Override
-    public List getContentUtilizers(String contentId) throws EntException {
+    public List<String> getContentUtilizers(String contentId) throws EntException {
         try {
             return this.getContentDAO().getContentUtilizers(contentId);
         } catch (Throwable t) {
@@ -633,7 +633,7 @@ public List<String> getGroupUtilizers(String groupName) throws EntException {
     }
 
     @Override
-    public List getResourceUtilizers(String resourceId) throws EntException {
+    public List<String> getResourceUtilizers(String resourceId) throws EntException {
         try {
             return this.getContentDAO().getResourceUtilizers(resourceId);
         } catch (Throwable t) {
@@ -642,7 +642,7 @@ public List getResourceUtilizers(String resourceId) throws EntException {
     }
 
     @Override
-    public List getCategoryUtilizers(String resourceId) throws EntException {
+    public List<String> getCategoryUtilizers(String resourceId) throws EntException {
         try {
             return this.getContentDAO().getCategoryUtilizers(resourceId);
         } catch (Throwable t) {
@@ -661,7 +661,7 @@ public void reloadCategoryReferences(String categoryCode) {
 
     @SuppressWarnings("rawtypes")
     @Override
-    public List getCategoryUtilizersForReloadReferences(String categoryCode) {
+    public List<String> getCategoryUtilizersForReloadReferences(String categoryCode) {
         List<String> contentIdToReload = new ArrayList<>();
         try {
             Set<String> contents = this.getContentUpdaterService().getContentsId(categoryCode);