chore: SDK 4.7 and Alfresco 23.1 Compatibility

Issue: #201056 Change-Id: Ib460fcfe144b1e4c4555919981f3a922deadfbc8
atolcd · Jan 9, 2024 · 3ea33e0 · 3ea33e0
1 parent 9c6c4ae
commit 3ea33e0
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 87 deletions.
diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md
@@ -7,9 +7,9 @@ Supported DBMS:
 - SQL Server
 - DB2
 
-
 ## [2.2.0] - 2024-01-09
 ### Changed
+- SDK 4.7 and Alfresco 23.1 Compatibility
 - SDK 4.6 migration and Alfresco 7.4.1 compatibility
 - Upgrade to log4j2 - ACS 7.4 compatibility
 - Updates modules "ootbee-support-tools" - ACS 7.4 compatibility

diff --git a/CHANGELOG_FR.md b/CHANGELOG_FR.md
@@ -7,9 +7,9 @@ SGBD supportés :
 - SQL Server
 - DB2
 
-
 ## [2.2.0] - 2024-01-09
 ### Changed
+- Migration SDK 4.7 et compatibilité Alfresco 23.1
 - Migration SDK 4.6 et compatibilité Alfresco 7.4.1
 - Passage à log4j2 - compatibilité ACS 7.4
 - Mise à jour des modules "ootbee-support-tools" - compatibilité ACS 7.4

diff --git a/audit-share-platform-docker/pom.xml b/audit-share-platform-docker/pom.xml
@@ -9,7 +9,7 @@
 
   <parent>
     <groupId>com.atolcd.alfresco</groupId>
-    <artifactId>auditshare-74X</artifactId>
+    <artifactId>auditshare-23X</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -19,16 +19,17 @@
   <dependencies>
     <dependency>
       <groupId>com.atolcd.alfresco</groupId>
-      <artifactId>auditshare-74X-repo</artifactId>
+      <artifactId>auditshare-23X-repo</artifactId>
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
+    <!-- TEMPORARY COMMENT : Check Pull Request - Alfresco Content Services 23.1 compatibility : https://github.com/OrderOfTheBee/ootbee-support-tools/pull/215 -->
+    <!--  <dependency>
       <groupId>org.orderofthebee.support-tools</groupId>
       <artifactId>support-tools-repo</artifactId>
       <version>${support-tools.version}</version>
       <classifier>amp</classifier>
       <type>amp</type>
-    </dependency>
+    </dependency> -->
     <!-- Uncomment this dependency if you already have the AMP in your M2_HOME folder
          or see the documentation for 3rd party amps installation: https://docs.alfresco.com/content-services/latest/develop/sdk/#installing3rdpartyamps
     <dependency>

diff --git a/audit-share-platform-docker/src/main/docker/alfresco-global.properties b/audit-share-platform-docker/src/main/docker/alfresco-global.properties
@@ -89,10 +89,10 @@ csrf.filter.enabled=false
 messaging.broker.url=vm://localhost?broker.persistent=false
 
 # Enable ATS
-transform.service.enabled=true
-transform.service.url=http://transform-router:8095/
+transform.service.enabled=false
+#transform.service.url=http://transform-router:8095/
 localTransform.core-aio.url=http://transform-core-aio:8090/
-sfs.url=http://shared-file-store:8099/
+#sfs.url=http://shared-file-store:8099/
 
 # Enable DTE - enable also t-engine in docker-compose
 # localTransform.transform-dte.url=http://transform-dte-engine:8090/

diff --git a/audit-share-platform/pom.xml b/audit-share-platform/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>auditshare-74X-repo</artifactId>
+  <artifactId>auditshare-23X-repo</artifactId>
   <name>AuditShare - Repository</name>
   <description>AuditShare repository project</description>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>com.atolcd.alfresco</groupId>
-    <artifactId>auditshare-74X</artifactId>
+    <artifactId>auditshare-23X</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 

diff --git a/...rm/src/main/java/com/atolcd/auditshare/repo/service/AuditShareReferentielServiceImpl.java b/...rm/src/main/java/com/atolcd/auditshare/repo/service/AuditShareReferentielServiceImpl.java
@@ -21,8 +21,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.ContentService;

diff --git a/audit-share-platform/src/main/java/com/atolcd/auditshare/repo/xml/Group.java b/audit-share-platform/src/main/java/com/atolcd/auditshare/repo/xml/Group.java
@@ -18,11 +18,11 @@
 package com.atolcd.auditshare.repo.xml;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = { "id", "libelle" })

diff --git a/audit-share-platform/src/main/java/com/atolcd/auditshare/repo/xml/ReferentielGroups.java b/audit-share-platform/src/main/java/com/atolcd/auditshare/repo/xml/ReferentielGroups.java
@@ -20,11 +20,11 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = { "Groups" })

diff --git a/audit-share-share-docker/pom.xml b/audit-share-share-docker/pom.xml
@@ -9,7 +9,7 @@
 
   <parent>
     <groupId>com.atolcd.alfresco</groupId>
-    <artifactId>auditshare-74X</artifactId>
+    <artifactId>auditshare-23X</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -19,16 +19,17 @@
   <dependencies>
     <dependency>
       <groupId>com.atolcd.alfresco</groupId>
-      <artifactId>auditshare-74X-share</artifactId>
+      <artifactId>auditshare-23X-share</artifactId>
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
+    <!-- TEMPORARY COMMENT : Check Pull Request - Alfresco Content Services 23.1 compatibility : https://github.com/OrderOfTheBee/ootbee-support-tools/pull/215 -->
+    <!-- <dependency>
       <groupId>org.orderofthebee.support-tools</groupId>
       <artifactId>support-tools-share</artifactId>
       <version>${support-tools.version}</version>
       <classifier>amp</classifier>
       <type>amp</type>
-    </dependency>
+    </dependency> -->
     <!-- Uncomment this dependency if you already have the AMP in your M2_HOME folder
          or see the documentation for 3rd party amps installation: https://docs.alfresco.com/content-services/latest/develop/sdk/#installing3rdpartyamps
     <dependency>

diff --git a/audit-share-share/pom.xml b/audit-share-share/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>auditshare-74X-share</artifactId>
+  <artifactId>auditshare-23X-share</artifactId>
   <name>AuditShare - Share</name>
   <description>AuditShare Share project</description>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>com.atolcd.alfresco</groupId>
-    <artifactId>auditshare-74X</artifactId>
+    <artifactId>auditshare-23X</artifactId>
     <version>2.2.0-SNAPSHOT</version>
   </parent>
 
@@ -26,9 +26,9 @@
       <classifier>classes</classifier>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/audit-share-share/src/main/java/com/atolcd/alfresco/AuditFilter.java b/audit-share-share/src/main/java/com/atolcd/alfresco/AuditFilter.java
@@ -27,14 +27,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.logging.Log;

diff --git a/audit-share-share/src/main/java/com/atolcd/alfresco/ProxyAuditFilter.java b/audit-share-share/src/main/java/com/atolcd/alfresco/ProxyAuditFilter.java
@@ -25,14 +25,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.logging.Log;

diff --git a/audit-share-share/src/main/java/com/atolcd/alfresco/RequestWrapper.java b/audit-share-share/src/main/java/com/atolcd/alfresco/RequestWrapper.java
@@ -22,9 +22,10 @@
 import java.io.InputStream;
 import java.io.StringWriter;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -73,6 +74,19 @@ public int read() throws IOException {
                         return 0;
                     }
                 }
+                @Override
+                public boolean isFinished() {
+                  return false;
+                }
+
+                @Override
+                public boolean isReady() {
+                  return false;
+                }
+
+                @Override
+                public void setReadListener(ReadListener readListener) {
+                }
             };
         } else
             inputStream = this.getRequest().getInputStream();

diff --git a/...are-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java b/...are-share/src/main/java/com/atolcd/auditshare/repo/jscript/AuditShareScriptExtension.java
@@ -21,7 +21,7 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.alfresco.web.extensibility.SlingshotEvaluatorUtil;
 import org.alfresco.web.site.SlingshotUserFactory;

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - audit-share-postgres
 
   audit-share-postgres:
-    image: postgres:14.4
+    image: postgres:15.4
     environment:
       POSTGRES_DB: alfresco
       POSTGRES_USER: alfresco
@@ -66,7 +66,7 @@ services:
       - audit-share-ass-volume:/opt/alfresco-search-services/data
 
   transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:4.0.0
+    image: alfresco/alfresco-transform-core-aio:5.0.1
     environment:
       JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
       ACTIVEMQ_URL: "nio://activemq:61616"
@@ -79,29 +79,29 @@ services:
       - activemq
 
   # Block to comment in Community version
-  transform-router:
-    image: quay.io/alfresco/alfresco-transform-router:3.0.0
-    environment:
-      JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      CORE_AIO_URL : "http://transform-core-aio:8090"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-    ports:
-      - 8095:8095
-    links:
-      - activemq
+  # transform-router:
+  #   image: quay.io/alfresco/alfresco-transform-router:3.0.0
+  #   environment:
+  #     JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+  #     ACTIVEMQ_URL: "nio://activemq:61616"
+  #     CORE_AIO_URL : "http://transform-core-aio:8090"
+  #     FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+  #   ports:
+  #     - 8095:8095
+  #   links:
+  #     - activemq
 
-  shared-file-store:
-    image: quay.io/alfresco/alfresco-shared-file-store:3.0.0
-    # Community : alfresco/alfresco-shared-file-store:0.16.1
-    environment:
-      JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-      scheduler.content.age.millis: 86400000
-      scheduler.cleanup.interval: 86400000
-    ports:
-      - 8099:8099
-    volumes:
-      - sfs-data:/tmp/Alfresco/sfs
+  # shared-file-store:
+  #   image: quay.io/alfresco/alfresco-shared-file-store:3.0.0
+  #   # Community : alfresco/alfresco-shared-file-store:0.16.1
+  #   environment:
+  #     JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+  #     scheduler.content.age.millis: 86400000
+  #     scheduler.cleanup.interval: 86400000
+  #   ports:
+  #     - 8099:8099
+  #   volumes:
+  #     - sfs-data:/tmp/Alfresco/sfs
 
 #  transform-dte-engine:
 #    image: alfresco/transform-dte-engine:2.4.0
@@ -131,7 +131,7 @@ volumes:
     external: true
   audit-share-ass-volume:
     external: true
-  sfs-data:
-    driver_opts:
-      type: tmpfs
-      device: tmpfs
+  # sfs-data:
+  #   driver_opts:
+  #     type: tmpfs
+  #     device: tmpfs