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

[MNT-23642] Add error messages (#2019 ) (#2024 )
(cherry picked from commit 689e6a23fa)
2025-10-29 15:21:53 +00:00 · 2023-06-28 23:54:47 +00:00 · 2023-06-29 00:08:56 +01:00 · 2023-06-21 10:25:52 +00:00 · 2023-06-21 10:25:49 +00:00 · 2023-06-21 14:16:59 +05:30
29 changed files with 47 additions and 34 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>20.161</version>
+      <version>21.4</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>20.161</version>
+      <version>21.4</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>20.161</version>
+      <version>21.4</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>20.161</version>
+      <version>21.4</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>20.161</version>
+      <version>21.4</version>
   </parent>
   <properties>
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -5,7 +5,7 @@
 # Version label
 version.major=7
 version.minor=4
-version.revision=0
+version.revision=1
 version.label=
 # Edition label
--- 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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+      <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</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>20.161</version>
+        <version>21.4</version>
    </parent>
    <properties>
--- 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>20.161</version>
+    <version>21.4</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>
@@ -25,7 +25,7 @@
    <properties>
        <acs.version.major>7</acs.version.major>
        <acs.version.minor>4</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -150,7 +150,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>20.161</tag>
+        <tag>21.4</tag>
    </scm>
    <distributionManagement>
--- 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>20.161</version>
+        <version>21.4</version>
    </parent>
    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.161</version>
+        <version>21.4</version>
    </parent>
    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java
+++ b/repository/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java
@@ -251,15 +251,16 @@ public class TransactionBehaviourQueue implements TransactionListener
        }
        catch (IllegalArgumentException e)
        {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e);
+            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + e.getMessage(), e);
        }
        catch (IllegalAccessException e)
        {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e);
+            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + e.getMessage(), e);
        }
        catch (InvocationTargetException e)
        {
-            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId(), e.getTargetException());
+            String msg = e.getMessage() + (e.getTargetException() != null ? "(" + e.getTargetException().getMessage() + ")" : "");
            throw new AlfrescoRuntimeException("Failed to execute transaction-level behaviour " + context.method + " in transaction " + AlfrescoTransactionSupport.getTransactionId() + " : " + msg, e.getTargetException());
        }
    }
--- a/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
+++ b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
@@ -1605,8 +1605,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                    this.userSearchCtls = new SearchControls();
                    this.userSearchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
                    this.userSearchCtls.setReturningAttributes(LDAPUserRegistry.this.userKeys.getFirst());
                    // MNT-14001 fix, set search limit to ensure that server will not return more search results then provided by paged result control
                    this.userSearchCtls.setCountLimit(LDAPUserRegistry.this.queryBatchSize > 0 ? LDAPUserRegistry.this.queryBatchSize : 0);
                    this.next = fetchNext();
                }
--- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
@@ -997,6 +997,20 @@ public class WorkflowServiceImpl implements WorkflowService
    public WorkflowTask updateTask(String taskId, Map<QName, Serializable> properties, Map<QName, List<NodeRef>> add,
                Map<QName, List<NodeRef>> remove)
    {
    	if(properties.containsKey(WorkflowModel.PROP_STATUS)) {
            LinkedList<String> validTaskStatus = new LinkedList<>();
            validTaskStatus.add("Not Yet Started");
            validTaskStatus.add("In Progress");
            validTaskStatus.add("On Hold");
            validTaskStatus.add("Cancelled");
            validTaskStatus.add("Completed");
            if (!validTaskStatus.contains(properties.get(WorkflowModel.PROP_STATUS))) {
                throw new WorkflowException("Invalid Value is Passed for Task Status.");
            }
        }
        String engineId = BPMEngineRegistry.getEngineId(taskId);
        TaskComponent component = getTaskComponent(engineId);
        // get the current assignee before updating the task
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository
 # Schema number
-version.schema=18000
+version.schema=18100
 # Directory configuration
@@ -1349,7 +1349,7 @@ system.remove-alf_server-table-from-db.ignored=true
 allow.unsecure.callback.jsonp=false
 # pre-configured allow list of media/mime types to allow inline instead of attachment (via Content-Disposition response header)
-content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp
+content.nonAttach.mimetypes=application/pdf,image/jpeg,image/gif,image/png,image/tiff,image/bmp,application/octet-stream
 # Zip file compression ratio threshold as a percentage, above which the zip file will be considered a "zip bomb" and the
 # import extraction process cancelled.
Author	SHA1	Message	Date
alfresco-build	96456ec719	[maven-release-plugin][skip ci] prepare release 21.4	2023-06-28 23:54:47 +00:00
tiagosalvado10	71bbb579e6	[MNT-23642] Add error messages (#2019 ) (#2024 ) (cherry picked from commit `689e6a23fa`)	2023-06-29 00:08:56 +01:00
alfresco-build	51dcf28756	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-21 10:25:52 +00:00
alfresco-build	1639a17451	[maven-release-plugin][skip ci] prepare release 21.3	2023-06-21 10:25:49 +00:00
rrajoria	585e6042cb	Fix/MNT-23612 Fix to allow only valid task status. (#1954 ) * Update WorkflowServiceImpl.java * Update WorkflowServiceImpl.java (cherry picked from commit `4c256ab546`)	2023-06-21 14:16:59 +05:30
alfresco-build	8364211384	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-20 07:05:59 +00:00
alfresco-build	f68d304d57	[maven-release-plugin][skip ci] prepare release 21.2	2023-06-20 07:05:55 +00:00
rrajoria	b55e1114e6	MNT-23724: Fix for Downloading a folder as zip with correct Name Cherrypicked from master	2023-06-20 11:14:17 +05:30
alfresco-build	0e23ba37c6	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-30 23:52:54 +00:00
alfresco-build	38a4d378d9	[maven-release-plugin][skip ci] prepare release 21.1	2023-05-30 23:52:51 +00:00
tiagosalvado10	65a562cd73	[MNT-23665] Removed search controls count limit (#1936 ) (#1968 ) (cherry picked from commit `07c7342032`)	2023-05-30 21:42:47 +01:00
kmagdziarz	8eab098317	Create ServicePack branch release/7.4.N	2023-05-05 12:39:50 +02:00