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

MNT-23724: Fix for Downloading a folder as zip with correct Name
Cherrypicked from master
2025-09-10 14:11:58 +00:00 · 2023-06-20 07:05:55 +00:00 · 2023-06-20 11:14:17 +05:30 · 2023-05-30 23:52:54 +00:00 · 2023-05-30 23:52:51 +00:00 · 2023-05-30 21:42:47 +01:00
29 changed files with 100 additions and 49 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.157</version>
+      <version>21.2</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.157</version>
+      <version>21.2</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.157</version>
+      <version>21.2</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.157</version>
+      <version>21.2</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.157</version>
+      <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+      <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</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.157</version>
+    <version>21.2</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>

@@ -52,8 +52,8 @@
        <dependency.alfresco-messaging-repo.version>1.2.20</dependency.alfresco-messaging-repo.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>2.1.0-A9</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>3.1.0-A12</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>2.1.0</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>3.1.0</dependency.alfresco-transform-core.version>
        <dependency.alfresco-greenmail.version>6.5</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.18</dependency.acs-event-model.version>

@@ -111,8 +111,8 @@
        <dependency.json-smart.version>2.4.10</dependency.json-smart.version>
        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>

-        <alfresco.googledrive.version>3.4.0-A4</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.0-A5</alfresco.aos-module.version>
+        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
        <alfresco.api-explorer.version>7.3.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.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.157</tag>
+        <tag>21.2</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.157</version>
+        <version>21.2</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.157</version>
+        <version>21.2</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
+++ b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
@@ -514,15 +514,11 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
                        NodeRef renditionNode = getRenditionNode(sourceNodeRef, renditionName);
                        boolean createRenditionNode = renditionNode == null;
                        boolean sourceHasAspectRenditioned = nodeService.hasAspect(sourceNodeRef, RenditionModel.ASPECT_RENDITIONED);
-                        boolean sourceChanges = !sourceHasAspectRenditioned || createRenditionNode || transformInputStream == null;
                        try
                        {
-                            if (sourceChanges)
-                            {
-                                ruleService.disableRuleType(RuleType.UPDATE);
-                                behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
-                                behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
-                            }
+                            ruleService.disableRuleType(RuleType.UPDATE);
+                            behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
+                            behaviourFilter.disableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);

                            // If they do not exist create the rendition association and the rendition node.
                            if (createRenditionNode)
@@ -592,12 +588,9 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
                        }
                        finally
                        {
-                            if (sourceChanges)
-                            {
-                                behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
-                                behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
-                                ruleService.enableRuleType(RuleType.UPDATE);
-                            }
+                            behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_AUDITABLE);
+                            behaviourFilter.enableBehaviour(sourceNodeRef, ContentModel.ASPECT_VERSIONABLE);
+                            ruleService.enableRuleType(RuleType.UPDATE);
                        }
                        return null;
                    }, false, true));
--- 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/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.
--- a/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertNotEquals;

 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;

 import org.alfresco.model.ContentModel;
@@ -419,6 +420,65 @@ public class RenditionService2IntegrationTest extends AbstractRenditionIntegrati
        assertTrue("New rendition content hash code was not generated", isValidRenditionContentHashCode(contentHashCode3));
    }

+    @Test
+    public void testModifierAfterMultipleRenditionRequests() throws InterruptedException
+    {
+        String user1 = createRandomUser();
+        String user2 = createRandomUser();
+        List<NodeRef> nodes = new ArrayList<NodeRef>();
+
+        final int TOTAL_NODES = 10;
+
+        // Create nodes
+        for (int i = 0; i < TOTAL_NODES; i++)
+        {
+            NodeRef n = createSource(user1, "quick.jpg");
+            render(user1, n, DOC_LIB);
+            nodes.add(n);
+        }
+
+        // Ask rendition multiple times with 'user2'
+        for (int j = 0; j < 10; j++)
+        {
+            for (int i = 0; i < TOTAL_NODES; i++)
+            {
+                render(user2, nodes.get(i), DOC_LIB);
+            }
+        }
+
+        for (int i = 0; i < TOTAL_NODES; i++)
+        {
+            waitForRendition(user1, nodes.get(i), DOC_LIB, true);
+        }
+
+        // Check the modifier is still user1
+        assertEquals(TOTAL_NODES, countModifier(nodes, user1));
+    }
+
+    private int countModifier(List<NodeRef> nodes, String user)
+    {
+        int count = 0;
+        for (int i = 0; i < nodes.size(); i++)
+        {
+            count += compareModifier(nodes.get(i), user);
+        }
+        return count;
+    }
+
+    private int compareModifier(NodeRef nodeRef, String user)
+    {
+        int res = 0;
+        if (nodeRef != null && user != null)
+        {
+            String modifier = nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER).toString();
+            if (user.equals(modifier))
+            {
+                res = 1;
+            }
+        }
+        return res;
+    }
+
    /**
     * @deprecated can be removed when we remove the original RenditionService
     */
@@ -622,4 +682,4 @@ public class RenditionService2IntegrationTest extends AbstractRenditionIntegrati
            renditionService2.setEnabled(true);
        }
    }
-}
+}
Author	SHA1	Message	Date
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
alfresco-build	25f3f33594	[maven-release-plugin][skip ci] prepare release 20.161	2023-05-03 20:54:45 +00:00
tiagosalvado10	f83328f7b0	[MNT-23550] Always disable behaviours to prevent unexpected modifier changes (#1898 )	2023-05-03 20:34:37 +01:00
alfresco-build	a177f391db	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-02 05:22:45 +00:00
alfresco-build	784557afcd	[maven-release-plugin][skip ci] prepare release 20.160	2023-05-02 05:22:41 +00:00
MohinishSah	8fb7b0d224	Update G-drive and AOS final version	2023-05-01 12:24:30 +05:30
alfresco-build	011ec9d7e6	[maven-release-plugin][skip ci] prepare for next development iteration	2023-04-30 00:06:05 +00:00
alfresco-build	3900f589d9	[maven-release-plugin][skip ci] prepare release 20.159	2023-04-30 00:06:02 +00:00
Alfresco CI User	def7a0d432	[force] Force release for 2023-04-30.	2023-04-30 00:02:53 +00:00
alfresco-build	7371c5d7ff	[maven-release-plugin][skip ci] prepare for next development iteration	2023-04-28 16:36:05 +00:00
alfresco-build	90406cef03	[maven-release-plugin][skip ci] prepare release 20.158	2023-04-28 16:36:01 +00:00
Sara	862e6d5596	ACS-5075 and ACS-4832 Bump t-core and t-service to 3.1.0 and 2.1.0 (#1906 )	2023-04-28 16:05:00 +01:00
alfresco-build	27be717df5	[maven-release-plugin][skip ci] prepare for next development iteration	2023-04-26 12:50:39 +00:00