Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into fix/MNT-24590-add-file-cleaner-servlet-context-listener

[MNT-24590] Add JakartaFileCleaner servlet context listener
2025-09-24 14:32:01 +00:00 · 2024-09-17 10:30:57 +01:00 · 2024-09-13 16:12:25 +01:00
29 changed files with 52 additions and 44 deletions
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.4.0.19</version>
+      <version>23.4.0.16-SNAPSHOT</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/war/src/main/webapp/WEB-INF/web.xml
+++ b/packaging/war/src/main/webapp/WEB-INF/web.xml
@@ -259,6 +259,11 @@
      <listener-class>org.alfresco.web.app.servlet.CORSContextListener</listener-class>
   </listener>

+   <!-- Commons FileUpload2 Jakarta - Stops reaper thread started by org.apache.commons.io.FileCleaningTracker -->
+   <listener>
+      <listener-class>org.apache.commons.fileupload2.jakarta.JakartaFileCleaner</listener-class>
+   </listener>
+
   <!-- Enterprise listener placeholder -->
   <servlet>
      <servlet-name>downloadContent</servlet-name>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>23.4.0.19</version>
+    <version>23.4.0.16-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -57,7 +57,7 @@
        <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>

        <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
-        <dependency.spring.version>6.0.19</dependency.spring.version>
+        <dependency.spring.version>6.1.13</dependency.spring.version>
        <dependency.spring-security.version>6.3.1</dependency.spring-security.version>
        <dependency.antlr.version>3.5.3</dependency.antlr.version>
        <dependency.jackson.version>2.17.2</dependency.jackson.version>
@@ -80,7 +80,7 @@
        <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
        <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
        <dependency.slf4j.version>2.0.16</dependency.slf4j.version>
-        <dependency.log4j.version>2.23.1</dependency.log4j.version>
+        <dependency.log4j.version>2.24.0</dependency.log4j.version>
        <dependency.groovy.version>3.0.22</dependency.groovy.version>
        <dependency.tika.version>2.9.2</dependency.tika.version>
        <dependency.truezip.version>7.7.10</dependency.truezip.version>
@@ -152,7 +152,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.4.0.19</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -791,7 +791,7 @@
            <dependency>
                <groupId>joda-time</groupId>
                <artifactId>joda-time</artifactId>
-                <version>2.13.0</version>
+                <version>2.12.7</version>
            </dependency>

            <!-- provided dependencies -->
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
@@ -110,10 +110,22 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements
                @Override
                public Object execute() throws Throwable
                {
-                    // Reset the request so that it can be read again in case of retry
-                    resetRequest(req);
-                    final Params params = paramsExtractor.extractParams(resource.getMetaData(), req);
-                    return AbstractResourceWebScript.this.execute(resource, params, res, isReadOnly);
+                    try
+                    {
+                        final Params params = paramsExtractor.extractParams(resource.getMetaData(), req);
+                        return AbstractResourceWebScript.this.execute(resource, params, res, isReadOnly);
+                    }
+                    catch (Exception e)
+                    {
+                        if (req instanceof BufferedRequest)
+                        {
+                            // Reset the request in case of a transaction retry
+                            ((BufferedRequest) req).reset();
+                        }
+
+                        // re-throw original exception for retry
+                        throw e;
+                    }
                }
            };

@@ -226,15 +238,6 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements
        }
    }

-    protected void resetRequest(WebScriptRequest req)
-    {
-        if (req instanceof BufferedRequest)
-        {
-            BufferedRequest bufferedRequest = (BufferedRequest) req;
-            bufferedRequest.reset();
-        }
-    }
-
    protected RetryingTransactionHelper getTransactionHelper(String api)
    {
        RetryingTransactionHelper transHelper = transactionService.getRetryingTransactionHelper();
--- a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
+++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
@@ -250,7 +250,7 @@
      <property name="delegate" ref="webscript.content.streamer" />
      <property name="contentService" ref="contentService" />
      <property name="repository" ref="repositoryHelper" />
-      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}')}" />
+      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}'.split(','))}" />
   </bean>
   
   <!--  Content Info -->
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.4.0.19</version>
+        <version>23.4.0.16-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService,
        }
        
        // Never return a null LockState
-        Assert.notNull(lockState);
+        Assert.notNull(lockState, "The lockState should not be null");
        return lockState;
    }

--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -68,4 +68,4 @@ services:
    volumes:
      - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
    ports:
-      - 8999:8080
+      - 8999:8080
Author	SHA1	Message	Date
Tiago Salvado	fe3329b228	Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into fix/MNT-24590-add-file-cleaner-servlet-context-listener	2024-09-17 10:30:57 +01:00
Tiago Salvado	f32979e84d	[MNT-24590] Add JakartaFileCleaner servlet context listener	2024-09-13 16:12:25 +01:00