[maven-release-plugin][skip ci] prepare release 23.4.0.19

MNT-24441 Transaction Retries From A Behavior Can Fail During REST API Calls (#2921 )
* Reset the buffered request at the beginning of the transaction
2025-09-24 14:32:01 +00:00 · 2024-09-18 15:25:04 +00:00 · 2024-09-18 15:46:53 +01:00 · 2024-09-18 09:42:05 +00:00 · 2024-09-18 09:42:03 +00:00 · 2024-09-18 11:06:41 +02:00
28 changed files with 48 additions and 51 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.13</version>
+      <version>23.4.0.19</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.13</version>
+      <version>23.4.0.19</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.13</version>
+      <version>23.4.0.19</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.13</version>
+      <version>23.4.0.19</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.13</version>
+      <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+      <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</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.13</version>
+        <version>23.4.0.19</version>
    </parent>

    <properties>
@@ -113,7 +113,7 @@
        <dependency>
            <groupId>org.owasp.encoder</groupId>
            <artifactId>encoder</artifactId>
-            <version>1.2.3</version>
+            <version>1.3.1</version>
        </dependency>
    </dependencies>

--- 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.13</version>
+    <version>23.4.0.19</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -57,14 +57,14 @@
        <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.1.13</dependency.spring.version>
+        <dependency.spring.version>6.0.19</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>
        <dependency.cxf.version>4.0.5</dependency.cxf.version>
        <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
        <dependency.webscripts.version>9.2</dependency.webscripts.version>
-        <dependency.webscripts.version>9.0</dependency.webscripts.version>
+        <dependency.webscripts.version>9.2</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version>
        <dependency.mockito-core.version>5.13.0</dependency.mockito-core.version>
        <dependency.assertj.version>3.26.3</dependency.assertj.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.24.0</dependency.log4j.version>
+        <dependency.log4j.version>2.23.1</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.13</tag>
+        <tag>23.4.0.19</tag>
    </scm>

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

            <!-- provided dependencies -->
@@ -1013,7 +1013,7 @@
                </plugin>
                <plugin>
                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.5.0</version>
                </plugin>
                <plugin>
                    <artifactId>maven-jar-plugin</artifactId>
@@ -1036,7 +1036,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.7.1</version>
+                    <version>3.8.0</version>
                </plugin>
                <plugin>
                    <artifactId>maven-assembly-plugin</artifactId>
--- 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.13</version>
+        <version>23.4.0.19</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,22 +110,10 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements
                @Override
                public Object execute() throws Throwable
                {
-                    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;
-                    }
+                    // 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);
                }
            };

@@ -238,6 +226,15 @@ 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}'.split(','))}" />
+      <property name="nonAttachContentTypes" value="#{T(java.util.Arrays).asList('${content.nonAttach.mimetypes}')}" />
   </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.13</version>
+        <version>23.4.0.19</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, "The lockState should not be null");
+        Assert.notNull(lockState);
        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
alfresco-build	da96fd52ca	[maven-release-plugin][skip ci] prepare release 23.4.0.19	2024-09-18 15:25:04 +00:00
Eva Vasques	0fd088fc59	MNT-24441 Transaction Retries From A Behavior Can Fail During REST API Calls (#2921 ) * Reset the buffered request at the beginning of the transaction	2024-09-18 15:46:53 +01:00
alfresco-build	dea78f5d30	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-18 09:42:05 +00:00
alfresco-build	aa02febb3f	[maven-release-plugin][skip ci] prepare release 23.4.0.18	2024-09-18 09:42:03 +00:00
Maciej Pichura	84e1c90745	Revert "Bump dependency.log4j.version from 2.23.1 to 2.24.0 (#2904 )" (#2920 ) This reverts commit `22b6131f93`.	2024-09-18 11:06:41 +02:00
alfresco-build	7ce2349edc	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-18 07:50:32 +00:00
alfresco-build	6d02269164	[maven-release-plugin][skip ci] prepare release 23.4.0.17	2024-09-18 07:50:29 +00:00
Maciej Pichura	ba323979ff	Revert "Bump dependency.spring.version from 6.0.19 to 6.1.13 (#2909 )" (#2919 ) This reverts commit `b4c18c9902`.	2024-09-18 09:13:40 +02:00
alfresco-build	b1cf324289	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-17 11:15:23 +00:00
alfresco-build	acb34b7861	[maven-release-plugin][skip ci] prepare release 23.4.0.16	2024-09-17 11:15:21 +00:00
dependabot[bot]	ab1cce1fec	Bump joda-time:joda-time from 2.12.7 to 2.13.0 (#2917 ) Bumps [joda-time:joda-time](https://github.com/JodaOrg/joda-time) from 2.12.7 to 2.13.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.12.7...v2.13.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-17 12:37:22 +02:00
alfresco-build	7550799a26	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-16 15:43:57 +00:00
alfresco-build	6238485d2b	[maven-release-plugin][skip ci] prepare release 23.4.0.15	2024-09-16 15:43:55 +00:00
dependabot[bot]	8059ccad53	Bump org.owasp.encoder:encoder from 1.2.3 to 1.3.1 (#2865 ) Bumps [org.owasp.encoder:encoder](https://github.com/owasp/owasp-java-encoder) from 1.2.3 to 1.3.1. - [Release notes](https://github.com/owasp/owasp-java-encoder/releases) - [Commits](https://github.com/owasp/owasp-java-encoder/compare/v1.2.3...v1.3.1) --- updated-dependencies: - dependency-name: org.owasp.encoder:encoder dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-16 16:42:13 +02:00
dependabot[bot]	3896979b6c	Bump dependency.webscripts.version from 9.0 to 9.2 (#2910 ) Bumps `dependency.webscripts.version` from 9.0 to 9.2. Updates `org.alfresco.surf:spring-surf-core-configservice` from 9.0 to 9.2 Updates `org.alfresco.surf:spring-webscripts` from 9.0 to 9.2 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-9.0...spring-surf-webscripts-parent-9.2) Updates `org.alfresco.surf:spring-webscripts-api` from 9.0 to 9.2 --- updated-dependencies: - dependency-name: org.alfresco.surf:spring-surf-core-configservice dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-16 16:08:45 +02:00
alfresco-build	98a978a4d1	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-16 14:03:45 +00:00
alfresco-build	cb333d1c20	[maven-release-plugin][skip ci] prepare release 23.4.0.14	2024-09-16 14:03:43 +00:00
dependabot[bot]	ee1d33cb41	Bump org.apache.maven.plugins:maven-dependency-plugin (#2868 ) Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.1...maven-dependency-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-16 15:27:24 +02:00
dependabot[bot]	1e16f74292	Bump org.apache.maven.plugins:maven-failsafe-plugin from 2.22.2 to 3.5.0 (#2885 ) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.2...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-16 14:26:12 +02:00
alfresco-build	8d72d662a0	[maven-release-plugin][skip ci] prepare for next development iteration	2024-09-16 12:06:28 +00:00