Bump org.mariadb.jdbc:mariadb-java-client from 2.7.4 to 3.5.5

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.7.4 to 3.5.5. - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md) - [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.4...3.5.5) --- updated-dependencies: - dependency-name: org.mariadb.jdbc:mariadb-java-client dependency-version: 3.5.5 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2025-09-24 14:32:01 +00:00 · 2025-08-19 08:24:23 +00:00
50 changed files with 106 additions and 507 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@v5
+      - uses: actions/checkout@v4
        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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
      - 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@v5
+      - uses: actions/checkout@v4
        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@v5
+      - uses: actions/checkout@v4
        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,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    if: contains(github.event.head_commit.message, '[reformat code]')
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Set up Python ${{ inputs.python-version }}
        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
--- 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.35</version>
+      <version>25.3.0.25-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.35</version>
+      <version>25.3.0.25-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.35</version>
+      <version>25.3.0.25-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.lang3.SystemUtils;
+import org.apache.commons.lang.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.lang3.StringUtils;
+import org.apache.commons.lang.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.lang3.StringUtils;
+import org.apache.commons.lang.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.35</version>
+      <version>25.3.0.25-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>25.3.0.35</version>
+      <version>25.3.0.25-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
@@ -36,7 +36,6 @@ import java.util.Set;

 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.extensions.webscripts.ui.common.StringUtils;

 import org.alfresco.model.ContentModel;
@@ -650,8 +649,8 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
        }
        catch (DuplicateChildNodeNameException ex)
        {
-            // Rethrow as ConcurrencyFailureException so that is can be retried and linked to the group created by the concurrent transaction
-            throw new ConcurrencyFailureException("IPR group creation failed due to concurrent duplicate group name creation: " + groupShortName);
+            // the group was concurrently created
+            group = authorityService.getName(AuthorityType.GROUP, groupShortName);
        }

        return group;
--- a/amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java
+++ b/amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java
@@ -29,23 +29,14 @@ package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;

 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-
-import org.junit.Assert;
-import org.springframework.dao.ConcurrencyFailureException;

 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
-import org.alfresco.query.PagingRequest;
-import org.alfresco.query.PagingResults;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.site.SiteModel;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.cmr.security.AuthorityType;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.util.GUID;
@@ -215,8 +206,7 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase
        final NodeRef record = doTestInTransaction(new Test<NodeRef>() {
            public NodeRef run() throws Exception
            {
-                NodeRef record = fileFolderService.create(documentLibrary, GUID.generate(), ContentModel.TYPE_CONTENT)
-                        .getNodeRef();
+                NodeRef record = fileFolderService.create(documentLibrary, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef();
                recordService.createRecord(filePlan, record);
                return record;
            }
@@ -289,238 +279,4 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase
            }
        });
    }
-
-    public void testConcurrentSetWithRetry()
-    {
-        Set<String> extendedReaders = new HashSet<>(2);
-        Set<String> extendedWriters = new HashSet<>(2);
-
-        Set<NodeRef> documents = setupConcurrentTestCase(10, extendedReaders, extendedWriters);
-
-        // For each record created previously, spawn a thread to set extended security so we cause concurrency
-        // failure trying to create IPR groups with the same name
-        fireParallelExecutionOfSetExtendedSecurity(documents, extendedReaders, extendedWriters, true);
-
-        // Look for duplicated IPR groups and verify all documents have the same groups assigned
-        verifyCreatedGroups(documents, false);
-
-        AuthenticationUtil.clearCurrentSecurityContext();
-    }
-
-    public void testConcurrentSetWithoutRetry()
-    {
-        Set<String> extendedReaders = new HashSet<>(2);
-        Set<String> extendedWriters = new HashSet<>(2);
-
-        Set<NodeRef> documents = setupConcurrentTestCase(10, extendedReaders, extendedWriters);
-
-        // For each record created previously, spawn a thread to set extended security so we cause concurrency
-        // failure trying to create IPR groups with the same name.
-        // Since there is no retry, we expect to get a ConcurrencyFailureException
-        Assert.assertThrows(ConcurrencyFailureException.class, () -> {
-            fireParallelExecutionOfSetExtendedSecurity(documents, extendedReaders, extendedWriters, false);
-        });
-
-        // Look for duplicated IPR groups and verify all documents have the same groups assigned
-        // Since there was a ConcurrencyFailureException some threads failed to set extended security so some
-        // documents may not have IPR groups created.
-        verifyCreatedGroups(documents, true);
-
-        AuthenticationUtil.clearCurrentSecurityContext();
-    }
-
-    private Set<NodeRef> setupConcurrentTestCase(int concurrentThreads, Set<String> extendedReaders, Set<String> extendedWriters)
-    {
-        final String usera = createTestUser();
-        final String userb = createTestUser();
-        final String owner = createTestUser();
-
-        extendedReaders.add(usera);
-        extendedReaders.add(userb);
-        extendedWriters.add(usera);
-        extendedWriters.add(userb);
-
-        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
-
-        // Create a site
-        NodeRef documentLib = createSite(new HashSet<>(), new HashSet<>());
-
-        // Create records in the site document library
-        return createRecords(concurrentThreads, documentLib, owner);
-    }
-
-    private NodeRef createSite(Set<String> readers, Set<String> writers)
-    {
-        return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>() {
-            @Override
-            public NodeRef execute() throws Throwable
-            {
-                final String siteShortName = GUID.generate();
-                siteService.createSite(null, siteShortName, "test", "test", SiteVisibility.PRIVATE);
-                readers.forEach(reader -> siteService.setMembership(siteShortName, reader, SiteModel.SITE_CONSUMER));
-                writers.forEach(writer -> siteService.setMembership(siteShortName, writer, SiteModel.SITE_COLLABORATOR));
-                return siteService.createContainer(siteShortName, SiteService.DOCUMENT_LIBRARY, null, null);
-            }
-        }, false, true);
-    }
-
-    private Set<NodeRef> createRecords(int numRecords, NodeRef parent, String owner)
-    {
-        return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Set<NodeRef>>() {
-            @Override
-            public Set<NodeRef> execute() throws Throwable
-            {
-                int createdRecords = 0;
-                Set<NodeRef> documents = new HashSet<>();
-                while (createdRecords < numRecords)
-                {
-                    final NodeRef doc = fileFolderService.create(parent, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef();
-                    ownableService.setOwner(doc, owner);
-                    recordService.createRecord(filePlan, doc, rmFolder, true);
-                    recordService.file(doc);
-                    recordService.complete(doc);
-                    documents.add(doc);
-                    createdRecords++;
-                }
-                return documents;
-            }
-        }, false, true);
-    }
-
-    private void setExtendedSecurity(NodeRef doc, Set<String> readers, Set<String> writers, boolean useRetry)
-    {
-        if (!useRetry)
-        {
-            setExtendedSecurity(doc, readers, writers);
-            return;
-        }
-
-        retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Void>() {
-            @Override
-            public Void execute() throws Throwable
-            {
-                setExtendedSecurity(doc, readers, writers);
-                return null;
-            }
-        }, false, true);
-    }
-
-    private void setExtendedSecurity(NodeRef doc, Set<String> readers, Set<String> writers)
-    {
-        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
-        extendedSecurityService.set(doc, readers, writers);
-    }
-
-    private void fireParallelExecutionOfSetExtendedSecurity(Set<NodeRef> documents, Set<String> extendedReaders, Set<String> extendedWriters, boolean useRetry)
-    {
-        CompletableFuture<?>[] futures = documents.stream()
-                .map(doc -> CompletableFuture.runAsync(() -> setExtendedSecurity(doc, extendedReaders, extendedWriters, useRetry)))
-                .toArray(CompletableFuture[]::new);
-
-        try
-        {
-            CompletableFuture.allOf(futures).join();
-        }
-        catch (Exception e)
-        {
-            Throwable cause = e.getCause();
-            if (cause instanceof ConcurrencyFailureException)
-            {
-                throw (ConcurrencyFailureException) cause;
-            }
-            throw new RuntimeException("Error during parallel execution", e);
-        }
-    }
-
-    private void verifyCreatedGroups(Set<NodeRef> documents, boolean onlyDuplicatesValidation)
-    {
-        retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Void>() {
-            @Override
-            public Void execute() throws Throwable
-            {
-                Set<String> expectedAuthorities = null;
-                Set<Set<String>> errors = new HashSet<>();
-                for (NodeRef doc : documents)
-                {
-                    Set<AccessPermission> permissions = permissionService.getAllSetPermissions(doc);
-                    Set<String> authorities = getDocumentAuthorities(permissions);
-                    Set<String> authoritiesById = getAuthorityIds(authorities);
-
-                    verifyIPRGroups(authorities, onlyDuplicatesValidation);
-
-                    if (onlyDuplicatesValidation)
-                    {
-                        // Some documents may not have IPR groups created if there was a ConcurrencyFailureException
-                        continue;
-                    }
-
-                    // All documents should have the same exact set of groups assigned
-                    if (expectedAuthorities == null)
-                    {
-                        expectedAuthorities = authoritiesById;
-                    }
-
-                    if (!expectedAuthorities.equals(authoritiesById))
-                    {
-                        errors.add(authoritiesById);
-                    }
-                }
-
-                assertTrue("Unexpected authorities linked to document", errors.isEmpty());
-
-                return null;
-            }
-        }, false, true);
-    }
-
-    private Set<String> getDocumentAuthorities(Set<AccessPermission> permissions)
-    {
-        Set<String> authorities = new HashSet<>();
-
-        for (AccessPermission accessPermission : permissions)
-        {
-            String authority = accessPermission.getAuthority();
-            String authName = authorityService.getName(AuthorityType.GROUP, authority);
-            authorities.add(authName);
-
-        }
-        return authorities;
-    }
-
-    private Set<String> getAuthorityIds(Set<String> authorities)
-    {
-        Set<String> authorityIds = new HashSet<>();
-        for (String authority : authorities)
-        {
-            String authId = authorityService.getAuthorityNodeRef(authority) != null
-                    ? authorityService.getAuthorityNodeRef(authority).getId()
-                    : null;
-            authorityIds.add(authId);
-        }
-        return authorityIds;
-    }
-
-    private void verifyIPRGroups(Set<String> authorities, boolean onlyDuplicatesValidation)
-    {
-        boolean hasGroupIPR = false;
-
-        for (String authorityName : authorities)
-        {
-            String shortName = authorityService.getShortName(authorityName);
-
-            if (authorityName.startsWith("GROUP_IPR"))
-            {
-                hasGroupIPR = true;
-                PagingResults<String> results = authorityService.getAuthorities(AuthorityType.GROUP, null, shortName, false,
-                        false, new PagingRequest(0, 10));
-
-                assertEquals("No duplicated IPR group expected", 1, results.getPage().size());
-            }
-        }
-
-        if (!onlyDuplicatesValidation)
-        {
-            assertTrue("No IPR Groups created", hasGroupIPR);
-        }
-    }
 }
--- 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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-SNAPSHOT</version>
    </parent>

    <properties>
@@ -51,8 +51,8 @@
            </exclusions>
        </dependency>
        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</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.lang3.StringEscapeUtils;
+import org.apache.commons.lang.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.unescapeHtml4(link));
+                    WikiPageInfo wikiPage = wikiService.getWikiPage(site.getShortName(), StringEscapeUtils.unescapeHtml(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,15 +91,6 @@ 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
 *
@@ -132,28 +123,6 @@ 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,14 +182,11 @@ var Filters =
         case "favourites":
            for (var favourite in favourites)
            {
-               if (favourite && favourite.trim() !== "")
+               if (filterQuery)
               {
-                  if (filterQuery)
-                  {
-                     filterQuery += " OR ";
-                  }
-                  filterQuery += "ID:\"" + favourite + "\"";
+                  filterQuery += " OR ";
               }
+               filterQuery += "ID:\"" + favourite + "\"";
            }
            
            if (filterQuery.length !== 0)
@@ -204,13 +201,7 @@ var Filters =
            else
            {
               // empty favourites query
-               logger.warn("No favourites found for user: " + person.properties.userName);
-               return {
-                  query: null,
-                  limitResults: 0,
-                  sort: [],
-                  language: "lucene"
-               };
+               filterQuery = "+ID:\"\"";
            }
            
            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.lang3.StringEscapeUtils;
+import org.apache.commons.lang.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.unescapeHtml4(link));
+                WikiPageInfo wikiPage1 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, StringEscapeUtils.unescapeHtml(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.35</version>
+      <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/distribution/src/main/resources/licenses/notice.txt
+++ b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -37,7 +37,8 @@ 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-lang3   http://jakarta.apache.org/commons/
+commons-lang    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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.lang3.time.DateUtils;
+import org.apache.commons.lang.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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+        <version>25.3.0.25-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.35</version>
+    <version>25.3.0.25-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.1</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.2.1</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>5.2.1-A.3</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.2.1-A.4</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>

@@ -125,7 +125,7 @@
        <dependency.postgresql.version>42.7.5</dependency.postgresql.version>
        <dependency.mysql.version>8.0.30</dependency.mysql.version>
        <dependency.mysql-image.version>8</dependency.mysql-image.version>
-        <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
+        <dependency.mariadb.version>3.5.5</dependency.mariadb.version>
        <dependency.tas-utility.version>5.0.2</dependency.tas-utility.version>
        <dependency.rest-assured.version>5.5.5</dependency.rest-assured.version>
        <dependency.tas-email.version>2.0.0</dependency.tas-email.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.35</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -422,9 +422,9 @@
                <version>1.18.0</version>
            </dependency>
            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.18.0</version>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
            </dependency>
            <dependency>
                <groupId>commons-io</groupId>
--- 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.35</version>
+        <version>25.3.0.25-SNAPSHOT</version>
    </parent>

    <dependencies>
--- 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,7 +40,6 @@
 		"items":
 		[
 		<#list results as row>
-			<#if row.item.hasPermission("Read")>
 			{
 				"type": "${row.item.typeShort}",
 				"parentType": "${row.item.parentTypeShort!""}",
@@ -76,7 +75,6 @@
 				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
 				"selectable" : ${row.selectable?string}</#if>
 			}<#if row_has_next>,</#if>
-			</#if>
 		</#list>
 		]
 	}
--- 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.35</version>
+        <version>25.3.0.25-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -94,6 +94,7 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
+            <version>3.18.0</version>
        </dependency>
        <dependency>
            <groupId>commons-codec</groupId>
@@ -736,6 +737,10 @@
            <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.select_NodesWithAspectIds_Limited";
+    private static final String SELECT_NODES_WITH_ASPECT_IDS_LIMITED = "alfresco.node.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 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 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,9 +124,6 @@ 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;

@@ -213,15 +210,6 @@ 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()
     */
@@ -631,7 +619,7 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
        }
        finally
        {
-            if (!secure && cleanScope)
+            if (!secure)
            {
                unsetScope(model, scope);
            }
--- a/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
+++ b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
@@ -81,19 +81,11 @@ 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.
@@ -296,7 +288,7 @@ public class RenditionService2Impl implements RenditionService2, InitializingBea
    {
        try
        {
-            if (!isAsyncAllowed(renderOrTransform))
+            if (!isEnabled())
            {
                throw new RenditionService2Exception("Async transforms and renditions are disabled " +
                        "(system.thumbnail.generate=false or renditionService2.enabled=false).");
@@ -975,24 +967,4 @@ 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.lang3.StringUtils;
+import org.apache.commons.lang.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.lang3.StringUtils;
+import org.apache.commons.lang.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,6 +782,25 @@
        <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
@@ -1547,4 +1566,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,23 +30,4 @@
      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
    </select>

-    <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>
+</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,23 +30,4 @@
      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
    </select>

-    <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>
+</mapper>
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -1394,9 +1394,6 @@ 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,9 +60,6 @@
        <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/rendition2/RenditionService2IntegrationTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
@@ -39,7 +39,6 @@ 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;
@@ -777,58 +776,4 @@ 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);
-        }
-    }
-
 }