[maven-release-plugin][skip ci] prepare for next development iteration

[maven-release-plugin][skip ci] prepare release 25.3.0.34
[force] Force release for 2025-09-07.
2025-09-10 14:11:58 +00:00 · 2025-09-07 00:07:46 +00:00 · 2025-09-07 00:07:45 +00:00 · 2025-09-07 00:04:37 +00:00 · 2025-09-03 18:24:45 +00:00 · 2025-09-03 18:24:43 +00:00
59 changed files with 571 additions and 130 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
        with:
          fetch-depth: 0
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
@@ -61,7 +61,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -84,7 +84,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -173,7 +173,7 @@ jobs:
            testModule: mmt
            testAttributes: "-Dtest=AllMmtUnitTestSuite"
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -210,7 +210,7 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -245,7 +245,7 @@ jobs:
      matrix:
        version: ['10.5', '10.6']
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -272,7 +272,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -299,7 +299,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -325,7 +325,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -351,7 +351,7 @@ jobs:
            !contains(github.event.head_commit.message, '[skip tests]') &&
            !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -377,7 +377,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -401,7 +401,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -457,7 +457,7 @@ jobs:
            disabledHostnameVerification: false
            mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -527,7 +527,7 @@ jobs:
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -566,7 +566,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -596,7 +596,7 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -628,7 +628,7 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -656,7 +656,7 @@ jobs:
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
@@ -702,7 +702,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force]')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -31,7 +31,7 @@ jobs:
      !contains(github.event.head_commit.message, '[no release]') &&
      github.event_name != 'pull_request'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
        with:
          persist-credentials: false
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
@@ -60,7 +60,7 @@ jobs:
      !contains(github.event.head_commit.message, '[no downstream]') &&
      github.event_name != 'pull_request'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
        with:
          persist-credentials: false
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
--- a/.github/workflows/precommit_formatter.yml
+++ b/.github/workflows/precommit_formatter.yml
@@ -11,9 +11,9 @@ jobs:
    runs-on: ubuntu-latest
    if: contains(github.event.head_commit.message, '[reformat code]')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.9"
      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
--- 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>25.3.0.12</version>
+      <version>25.3.0.35-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>25.3.0.12</version>
+      <version>25.3.0.35-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>25.3.0.12</version>
+      <version>25.3.0.35-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java
@@ -43,7 +43,7 @@ import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java
@@ -37,7 +37,7 @@ import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPr

 import java.util.Collections;

-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
@@ -56,7 +56,7 @@ import org.alfresco.test.AlfrescoTest;

 /**
 * Add Relationship tests
- * 
+ *
 * @author Kavit Shah
 */
 public class AddRelationshipTests extends BaseRMRestTest
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
@@ -45,7 +45,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;

-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
--- 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>25.3.0.12</version>
+      <version>25.3.0.35-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
@@ -119,6 +119,11 @@ rm.patch.v35.holdNewChildAssocPatch.batchSize=1000
 rm.haspermissionmap.read=Read
 rm.haspermissionmap.write=WriteProperties,AddChildren,ReadContent

+# Extended Permissions
+# Enable matching the given username with the correct casing username when retrieving an IPR group.
+# Only needs to be used if there are owners that don't have the username in the correct casing.
+rm.extendedSecurity.enableUsernameNormalization=false
+
 #
 # Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then
 # a document will be auto-versioned when its type is changed.
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -611,6 +611,7 @@
        <property name="authorityService" ref="authorityService"/>
        <property name="permissionService" ref="permissionService"/>
        <property name="transactionService" ref="transactionService"/>
+        <property name="enableUsernameNormalization" value="${rm.extendedSecurity.enableUsernameNormalization}" />
    </bean>

    <bean id="ExtendedSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">
--- 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>25.3.0.12</version>
+      <version>25.3.0.35-SNAPSHOT</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
@@ -38,6 +38,7 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.extensions.webscripts.ui.common.StringUtils;

+import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -96,6 +97,8 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
    /** transaction service */
    private TransactionService transactionService;

+    private boolean enableUsernameNormalization;
+
    /**
     * @param filePlanService
     *            file plan service
@@ -141,6 +144,15 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
        this.transactionService = transactionService;
    }

+    /**
+     * @param enableUsernameNormalization
+     *            enable username normalization to ensure correct casing
+     */
+    public void setEnableUsernameNormalization(boolean enableUsernameNormalization)
+    {
+        this.enableUsernameNormalization = enableUsernameNormalization;
+    }
+
    /**
     * Application context refresh event handler
     */
@@ -359,12 +371,18 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
    {
        String group = null;

+        // If enabled, the authorities are forced to match the correct casing of the usernames in case they were set
+        // with the incorrect casing.
+        // If not, it will just use the authorities as they are.
+        // In normal circumstances, the authorities are in the correct casing, so this is disabled by default.
+        Set<String> authoritySet = normalizeAuthorities(authorities);
+
        // find group or determine what the next index is if no group exists or there is a clash
-        Pair<String, Integer> groupResult = findIPRGroup(groupPrefix, authorities);
+        Pair<String, Integer> groupResult = findIPRGroup(groupPrefix, authoritySet);

        if (groupResult.getFirst() == null)
        {
-            group = createIPRGroup(groupPrefix, authorities, groupResult.getSecond());
+            group = createIPRGroup(groupPrefix, authoritySet, groupResult.getSecond());
        }
        else
        {
@@ -399,7 +417,8 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
        while (hasMoreItems == true)
        {
            // get matching authorities
-            PagingResults<String> results = authorityService.getAuthorities(AuthorityType.GROUP,
+            PagingResults<String> results = authorityService.getAuthorities(
+                    AuthorityType.GROUP,
                    RMAuthority.ZONE_APP_RM,
                    groupShortNamePrefix,
                    false,
@@ -427,6 +446,63 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
        return new Pair<>(iprGroup, nextGroupIndex);
    }

+    /**
+     * Given a set of authorities, normalizes the authority names to ensure correct casing.
+     * 
+     * @param authNames
+     * @return
+     */
+    private Set<String> normalizeAuthorities(Set<String> authNames)
+    {
+        // If disabled or no authorities, return as is
+        if (!enableUsernameNormalization || authNames == null || authNames.isEmpty())
+        {
+            return authNames;
+        }
+
+        Set<String> normalizedAuthorities = new HashSet<>();
+        for (String authorityName : authNames)
+        {
+            normalizedAuthorities.add(normalizeAuthorityName(authorityName));
+        }
+        return normalizedAuthorities;
+    }
+
+    /**
+     * Usernames are case insensitive but affect the IPR group matching when set with different casing. For a given authority of type user, this method normalizes the authority name. If group, it returns the name as-is.
+     *
+     * @param authorityName
+     *            the authority name to normalize
+     * @return the normalized authority name
+     */
+    private String normalizeAuthorityName(String authorityName)
+    {
+        if (authorityName == null || authorityName.startsWith(GROUP_PREFIX))
+        {
+            return authorityName;
+        }
+
+        // For users, attempt to get the correct casing from the username property of the user node
+        if (authorityService.authorityExists(authorityName))
+        {
+            try
+            {
+                NodeRef authorityNodeRef = authorityService.getAuthorityNodeRef(authorityName);
+                if (authorityNodeRef != null)
+                {
+                    String username = (String) nodeService.getProperty(authorityNodeRef, ContentModel.PROP_USERNAME);
+                    return username != null ? username : authorityName;
+                }
+            }
+            catch (Exception e)
+            {
+                // If anything goes wrong, fallback to the original name
+            }
+        }
+
+        return authorityName;
+    }
+
    /**
     * Determines whether a group exactly matches a list of authorities.
     *
--- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java
+++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java
@@ -52,6 +52,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

+import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -67,6 +68,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.AuthorityService;
@@ -522,6 +524,104 @@ public class ExtendedSecurityServiceImplUnitTest
        verify(mockedPermissionService).setPermission(nodeRef, writeGroup, RMPermissionModel.FILING, true);
        
    }
+
+    /**
+     * Given a node with no previous IPR groups assigned
+     * And having pre-existing IPR groups matching the ones we need
+     * When I add some read and write authorities but with a different casing
+     * Then the existing IPR groups are used
+     */
+    @SuppressWarnings("unchecked")
+    @Test public void addExtendedSecurityWithMixedCasingUsernames()
+    {
+        // Have the usernames in the node as the correct usernames but with incorrect casing
+        String user1 = "UseR";
+        String user2 = "UseR_w";
+
+        // Incorrect IPR Group names
+        Set<String> diffCasingReaders = Stream.of(user1, GROUP).collect(Collectors.toSet());
+        Set<String> diffCasingWriters = Stream.of(user2, GROUP_W).collect(Collectors.toSet());
+        String wrongReadGroupPrefix = extendedSecurityService.getIPRGroupPrefixShortName(READER_GROUP_PREFIX, diffCasingReaders);
+        String wrongWriteGroupPrefix = extendedSecurityService.getIPRGroupPrefixShortName(WRITER_GROUP_PREFIX, diffCasingWriters);
+        String wrongReadGroup = wrongReadGroupPrefix + "0";
+        String wrongWriteGroup = wrongWriteGroupPrefix + "0";
+
+        // Correct Group names
+        String correctReadGroup = readGroupPrefix + "0";
+        String correctWriteGroup = writeGroupPrefix + "0";
+
+        // If queried for the correct groups, return the results
+        PagingResults<String> mockedCorrectReadPResults = mock(PagingResults.class);
+        PagingResults<String> mockedCorrectWritePResults = mock(PagingResults.class);
+        when(mockedCorrectReadPResults.getPage())
+            .thenReturn(Stream.of(GROUP_PREFIX + correctReadGroup).collect(Collectors.toList()));
+        when(mockedAuthorityService.getAuthorities(
+                eq(AuthorityType.GROUP), 
+                eq(RMAuthority.ZONE_APP_RM), 
+                eq(readGroupPrefix),
+                eq(false), 
+                eq(false), 
+                any(PagingRequest.class)))
+            .thenReturn(mockedCorrectReadPResults);
+        
+        when(mockedCorrectWritePResults.getPage())
+            .thenReturn(Stream.of(GROUP_PREFIX + correctWriteGroup).collect(Collectors.toList()));
+        when(mockedAuthorityService.getAuthorities(
+                eq(AuthorityType.GROUP), 
+                eq(RMAuthority.ZONE_APP_RM), 
+                eq(writeGroupPrefix),
+                eq(false), 
+                eq(false), 
+                any(PagingRequest.class)))
+            .thenReturn(mockedCorrectWritePResults);
+
+        // Don't return results for the incorrect groups (lenient as these may not be called with normalization enabled)
+        PagingResults<String> mockedWrongReadPResults = mock(PagingResults.class);
+        PagingResults<String> mockedWrongWritePResults = mock(PagingResults.class);
+        lenient().when(mockedWrongReadPResults.getPage())
+            .thenReturn(Collections.emptyList());
+        lenient().when(mockedAuthorityService.getAuthorities(
+                eq(AuthorityType.GROUP), 
+                eq(RMAuthority.ZONE_APP_RM), 
+                eq(wrongReadGroupPrefix),
+                eq(false), 
+                eq(false), 
+                any(PagingRequest.class)))
+            .thenReturn(mockedWrongReadPResults);
+        
+        lenient().when(mockedWrongWritePResults.getPage())
+            .thenReturn(Collections.emptyList());
+        lenient().when(mockedAuthorityService.getAuthorities(
+                eq(AuthorityType.GROUP), 
+                eq(RMAuthority.ZONE_APP_RM), 
+                eq(wrongWriteGroupPrefix),
+                eq(false), 
+                eq(false), 
+                any(PagingRequest.class)))
+            .thenReturn(mockedWrongWritePResults);
+
+        // The users do exist, despite being in a different casing and are able to be retrieved
+        NodeRef noderefUser1 = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, USER);
+        when(mockedAuthorityService.authorityExists(user1)).thenReturn(true);
+        when(mockedAuthorityService.getAuthorityNodeRef(user1)).thenReturn(noderefUser1);
+        when(mockedNodeService.getProperty(noderefUser1, ContentModel.PROP_USERNAME)).thenReturn(USER);
+
+        NodeRef noderefUser2 = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, USER_W);
+        when(mockedAuthorityService.authorityExists(user2)).thenReturn(true);
+        when(mockedAuthorityService.getAuthorityNodeRef(user2)).thenReturn(noderefUser2);
+        when(mockedNodeService.getProperty(noderefUser2, ContentModel.PROP_USERNAME)).thenReturn(USER_W);
+
+        // Set the extended security service to normalize usernames
+        extendedSecurityService.setEnableUsernameNormalization(true);
+        extendedSecurityService.set(nodeRef, diffCasingReaders, diffCasingWriters);
+
+        // Verify that the incorrect read group is not created
+        verify(mockedAuthorityService, never()).createAuthority(AuthorityType.GROUP, wrongReadGroup, wrongReadGroup, Collections.singleton(RMAuthority.ZONE_APP_RM));
+
+        // Verify that the incorrect write group is not created
+        verify(mockedAuthorityService, never()).createAuthority(AuthorityType.GROUP, wrongWriteGroup, wrongWriteGroup, Collections.singleton(RMAuthority.ZONE_APP_RM));
+
+    }
    
    /**
     * Given a node with no previous IPR groups assigned
@@ -571,7 +671,7 @@ public class ExtendedSecurityServiceImplUnitTest
            .thenReturn(Stream
                .of(USER_W, AlfMock.generateText())
                .collect(Collectors.toSet()));
-        
+
        // add extended security
        extendedSecurityService.set(nodeRef, READERS, WRITERS);
        
@@ -895,7 +995,7 @@ public class ExtendedSecurityServiceImplUnitTest
        // group names
        String readGroup = extendedSecurityService.getIPRGroupShortName(READER_GROUP_FULL_PREFIX, READERS, 0);
        String writeGroup = extendedSecurityService.getIPRGroupShortName(WRITER_GROUP_FULL_PREFIX, WRITERS, 0);
-        
+
        // setup renditions
        NodeRef renditionNodeRef = AlfMock.generateNodeRef(mockedNodeService);
        when(mockedNodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD))
@@ -904,7 +1004,7 @@ public class ExtendedSecurityServiceImplUnitTest
            .thenReturn(renditionNodeRef);
        when(mockedNodeService.getChildAssocs(nodeRef, RenditionModel.ASSOC_RENDITION, RegexQNamePattern.MATCH_ALL))
            .thenReturn(Collections.singletonList(mockedChildAssociationRef));        
-        
+
        // setup permissions
        Set<AccessPermission> permissions = Stream
            .of(new AccessPermissionImpl(AlfMock.generateText(), AccessStatus.ALLOWED, readGroup, 0),
@@ -913,17 +1013,17 @@ public class ExtendedSecurityServiceImplUnitTest
            .collect(Collectors.toSet());        
        when(mockedPermissionService.getAllSetPermissions(nodeRef))
            .thenReturn(permissions);      
-        
+
        // remove extended security
        extendedSecurityService.remove(nodeRef);
-        
+
        // verify that the groups permissions have been removed
        verify(mockedPermissionService).clearPermission(nodeRef, readGroup);
        verify(mockedPermissionService).clearPermission(nodeRef, writeGroup);
-        
+
        // verify that the groups permissions have been removed from the rendition
        verify(mockedPermissionService).clearPermission(renditionNodeRef, readGroup);
        verify(mockedPermissionService).clearPermission(renditionNodeRef, writeGroup);
-        
+
    }
 }
--- 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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</version>
    </parent>

    <properties>
@@ -51,8 +51,8 @@
            </exclusions>
        </dependency>
        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
            <scope>provided</scope>
        </dependency>

--- a/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java
+++ b/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java
@@ -28,7 +28,7 @@ import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.json.simple.JSONObject;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.Status;
@@ -92,7 +92,7 @@ public class WikiPageGet extends AbstractWikiWebScript
                {
                    links.add(link);
                    // build the list of available pages
-                    WikiPageInfo wikiPage = wikiService.getWikiPage(site.getShortName(), StringEscapeUtils.unescapeHtml(link));
+                    WikiPageInfo wikiPage = wikiService.getWikiPage(site.getShortName(), StringEscapeUtils.unescapeHtml4(link));
                    if (wikiPage != null)
                    {
                        pageTitles.add(wikiPage.getTitle());
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
@@ -91,6 +91,15 @@ function doclist_getAllNodes(parsedArgs, filterParams, query, totalItemCount)
   };
 }

+function sanitizeJunkFavouriteKeys(favourites){
+   for (var key in favourites) {
+      if (!key || key.trim() === "") {
+         delete favourites[key];
+      }
+   }
+   return favourites;
+}
+
 /**
 * Main entry point: Create collection of documents and folders in the given space
 *
@@ -123,6 +132,28 @@ function doclist_main()
   
   if (logger.isLoggingEnabled())
      logger.log("doclist.lib.js - NodeRef: " + parsedArgs.nodeRef + " Query: " + query);
+
+   favourites = sanitizeJunkFavouriteKeys(favourites);
+
+   if(Object.keys(favourites).length === 0 && query === null)
+   {
+      return {
+         luceneQuery: "",
+         paging: {
+            totalRecords: 0,
+            startIndex: 0
+         },
+         container: parsedArgs.rootNode,
+         parent: null,
+         onlineEditing: utils.moduleInstalled("org.alfresco.module.vti"),
+         itemCount: {
+            folders: 0,
+            documents: 0
+         },
+         items: [],
+         customJSON: slingshotDocLib.getJSON()
+      };
+   }
   
   var totalItemCount = filterParams.limitResults ? parseInt(filterParams.limitResults, 10) : -1;
   // For all sites documentLibrary query we pull in all available results and post filter
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js
@@ -182,11 +182,14 @@ var Filters =
         case "favourites":
            for (var favourite in favourites)
            {
-               if (filterQuery)
+               if (favourite && favourite.trim() !== "")
               {
-                  filterQuery += " OR ";
+                  if (filterQuery)
+                  {
+                     filterQuery += " OR ";
+                  }
+                  filterQuery += "ID:\"" + favourite + "\"";
               }
-               filterQuery += "ID:\"" + favourite + "\"";
            }
            
            if (filterQuery.length !== 0)
@@ -201,7 +204,13 @@ var Filters =
            else
            {
               // empty favourites query
-               filterQuery = "+ID:\"\"";
+               logger.warn("No favourites found for user: " + person.properties.userName);
+               return {
+                  query: null,
+                  limitResults: 0,
+                  sort: [],
+                  language: "lucene"
+               };
            }
            
            filterParams.query = filterQuery;
--- a/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java
+++ b/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java
@@ -25,7 +25,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import jakarta.transaction.UserTransaction;

-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -958,7 +958,7 @@ public class WikiRestApiTest extends BaseWebScriptTest
                String link = m.group(1);
                link += "?title=<script>alert('xss');</script>";
                WikiPageInfo wikiPage2 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, link);
-                WikiPageInfo wikiPage1 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, StringEscapeUtils.unescapeHtml(link));
+                WikiPageInfo wikiPage1 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, StringEscapeUtils.unescapeHtml4(link));
                assertEquals(wikiPage2, wikiPage1);
            }

--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>25.3.0.12</version>
+      <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/distribution/src/main/resources/licenses/notice.txt
+++ b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -37,8 +37,7 @@ commons-fileupload  http://jakarta.apache.org/commons/
 commons-httpclient  http://jakarta.apache.org/commons/ 
 commons-io  http://jakarta.apache.org/commons/ 
 commons-jxpath  http://jakarta.apache.org/commons/ 
-commons-lang    http://jakarta.apache.org/commons/ 
-commons-lang3   http://jakarta.apache.org/commons/ 
+commons-lang3   http://jakarta.apache.org/commons/
 commons-logging http://jakarta.apache.org/commons/ 
 commons-net http://jakarta.apache.org/commons/
 commons-pool    http://jakarta.apache.org/commons/ 
--- 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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java
+++ b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java
@@ -5,7 +5,7 @@ import java.util.Date;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisUnauthorizedException;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

--- 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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-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>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</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>25.3.0.12</version>
+    <version>25.3.0.35-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -51,8 +51,8 @@
        <dependency.alfresco-server-root.version>7.0.2</dependency.alfresco-server-root.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-core.version>5.2.0-A.3</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.2.0</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>5.2.1</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.2.1</dependency.alfresco-transform-service.version>
        <dependency.alfresco-greenmail.version>7.1</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>1.0.5</dependency.acs-event-model.version>

@@ -154,7 +154,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>25.3.0.12</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -422,9 +422,9 @@
                <version>1.18.0</version>
            </dependency>
            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.18.0</version>
            </dependency>
            <dependency>
                <groupId>commons-io</groupId>
@@ -1000,7 +1000,7 @@
                <plugin>
                    <groupId>io.fabric8</groupId>
                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.45.0</version>
+                    <version>0.46.0</version>
                </plugin>
                <plugin>
                    <artifactId>maven-surefire-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>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Parameters.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Parameters.java
@@ -27,7 +27,6 @@ package org.alfresco.rest.framework.resource.parameters;

 import java.util.List;

-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.extensions.webscripts.WebScriptRequest;

 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -69,7 +68,7 @@ public interface Parameters
     * @return The Parameter value
     * @throws InvalidArgumentException
     */
-    T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException;
+    <T> T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException;

    /**
     * Returns a representation of the Paging of collections of resources, with skip count and max items. See {@link Paging} Specified by the "skipCount" and "maxItems" request parameters.
--- a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Params.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Params.java
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Map;

 import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.extensions.webscripts.WebScriptRequest;

 import org.alfresco.repo.content.MimetypeMap;
@@ -231,7 +230,7 @@ public class Params implements Parameters
    }

    @Override
-    public T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException
+    public <T> T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException
    {
        String param = getParameter(parameterName);
        if (param == null)
@@ -239,7 +238,7 @@ public class Params implements Parameters
        Object obj = ConvertUtils.convert(param, clazz);
        if (obj != null && obj.getClass().equals(clazz))
        {
-            return (T) obj;
+            return clazz.cast(obj);
        }
        throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[]{parameterName});
    }
--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
@@ -40,6 +40,7 @@
 		"items":
 		[
 		<#list results as row>
+			<#if row.item.hasPermission("Read")>
 			{
 				"type": "${row.item.typeShort}",
 				"parentType": "${row.item.parentTypeShort!""}",
@@ -75,6 +76,7 @@
 				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
 				"selectable" : ${row.selectable?string}</#if>
 			}<#if row_has_next>,</#if>
+			</#if>
 		</#list>
 		]
 	}
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
@@ -25,6 +25,8 @@
 */
 package org.alfresco.rest.api.tests;

+import java.util.Arrays;
+
 import org.alfresco.repo.web.util.JettyComponent;

 public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
@@ -40,32 +42,53 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
    public final static String[] CLASS_LOCATIONS = new String[]{"classpath*:/publicapi/lucene/"};

    private static EnterprisePublicApiTestFixture instance;
+    private String[] customConfigLocations;

    /* Note: synchronized for multi-threaded test access */
-    public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData) throws Exception
+    public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData, String... customConfigLocations)
    {
        if (instance == null)
        {
-            instance = new EnterprisePublicApiTestFixture();
-            instance.setup(createTestData);
+            instance = new EnterprisePublicApiTestFixture(customConfigLocations);
+            try
+            {
+                instance.setup(createTestData);
+            }
+            catch (Exception e)
+            {
+                String errorMessage = "Exception was thrown during setup EnterprisePublicApiTestFixture: " + e.getClass() + " - " + e.getMessage();
+                throw new RuntimeException(errorMessage, e);
+            }
        }
        return instance;
    }

-    public static EnterprisePublicApiTestFixture getInstance() throws Exception
+    public static EnterprisePublicApiTestFixture getInstance(String... customConfigLocations)
    {
-        return getInstance(true);
+        return getInstance(true, customConfigLocations);
    }

-    private EnterprisePublicApiTestFixture()
+    public static EnterprisePublicApiTestFixture getInstance()
+    {
+        return getInstance(true, null);
+    }
+
+    public static EnterprisePublicApiTestFixture getInstance(boolean createTestData)
+    {
+        return getInstance(createTestData, null);
+    }
+
+    private EnterprisePublicApiTestFixture(String... customConfigLocations)
    {
        super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
+        this.customConfigLocations = customConfigLocations;
    }

    @Override
    protected JettyComponent makeJettyComponent()
    {
-        JettyComponent jettyComponent = new EnterpriseJettyComponent(getPort(), getContextPath(), getConfigLocations(), getClassLocations());
+        String[] configLocations = mergeLocations(getConfigLocations(), this.customConfigLocations);
+        JettyComponent jettyComponent = new EnterpriseJettyComponent(getPort(), getContextPath(), configLocations, getClassLocations());
        return jettyComponent;
    }

@@ -74,4 +97,19 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
    {
        return new RepoService(applicationContext);
    }
+
+    private String[] mergeLocations(String[]... locations)
+    {
+        String[] mergedLocations = new String[0];
+        for (String[] location : locations)
+        {
+            if (location == null || location.length == 0)
+            {
+                continue;
+            }
+            mergedLocations = Arrays.copyOf(mergedLocations, mergedLocations.length + location.length);
+            System.arraycopy(location, 0, mergedLocations, mergedLocations.length - location.length, location.length);
+        }
+        return mergedLocations;
+    }
 }
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestApi.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestApi.java
@@ -36,15 +36,21 @@ public class EnterpriseTestApi extends AbstractTestApi
        getTestFixture().getRandomNetwork();
    }

+    protected String[] getCustomConfigLocations()
+    {
+        return new String[]{};
+    }
+
    @Override
    protected TestFixture getTestFixture() throws Exception
    {
-        return EnterprisePublicApiTestFixture.getInstance();
+        return EnterprisePublicApiTestFixture.getInstance(getCustomConfigLocations());
    }

    @Override
    protected TestFixture getTestFixture(boolean createTestData) throws Exception
    {
-        return EnterprisePublicApiTestFixture.getInstance(createTestData);
+        return EnterprisePublicApiTestFixture.getInstance(createTestData, getCustomConfigLocations());
    }
+
 }
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>25.3.0.12</version>
+        <version>25.3.0.35-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -94,7 +94,6 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
        </dependency>
        <dependency>
            <groupId>commons-codec</groupId>
@@ -737,10 +736,6 @@
            <artifactId>reflections</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
    </dependencies>

    <build>
--- a/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -116,7 +116,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
    private static final String SELECT_NODE_MAX_ID = "alfresco.node.select_NodeMaxId";
    private static final String SELECT_NODE_INTERVAL_BY_TYPE = "alfresco.node.select_MinMaxNodeIdForNodeType";
    private static final String SELECT_NODES_WITH_ASPECT_IDS = "alfresco.node.select_NodesWithAspectIds";
-    private static final String SELECT_NODES_WITH_ASPECT_IDS_LIMITED = "alfresco.node.select_NodesWithAspectIds_Limited";
+    private static final String SELECT_NODES_WITH_ASPECT_IDS_LIMITED = "alfresco.node.select.select_NodesWithAspectIds_Limited";
    private static final String INSERT_NODE_ASSOC = "alfresco.node.insert.insert_NodeAssoc";
    private static final String UPDATE_NODE_ASSOC = "alfresco.node.update_NodeAssoc";
    private static final String DELETE_NODE_ASSOC = "alfresco.node.delete_NodeAssoc";
--- a/repository/src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
+++ b/repository/src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software. 
 * If the software was purchased under a paid Alfresco license, the terms of 
@@ -124,6 +124,9 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
    /** Number of (bytecode) instructions that will trigger the observer */
    private int observerInstructionCount = 100;

+    /** Flag to enable or disable scope cleaning at the end of each script execution */
+    private boolean cleanScope = true;
+
    /** Custom context factory */
    public static AlfrescoContextFactory contextFactory;

@@ -210,6 +213,15 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
        this.observerInstructionCount = observerInstructionCount;
    }

+    /**
+     * @param cleanScope
+     *            true to enable scope cleaning at the end of each script execution - set to false to disable this feature.
+     */
+    public void setCleanScope(boolean cleanScope)
+    {
+        this.cleanScope = cleanScope;
+    }
+
    /**
     * @see org.alfresco.service.cmr.repository.ScriptProcessor#reset()
     */
@@ -619,7 +631,7 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
        }
        finally
        {
-            if (!secure)
+            if (!secure && cleanScope)
            {
                unsetScope(model, scope);
            }
--- a/repository/src/main/java/org/alfresco/repo/jscript/Search.java
+++ b/repository/src/main/java/org/alfresco/repo/jscript/Search.java
@@ -1130,7 +1130,10 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
                    // for example the key could be: {!afts}@{http://www.alfresco.org/model/content/1.0}created:[NOW/DAY-1DAY TO NOW/DAY+1DAY]
                    // qName => @{http://www.alfresco.org/model/content/1.0}created
                    // 7 => {!afts}
-                    key = key.substring(7);
+                    if (key.startsWith("{!afts}"))
+                    {
+                        key = key.substring(7);
+                    }
                    String qName = key.substring(0, key.lastIndexOf(':'));

                    // Retrieve the previous facet queries
--- a/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -862,9 +862,18 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
        if (aspectDef != null)
        {
            // Remove default properties
+            Map<QName, Serializable> propsBefore = nodeDAO.getNodeProperties(nodeId);
            Map<QName, PropertyDefinition> propertyDefs = aspectDef.getProperties();
            Set<QName> propertyToRemoveQNames = propertyDefs.keySet();
-            nodeDAO.removeNodeProperties(nodeId, propertyToRemoveQNames);
+            boolean propertiesRemoved = nodeDAO.removeNodeProperties(nodeId, propertyToRemoveQNames);
+
+            if (propertiesRemoved)
+            {
+                invokeOnUpdateProperties(
+                        nodeRef,
+                        propsBefore, // before
+                        nodeDAO.getNodeProperties(nodeId)); // after
+            }

            // Remove child associations
            // We have to iterate over the associations and remove all those between the parent and child
--- a/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
+++ b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
@@ -81,11 +81,19 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea

    public static final QName DEFAULT_RENDITION_CONTENT_PROP = ContentModel.PROP_CONTENT;
    public static final String DEFAULT_MIMETYPE = MimetypeMap.MIMETYPE_TEXT_PLAIN;
+    public static final String MIMETYPE_METADATA_EXTRACT = "alfresco-metadata-extract";
+    public static final String MIMETYPE_METADATA_EMBED = "alfresco-metadata-embed";
    public static final String DEFAULT_ENCODING = "UTF-8";

    public static final int SOURCE_HAS_NO_CONTENT = -1;
    public static final int RENDITION2_DOES_NOT_EXIST = -2;

+    // Allowed mimetypes to support text or metadata extract transforms when thumbnails are disabled.
+    private static final Set<String> ALLOWED_MIMETYPES = Set.of(
+            MimetypeMap.MIMETYPE_TEXT_PLAIN,
+            MIMETYPE_METADATA_EXTRACT,
+            MIMETYPE_METADATA_EMBED);
+
    private static Log logger = LogFactory.getLog(RenditionService2Impl.class);

    // As Async transforms and renditions are so similar, this class provides a way to provide the code that is different.
@@ -288,7 +296,7 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
    {
        try
        {
-            if (!isEnabled())
+            if (!isAsyncAllowed(renderOrTransform))
            {
                throw new RenditionService2Exception("Async transforms and renditions are disabled " +
                        "(system.thumbnail.generate=false or renditionService2.enabled=false).");
@@ -967,4 +975,24 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
            }
        }
    }
+
+    // Checks if the given transform callback is a text extract transform for content indexing or metadata extract/embed.
+    private boolean isTextOrMetadataExtractTransform(RenderOrTransformCallBack renderOrTransform)
+    {
+        RenditionDefinition2 renditionDefinition = renderOrTransform.getRenditionDefinition();
+        return renditionDefinition != null && ALLOWED_MIMETYPES.contains(renditionDefinition.getTargetMimetype());
+    }
+
+    private boolean isAsyncAllowed(RenderOrTransformCallBack renderOrTransform)
+    {
+        // If enabled is false, all async transforms/renditions must be blocked
+        if (!enabled)
+        {
+            return false;
+        }
+
+        // If thumbnails are disabled, allow only text extract or metadata extract/embed transforms
+        return thumbnailsEnabled || isTextOrMetadataExtractTransform(renderOrTransform);
+    }
+
 }
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java
@@ -74,7 +74,7 @@ import com.nimbusds.oauth2.sdk.id.Identifier;
 import com.nimbusds.oauth2.sdk.id.Issuer;
 import com.nimbusds.openid.connect.sdk.claims.PersonClaims;
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hc.client5.http.classic.HttpClient;
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java
@@ -42,7 +42,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import com.nimbusds.oauth2.sdk.Scope;
 import com.nimbusds.oauth2.sdk.id.Identifier;
 import com.nimbusds.oauth2.sdk.id.State;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
@@ -782,25 +782,6 @@
        <if test="ordered == true">order by node.id ASC</if>
    </select>

-    <select id="select_NodesWithAspectIds_Limited" parameterType="Ids" resultMap="result_NodeRef" >
-        select
-            node.id             as id,
-            store.protocol      as protocol,
-            store.identifier    as identifier,
-            node.uuid           as uuid
-        from
-            alf_node_aspects na
-            join alf_node node on (na.node_id = node.id)
-            left join alf_store store on (store.id = node.store_id)
-        where
-            <![CDATA[na.node_id >= #{idOne}]]>
-            <if test="idTwo != null"><![CDATA[and na.node_id < #{idTwo}]]></if>
-            and na.qname_id in
-                <foreach item="item" index="i" collection="ids" open="(" separator="," close=")">#{item}</foreach>
-        <if test="ordered == true">order by node.id ASC</if>
-        <if test="maxResults != null"><![CDATA[limit #{maxResults}]]></if>
-    </select>
-
    <!-- Common results for result_NodeAssoc -->
    <sql id="select_NodeAssoc_Results">
        select
@@ -1566,4 +1547,4 @@
        </foreach>
    </delete>
        
-</mapper>
+</mapper>
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-SqlMap.xml
@@ -30,4 +30,23 @@
      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
    </select>

-</mapper>
+    <select id="select_NodesWithAspectIds_Limited" parameterType="Ids" resultMap="alfresco.node.result_NodeRef" >
+        select
+            node.id             as id,
+            store.protocol      as protocol,
+            store.identifier    as identifier,
+            node.uuid           as uuid
+        from
+            alf_node_aspects na
+            join alf_node node on (na.node_id = node.id)
+            left join alf_store store on (store.id = node.store_id)
+        where
+            <![CDATA[na.node_id >= #{idOne}]]>
+            <if test="idTwo != null"><![CDATA[and na.node_id < #{idTwo}]]></if>
+            and na.qname_id in
+                <foreach item="item" index="i" collection="ids" open="(" separator="," close=")">#{item}</foreach>
+        <if test="ordered == true">order by node.id ASC</if>
+        <if test="maxResults != null"><![CDATA[limit #{maxResults}]]></if>
+    </select>
+
+</mapper>
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-SqlMap.xml
@@ -30,4 +30,23 @@
      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
    </select>

-</mapper>
+    <select id="select_NodesWithAspectIds_Limited" parameterType="Ids" resultMap="alfresco.node.result_NodeRef" >
+        select
+            node.id             as id,
+            store.protocol      as protocol,
+            store.identifier    as identifier,
+            node.uuid           as uuid
+        from
+            alf_node_aspects na
+            join alf_node node on (na.node_id = node.id)
+            left join alf_store store on (store.id = node.store_id)
+        where
+            <![CDATA[na.node_id >= #{idOne}]]>
+            <if test="idTwo != null"><![CDATA[and na.node_id < #{idTwo}]]></if>
+            and na.qname_id in
+                <foreach item="item" index="i" collection="ids" open="(" separator="," close=")">#{item}</foreach>
+        <if test="ordered == true">order by node.id ASC</if>
+        <if test="maxResults != null"><![CDATA[limit #{maxResults}]]></if>
+    </select>
+
+</mapper>
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -1394,6 +1394,9 @@ scripts.execution.maxMemoryUsedInBytes=-1
 # Number of instructions that will trigger the observer
 scripts.execution.observerInstructionCount=5000

+# Flag to control if the scope is cleaned at the end of script execution
+scripts.execution.clean.scope=true
+
 # Default value being used in POST/size-details endpoint to partition a huge folder into smaller chunks
 # so that we can compute more efficiently and consolidate all sizes into a single unit.
 default.async.folder.items=1000
--- a/repository/src/main/resources/alfresco/script-services-context.xml
+++ b/repository/src/main/resources/alfresco/script-services-context.xml
@@ -60,6 +60,9 @@
        <property name="observerInstructionCount">
            <value>${scripts.execution.observerInstructionCount}</value>
        </property>
+        <property name="cleanScope">
+            <value>${scripts.execution.clean.scope}</value>
+        </property>
    </bean>

    <!-- base config implementation that script extension beans extend from - for auto registration
--- a/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
@@ -26,6 +26,12 @@

 package org.alfresco.repo.event2;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import static org.alfresco.model.ContentModel.PROP_DESCRIPTION;

 import java.io.Serializable;
@@ -545,6 +551,49 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals(aspectsBeforeRemove, resourceBefore.getAspectNames());
    }

+    @Test
+    public void testRemoveAspectPropertiesTest()
+    {
+        final NodeRef nodeRef = createNode(ContentModel.TYPE_CONTENT);
+        NodeResource resource = getNodeResource(1);
+        final Set<String> originalAspects = resource.getAspectNames();
+        assertNotNull(originalAspects);
+
+        // Add cm:geographic aspect with properties
+        retryingTransactionHelper.doInTransaction(() -> {
+            Map<QName, Serializable> aspectProperties = new HashMap<>();
+            aspectProperties.put(ContentModel.PROP_LATITUDE, "12.345678");
+            aspectProperties.put(ContentModel.PROP_LONGITUDE, "12.345678");
+            nodeService.addAspect(nodeRef, ContentModel.ASPECT_GEOGRAPHIC, aspectProperties);
+            return null;
+        });
+        resource = getNodeResource(2);
+        Set<String> aspectsBeforeRemove = resource.getAspectNames();
+        assertNotNull(aspectsBeforeRemove);
+        assertTrue(aspectsBeforeRemove.contains("cm:geographic"));
+
+        // Remove cm:geographic aspect - this automatically removes the properties from the node
+        retryingTransactionHelper.doInTransaction(() -> {
+            nodeService.removeAspect(nodeRef, ContentModel.ASPECT_GEOGRAPHIC);
+            return null;
+        });
+
+        resource = getNodeResource(3);
+        assertEquals(originalAspects, resource.getAspectNames());
+
+        NodeResource resourceBefore = getNodeResourceBefore(3);
+        assertNotNull(resourceBefore.getAspectNames());
+        assertEquals(aspectsBeforeRemove, resourceBefore.getAspectNames());
+        // Resource before should contain cm:latitude and cm:longitude properties
+        assertNotNull(resourceBefore.getProperties());
+        assertTrue(resourceBefore.getProperties().containsKey("cm:latitude"));
+        assertTrue(resourceBefore.getProperties().containsKey("cm:longitude"));
+        // Resource after should NOT contain cm:latitude and cm:longitude properties
+        assertNotNull(resource.getProperties());
+        assertFalse(resource.getProperties().containsKey("cm:latitude"));
+        assertFalse(resource.getProperties().containsKey("cm:longitude"));
+    }
+
    @Test
    public void testCreateAndUpdateInTheSameTransaction()
    {
--- a/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
@@ -39,6 +39,7 @@ import org.junit.Test;

 import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
+import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -776,4 +777,58 @@ public class RenditionService2IntegrationTest extends AbstractRenditionIntegrati
        }

    }
+
+    @Test
+    public void testTextExtractTransformAllowedWhenThumbnailDisabled()
+    {
+        // create a source node
+        NodeRef sourceNodeRef = createSource(ADMIN, "quick.pdf");
+        assertNotNull("Node not generated", sourceNodeRef);
+        String replyQueue = "org.test.queue";
+        String targetMimetype = MimetypeMap.MIMETYPE_TEXT_PLAIN;
+
+        TransformDefinition textExtractTransform = new TransformDefinition(
+                targetMimetype,
+                java.util.Collections.emptyMap(),
+                "clientData",
+                replyQueue,
+                "requestId");
+
+        renditionService2.setThumbnailsEnabled(false);
+        try
+        {
+            // Should NOT throw, as this is a text extract transform
+            AuthenticationUtil.runAs(() -> {
+                transactionService.getRetryingTransactionHelper().doInTransaction(() -> {
+                    renditionService2.transform(sourceNodeRef, textExtractTransform);
+                    return null;
+                });
+                return null;
+            }, ADMIN);
+        }
+        finally
+        {
+            renditionService2.setThumbnailsEnabled(true);
+        }
+    }
+
+    @Test
+    public void testMetadataExtractTransformAllowedWhenThumbnailDisabled()
+    {
+        // create a source node
+        NodeRef sourceNodeRef = createSource(ADMIN, "quick.pdf");
+        assertNotNull("Node not generated", sourceNodeRef);
+        renditionService2.setThumbnailsEnabled(false);
+        try
+        {
+            // Should NOT throw, as this is a metadata extract transform
+            extract(ADMIN, sourceNodeRef);
+            waitForExtract(ADMIN, sourceNodeRef, true);
+        }
+        finally
+        {
+            renditionService2.setThumbnailsEnabled(true);
+        }
+    }
+
 }
Author	SHA1	Message	Date
alfresco-build	7e61befc21	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-07 00:07:46 +00:00
alfresco-build	be6dc14330	[maven-release-plugin][skip ci] prepare release 25.3.0.34	2025-09-07 00:07:45 +00:00
Alfresco CI User	ab4bc1af9f	[force] Force release for 2025-09-07.	2025-09-07 00:04:37 +00:00
alfresco-build	eaec23ae7a	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-03 18:24:45 +00:00
alfresco-build	8ff727c95d	[maven-release-plugin][skip ci] prepare release 25.3.0.33	2025-09-03 18:24:43 +00:00
dependabot[bot]	48475fdfaa	Bump actions/checkout from 4 to 5 (#3560 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-01 09:21:55 +02:00
alfresco-build	812959be2e	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-28 12:48:53 +00:00
alfresco-build	5b8c52db67	[maven-release-plugin][skip ci] prepare release 25.3.0.32	2025-08-28 12:48:51 +00:00
Debjit Chattopadhyay	20c42b6561	MNT-24308 : fix search filterquery creation for displaying favourites for both Solr and Elasticsearch MNT-24308 : On click of 'My Favorites' link under 'Documents' in the left panel of 'Document Library' page, all the links appear grayed out	2025-08-28 16:54:32 +05:30
Debjit Chattopadhyay	52dfea9b21	cleaning up extra loggers	2025-08-28 16:09:42 +05:30
alfresco-build	d04dada44e	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-28 09:55:46 +00:00
alfresco-build	2e85de7c81	[maven-release-plugin][skip ci] prepare release 25.3.0.31	2025-08-28 09:55:44 +00:00
Tiago Salvado	42324368e5	[MNT-25242] Add property to control if scope is cleaned (#3520 )	2025-08-28 10:13:31 +01:00
alfresco-build	8d885220d8	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-28 06:17:04 +00:00
alfresco-build	6367f5304d	[maven-release-plugin][skip ci] prepare release 25.3.0.30	2025-08-28 06:17:02 +00:00
Debjit Chattopadhyay	f17b309c27	On click of 'My Favorites' link under 'Documents' in the left panel of 'Document Library' page, all the links appear grayed out	2025-08-27 18:46:24 +05:30
Belal Ansari	bb2cc1765d	MNT-25216 Error on fixedAclUpdaterJobDetail execution when using Oracle (#3521 )	2025-08-27 15:28:54 +05:30
alfresco-build	d20e8ee158	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-27 04:57:42 +00:00
alfresco-build	254193f9aa	[maven-release-plugin][skip ci] prepare release 25.3.0.29	2025-08-27 04:57:40 +00:00
SatyamSah5	4293f21618	[ACS-9991] added logic to execute text extraction for content indexing even if thumbnails are disabled. (#3516 )	2025-08-27 09:44:02 +05:30
alfresco-build	e0eb43c479	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-26 12:39:02 +00:00
alfresco-build	f1bbb6cce7	[maven-release-plugin][skip ci] prepare release 25.3.0.28	2025-08-26 12:39:00 +00:00
cezary-witkowski	e6e2a2d8ac	[ACS-9933] Use only lang3 3.18 (#3544 ) Signed-off-by: cezary-witkowski <cezary.witkowski@hyland.com>	2025-08-26 13:56:50 +02:00
alfresco-build	c2cfcdc35a	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-25 09:30:32 +00:00
alfresco-build	6b2ac86b1d	[maven-release-plugin][skip ci] prepare release 25.3.0.27	2025-08-25 09:30:30 +00:00
Arindam Roy	8b212dc4cf	[ACS-10053] Bump ATS to 4.2.1 (#3543 )	2025-08-25 14:18:05 +05:30
alfresco-build	e2c357c1e0	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-24 00:08:14 +00:00
alfresco-build	4a024e510d	[maven-release-plugin][skip ci] prepare release 25.3.0.26	2025-08-24 00:08:12 +00:00
Alfresco CI User	3f75c9b15f	[force] Force release for 2025-08-24.	2025-08-24 00:05:05 +00:00
alfresco-build	96f94a98be	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-21 18:08:07 +00:00
alfresco-build	bfc0445aeb	[maven-release-plugin][skip ci] prepare release 25.3.0.25	2025-08-21 18:08:05 +00:00
Debjit Chattopadhyay	977f6f12d4	Fix for "MNT-24776 : Category Picker Error when a User does not have Read Permissions to a Category" Fix for "MNT-24776 : Category Picker Error when a User does not have Read Permissions to a Category"	2025-08-21 22:41:38 +05:30
Debjit Chattopadhyay	626640ddc7	Fix for "MNT-24776 : Category Picker Error when a User does not have Read Permissions to a Category"	2025-08-19 17:35:00 +05:30
alfresco-build	2b00e550a9	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-17 00:08:35 +00:00
alfresco-build	f3dca482ff	[maven-release-plugin][skip ci] prepare release 25.3.0.24	2025-08-17 00:08:33 +00:00
Alfresco CI User	94e957cb73	[force] Force release for 2025-08-17.	2025-08-17 00:05:19 +00:00
alfresco-build	8868e64a6a	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-14 05:39:28 +00:00
alfresco-build	f4af65943f	[maven-release-plugin][skip ci] prepare release 25.3.0.23	2025-08-14 05:39:26 +00:00
SatyamSah5	6fe1b50741	ACS-9926 bump ATS to 4.2.1-A.4 and Transform Core to 5.2.1-A.3 (#3519 )	2025-08-14 09:28:02 +05:30
alfresco-build	f300bd6b3a	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-11 09:39:46 +00:00
alfresco-build	f7195ef16a	[maven-release-plugin][skip ci] prepare release 25.3.0.22	2025-08-11 09:39:44 +00:00
Belal Ansari	ef228f0614	ACS-9927 Bump ATS to 4.2.1-A.3 (#3513 )	2025-08-11 13:31:08 +05:30
alfresco-build	6c0f231316	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-10 00:08:48 +00:00
alfresco-build	33b521b421	[maven-release-plugin][skip ci] prepare release 25.3.0.21	2025-08-10 00:08:46 +00:00
Alfresco CI User	eff4e0738c	[force] Force release for 2025-08-10.	2025-08-10 00:05:27 +00:00
alfresco-build	5685fc3b17	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-08 09:15:18 +00:00
alfresco-build	7c22a2598b	[maven-release-plugin][skip ci] prepare release 25.3.0.20	2025-08-08 09:15:16 +00:00
jakubkochman	efe053167d	ACS-9844 added extension point for providing additional context configuration files (#3507 )	2025-08-08 10:33:06 +02:00
alfresco-build	4aae383637	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-07 16:09:44 +00:00
alfresco-build	ca1774ffae	[maven-release-plugin][skip ci] prepare release 25.3.0.19	2025-08-07 16:09:41 +00:00
Eva Vasques	6206f67bdd	MNT-24975 - Repeated IPR groups due to casing inconsistencies on creation (#3508 )	2025-08-07 16:16:53 +01:00
alfresco-build	82897f449f	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-07 10:15:36 +00:00
alfresco-build	e6d30cddac	[maven-release-plugin][skip ci] prepare release 25.3.0.18	2025-08-07 10:15:33 +00:00
jakubkochman	0e6b444a25	ACS-9981 removed invalid T function import in Parameters (#3499 )	2025-08-07 11:33:23 +02:00
alfresco-build	61dc54bb33	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-05 18:06:08 +00:00
alfresco-build	a6c7f044df	[maven-release-plugin][skip ci] prepare release 25.3.0.17	2025-08-05 18:06:05 +00:00
Eva Vasques	18016df074	ACS-9923 Removing an aspect needs to invoke onUpdateProperties (#3504 )	2025-08-05 18:22:21 +01:00
alfresco-build	b021c1ebfe	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-05 10:20:13 +00:00
alfresco-build	e3e42137d9	[maven-release-plugin][skip ci] prepare release 25.3.0.16	2025-08-05 10:20:10 +00:00
cezary-witkowski	9327814266	[ACS-9710] Test Share with Elasticsearch (#3496 )	2025-08-05 11:35:46 +02:00
alfresco-build	d45fd10431	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-03 00:09:04 +00:00
alfresco-build	09242daaec	[maven-release-plugin][skip ci] prepare release 25.3.0.15	2025-08-03 00:09:02 +00:00
Alfresco CI User	491a41e8ba	[force] Force release for 2025-08-03.	2025-08-03 00:05:47 +00:00
alfresco-build	1dac1e5fdb	[maven-release-plugin][skip ci] prepare for next development iteration	2025-07-28 12:12:26 +00:00
alfresco-build	2c9d8e63ea	[maven-release-plugin][skip ci] prepare release 25.3.0.14	2025-07-28 12:12:23 +00:00
Eva Vasques	a3998de1ba	MNT-24975 - Repeated IPR groups due to casing inconsistencies (#3459 )	2025-07-28 12:28:02 +01:00
alfresco-build	582742bbd3	[maven-release-plugin][skip ci] prepare for next development iteration	2025-07-27 00:09:39 +00:00
alfresco-build	ebe29717fa	[maven-release-plugin][skip ci] prepare release 25.3.0.13	2025-07-27 00:09:36 +00:00
Alfresco CI User	c6a654cbcf	[force] Force release for 2025-07-27.	2025-07-27 00:05:48 +00:00
dependabot[bot]	cd947b5581	Bump actions/setup-python from 5.4.0 to 5.6.0 (#3331 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-21 12:58:55 +05:30
dependabot[bot]	ef4dd74580	Bump io.fabric8:docker-maven-plugin from 0.45.0 to 0.46.0 (#3413 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-21 12:54:34 +05:30
alfresco-build	7edbdd72f2	[maven-release-plugin][skip ci] prepare for next development iteration	2025-07-21 06:41:08 +00:00