[maven-release-plugin][skip ci] prepare release 23.1.0.1-TEST2

Manually set AGS test version.properties to latest
Revert "ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value"
2025-09-24 14:32:01 +00:00 · 2022-05-09 18:21:31 +00:00 · 2022-05-09 17:52:20 +01:00 · 2022-05-09 17:51:58 +01:00 · 2022-05-09 16:44:10 +01:00 · 2022-05-09 16:39:05 +01:00
70 changed files with 1625 additions and 287 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - AppContext02TestSuite"
@@ -75,7 +75,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - AppContext04TestSuite"
@@ -83,7 +83,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - AppContext05TestSuite"
@@ -102,7 +102,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - AppContextExtraTestSuite"
@@ -110,7 +110,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - MiscContextTestSuite"
@@ -118,7 +118,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Repository - SearchTestSuite"
@@ -241,7 +241,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Remote-api - AppContext03TestSuite"
@@ -249,7 +249,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Remote-api - AppContext04TestSuite"
@@ -257,7 +257,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A4
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
      script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

    - name: "Remote-api - AppContextExtraTestSuite"
--- 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>14.119</version>
+      <version>23.1.0.1-TEST2</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>14.119</version>
+      <version>23.1.0.1-TEST2</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>14.119</version>
+      <version>23.1.0.1-TEST2</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.119</version>
+      <version>23.1.0.1-TEST2</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.7-A4
-SOLR6_TAG=2.0.2
+TRANSFORMERS_TAG=2.5.7
+SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1
--- a/amps/ags/rm-community/rm-community-repo/docker-compose.yml
+++ b/amps/ags/rm-community/rm-community-repo/docker-compose.yml
@@ -26,7 +26,8 @@ services:
                -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
                -Dsolr.host=search
                -Dsolr.port=8983
-                -Dsolr.secureComms=none
+                -Dsolr.secureComms=secret
+                -Dsolr.sharedSecret=secret
                -Dsolr.base.url=/solr
                -Dindex.subsystem.name=solr6
                -Dalfresco.restApi.basicAuthScheme=true
@@ -61,15 +62,19 @@ services:
        image: alfresco/alfresco-search-services:${SOLR6_TAG}
        environment:
            #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_ALFRESCO_HOST: "alfresco"
+            SOLR_ALFRESCO_PORT: "8080"
            #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
+            SOLR_SOLR_HOST: "search"
+            SOLR_SOLR_PORT: "8983"
            #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-             #HTTP by default
-            - ALFRESCO_SECURE_COMMS=none
+            SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
+            #HTTP by default
+            ALFRESCO_SECURE_COMMS: "secret"
+            JAVA_TOOL_OPTIONS:
+              "
+              -Dalfresco.secureComms.secret=secret
+              "
        ports:
            - 8083:8983 #Browser port

--- 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>14.119</version>
+      <version>23.1.0.1-TEST2</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties
+++ b/amps/ags/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties
@@ -66,7 +66,8 @@ ftp.enabled=false

 # Solr config
 index.subsystem.name=solr6
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 solr.port=8983

 #By default the  basic auth is on false - REPO-2575
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -3,8 +3,8 @@
 #

 # Version label
-version.major=7
-version.minor=0
+version.major=23
+version.minor=1
 version.revision=0
 version.label=

--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>14.119</version>
+      <version>23.1.0.1-TEST2</version>
   </parent>

   <dependencies>
@@ -128,8 +128,8 @@
         <scope>test</scope>
      </dependency>
      <dependency>
-         <groupId>commons-dbcp</groupId>
-         <artifactId>commons-dbcp</artifactId>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-dbcp2</artifactId>
         <scope>test</scope>
      </dependency>
   </dependencies>
--- a/core/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java
+++ b/core/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java
@@ -21,7 +21,7 @@ package org.alfresco.util.transaction;
 import org.alfresco.error.AlfrescoRuntimeException;

 /**
- * Exception wraps {@link java.util.NoSuchElementException} from {@link org.apache.commons.dbcp.BasicDataSource}
+ * Exception wraps {@link java.util.NoSuchElementException} from {@link org.apache.commons.dbcp2.BasicDataSource}
 * 
 * @author alex.mukha
 * @since 4.1.9
--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/Dockerfile
+++ b/packaging/docker-alfresco/Dockerfile
@@ -1,6 +1,6 @@
-# Fetch image based on Tomcat 9.0, Java 11 and Centos 8
+# Fetch image based on Tomcat 9.0, Java 11 and Centos 7
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:9.0.54-java-11-centos-7
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre11-centos7-202203091924

 # Set default docker_context.
 ARG resource_path=target
--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.7-A4
-SOLR6_TAG=2.0.2
+TRANSFORMERS_TAG=2.5.7
+SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1
--- a/packaging/tests/environment/docker-compose-minimal+transforms.yml
+++ b/packaging/tests/environment/docker-compose-minimal+transforms.yml
@@ -28,7 +28,8 @@ services:
        -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
        -Dsolr.host=solr6
        -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
        -Dsolr.base.url=/solr
        -Dindex.subsystem.name=solr6
        -Dalfresco.restApi.basicAuthScheme=true
@@ -63,15 +64,19 @@ services:
    image: alfresco/alfresco-search-services:${SOLR6_TAG}
    environment:
      #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
      #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
      #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
      #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
    ports:
      - 8083:8983 #Browser port

--- a/packaging/tests/environment/docker-compose-minimal.yml
+++ b/packaging/tests/environment/docker-compose-minimal.yml
@@ -28,7 +28,8 @@ services:
        -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
        -Dsolr.host=solr6
        -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
        -Dsolr.base.url=/solr
        -Dindex.subsystem.name=solr6
        -Dalfresco.restApi.basicAuthScheme=true
@@ -66,15 +67,19 @@ services:
    image: alfresco/alfresco-search-services:${SOLR6_TAG}
    environment:
      #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
      #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
      #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
      #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
    ports:
      - 8083:8983 #Browser port

--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <developers>
--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <developers>
--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+        <version>23.1.0.1-TEST2</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>14.119</version>
+    <version>23.1.0.1-TEST2</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -23,8 +23,8 @@
    </modules>

    <properties>
-        <acs.version.major>7</acs.version.major>
-        <acs.version.minor>2</acs.version.minor>
+        <acs.version.major>23</acs.version.major>
+        <acs.version.minor>1</acs.version.minor>
        <acs.version.revision>0</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -47,11 +47,11 @@
        <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
        <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
        <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
+        <dependency.alfresco-messaging-repo.version>1.2.19</dependency.alfresco-messaging-repo.version>
        <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-model.version>1.4.13</dependency.alfresco-transform-model.version>
+        <dependency.alfresco-transform-model.version>1.4.15</dependency.alfresco-transform-model.version>
        <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>

@@ -65,7 +65,7 @@
        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
        <dependency.mockito-core.version>3.11.2</dependency.mockito-core.version>
        <dependency.org-json.version>20211205</dependency.org-json.version>
-        <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
+        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
        <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
        <dependency.gson.version>2.8.5</dependency.gson.version>
        <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
@@ -75,7 +75,7 @@
        <dependency.slf4j.version>1.7.35</dependency.slf4j.version>
        <dependency.gytheio.version>0.16</dependency.gytheio.version>
        <dependency.groovy.version>3.0.9</dependency.groovy.version>
-        <dependency.tika.version>2.2.1</dependency.tika.version> 
+        <dependency.tika.version>2.2.1</dependency.tika.version>
        <dependency.spring-security.version>5.6.1</dependency.spring-security.version>
        <dependency.truezip.version>7.7.10</dependency.truezip.version>
        <dependency.poi.version>4.1.2</dependency.poi.version>
@@ -106,11 +106,11 @@
        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>

        <alfresco.googledrive.version>3.2.1.3</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.4.0.1</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.2.0-A3</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.aos-module.version>1.4.1</alfresco.aos-module.version> 
+        <alfresco.api-explorer.version>7.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
-        <license-maven-plugin.version>2.0.1.alfresco-1</license-maven-plugin.version>
+        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>

        <dependency.postgresql.version>42.3.2</dependency.postgresql.version>
        <dependency.mysql.version>8.0.27</dependency.mysql.version>
@@ -118,7 +118,7 @@
        <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
        <dependency.tas-utility.version>3.0.47</dependency.tas-utility.version>
        <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.71</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.79</dependency.tas-restapi.version>
        <dependency.tas-cmis.version>1.31</dependency.tas-cmis.version>
        <dependency.tas-email.version>1.8</dependency.tas-email.version>
        <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -146,7 +146,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>14.119</tag>
+        <tag>23.1.0.1-TEST2</tag>
    </scm>

    <distributionManagement>
@@ -755,8 +755,8 @@
                <version>${dependency.mockito-core.version}</version>
            </dependency>
            <dependency>
-                <groupId>commons-dbcp</groupId>
-                <artifactId>commons-dbcp</artifactId>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-dbcp2</artifactId>
                <version>${dependency.commons-dbcp.version}</version>
            </dependency>
            <dependency>
--- 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>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -3132,26 +3132,18 @@ public class NodesImpl implements Nodes
            // Write content
            writeContent(nodeRef, fileName, content.getInputStream(), true);
        }
-        
+
        if ((versionMajor != null) || (versionComment != null))
        {
-            behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
-            try
+            // by default, first version is major, unless specified otherwise
+            VersionType versionType = VersionType.MAJOR;
+            if ((versionMajor != null) && (!versionMajor))
            {
-                // by default, first version is major, unless specified otherwise
-                VersionType versionType = VersionType.MAJOR;
-                if ((versionMajor != null) && (!versionMajor))
-                {
-                    versionType = VersionType.MINOR;
-                }
-
-                createVersion(nodeRef, false, versionType, versionComment);
-
-                extractMetadata(nodeRef);
-            } finally
-            {
-                behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+                versionType = VersionType.MINOR;
            }
+
+            createVersion(nodeRef, false, versionType, versionComment);
+            extractMetadata(nodeRef);
        }

        return nodeRef;
--- a/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
@@ -85,8 +85,7 @@ public class AlfrescoX509ServletFilter extends X509ServletFilterBase
                throw new AlfrescoRuntimeException("Missing value for sharedSecretHeader");
            }
        }
-        /*
-        // TODO: Activate this part after OPSEXP-1163 got implemented
+
        if(secureComms == SecureCommsType.NONE)
        {
            if(!"true".equalsIgnoreCase(config.getInitParameter("allow-unauthenticated-solr-endpoint")))
@@ -94,7 +93,7 @@ public class AlfrescoX509ServletFilter extends X509ServletFilterBase
                throw new AlfrescoRuntimeException("solr.secureComms=none is no longer supported. Please use https or secret");
            }
        }
-        */
+
        super.init(config);
    }

--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
@@ -357,12 +357,13 @@ function main()
         updateNode.properties.content.write(content, updateNameAndMimetype, true, newFilename);
         // check it in again, with supplied version history note
         
+         updateNode = updateNode.checkin(description, majorVersion);
+
         // Extract the metadata
         // (The overwrite policy controls which if any parts of
         //  the document's properties are updated from this)
         extractMetadata(updateNode);
-         
-         updateNode = updateNode.checkin(description, majorVersion);
+
         if (aspects.length != 0)
         {
            for (i = 0; i < aspects.length; i++)
--- a/remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java
+++ b/remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java
@@ -51,6 +51,8 @@ import org.junit.runners.Suite;
    org.alfresco.rest.api.tests.GroupsTest.class,
    org.alfresco.rest.api.tests.ModulePackagesApiTest.class,
    org.alfresco.rest.api.tests.NodeApiTest.class,
+    org.alfresco.rest.api.tests.NodeApiVersioningMultipartParameterizedTest.class,
+    org.alfresco.rest.api.tests.NodeApiVersioningJsonParameterizedTest.class,
    org.alfresco.rest.api.tests.NodeAssociationsApiTest.class,
    org.alfresco.rest.api.tests.NodeVersionsApiTest.class,
    org.alfresco.rest.api.tests.NodeVersionRenditionsApiTest.class,
--- a/remote-api/src/test/java/org/alfresco/AppContextExtraTestSuite.java
+++ b/remote-api/src/test/java/org/alfresco/AppContextExtraTestSuite.java
@@ -40,6 +40,7 @@ import org.junit.runners.Suite;
    org.alfresco.repo.web.scripts.solr.StatsGetTest.class,
    org.alfresco.repo.web.scripts.solr.SOLRSerializerTest.class,
    org.alfresco.repo.web.scripts.solr.SOLRAuthenticationFilterTest.class,
+    org.alfresco.web.app.servlet.AlfrescoX509ServletFilterTest.class,
    org.alfresco.repo.web.util.PagingCursorTest.class,
    org.alfresco.repo.web.util.paging.PagingTest.class,
    org.alfresco.repo.webdav.GetMethodTest.class,
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiVersioningJsonParameterizedTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiVersioningJsonParameterizedTest.java
@@ -0,0 +1,179 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.*;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Parameterized.class)
+public class NodeApiVersioningJsonParameterizedTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String TYPE_CM_CONTENT = "cm:content";
+    private static final String TYPE_CUSTOM_DOCUMENT = "custom:document";
+
+    private static final String VERSIONING_ENABLED_TRUE = "true";
+    private static final String VERSIONING_ENABLED_FALSE = "false";
+    private static final String VERSIONING_ENABLED_UNSET = null;
+
+    private static final Boolean MAJOR_VERSION_ENABLED_TRUE = true;
+    private static final Boolean MAJOR_VERSION_ENABLED_FALSE = false;
+    private static final Boolean MAJOR_VERSION_ENABLED_UNSET = null;
+
+    private static final String VERSION_NOT_EXPECTED = null;
+    private static final String EXPECTED_VERSION_0_1 = "0.1";
+    private static final String EXPECTED_VERSION_1_0 = "1.0";
+
+    private static final String EXPECTED_ASPECT_VERSIONABLE = "cm:versionable";
+    private static final String EXPECTED_ASPECT_NONE = null;
+
+    protected PermissionService permissionService;
+    protected AuthorityService authorityService;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+
+
+    @Parameterized.Parameter(value = 0)
+    public String type;
+
+    @Parameterized.Parameter(value = 1)
+    public String versioningEnabled;
+
+    @Parameterized.Parameter(value = 2)
+    public Boolean majorVersion;
+
+    @Parameterized.Parameter(value = 3)
+    public String expectedVersion;
+
+    @Parameterized.Parameter(value = 4)
+    public String expectedAspect;
+
+    @Parameterized.Parameters //parameters source - MMT-22462 comments
+    public static Collection<Object[]> data()
+    {
+        Collection<Object[]> params = new ArrayList();
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_UNSET, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_NONE});
+
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_UNSET, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_TRUE, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_FALSE, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        return params;
+    }
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        permissionService = applicationContext.getBean("permissionService", PermissionService.class);
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+        nodeService = applicationContext.getBean("NodeService", NodeService.class);
+        namespaceService= (NamespaceService) applicationContext.getBean("NamespaceService");
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    @Test
+    public void versionableDocumentJsonNodeCreationTest() throws Exception
+    {
+        setRequestContext(user1);
+        String myNodeId = getMyNodeId();
+
+        Document d1 = new Document();
+        Map<String, String> params = new HashMap<>();
+        d1.setName("testDoc" + UUID.randomUUID());
+        d1.setNodeType(type);
+
+        if(versioningEnabled != null)
+        {
+            params.put("versioningEnabled", versioningEnabled);
+        }
+        if(majorVersion != null)
+        {
+            params.put("majorVersion", majorVersion.toString());
+        }
+
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), params, null, null, 201);
+        Document documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertExpectedVersion(expectedVersion, documentResponse.getProperties());
+        assertContainsAspect(expectedAspect, documentResponse);
+    }
+
+    private void assertExpectedVersion(String expectedVersion, Map<String, Object> documentProperties)
+    {
+        if(documentProperties != null) {
+            assertEquals(expectedVersion, documentProperties.get("cm:versionLabel"));
+        }
+    }
+
+    private void assertContainsAspect(String expectedAspect, Document documentResponse)
+    {
+        if(expectedAspect != null) {
+            assertTrue(!documentResponse.getAspectNames().isEmpty());
+            assertTrue(documentResponse.getAspectNames().contains(expectedAspect));
+        }
+    }
+}
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiVersioningMultipartParameterizedTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiVersioningMultipartParameterizedTest.java
@@ -0,0 +1,183 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class NodeApiVersioningMultipartParameterizedTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String TYPE_CM_CONTENT = "cm:content";
+    private static final String TYPE_CUSTOM_DOCUMENT = "custom:document";
+
+    private static final String VERSIONING_ENABLED_TRUE = "true";
+    private static final String VERSIONING_ENABLED_FALSE = "false";
+    private static final String VERSIONING_ENABLED_UNSET = null;
+
+    private static final Boolean MAJOR_VERSION_ENABLED_TRUE = true;
+    private static final Boolean MAJOR_VERSION_ENABLED_FALSE = false;
+    private static final Boolean MAJOR_VERSION_ENABLED_UNSET = null;
+
+    private static final String VERSION_NOT_EXPECTED = null;
+    private static final String EXPECTED_VERSION_0_1 = "0.1";
+    private static final String EXPECTED_VERSION_1_0 = "1.0";
+
+    private static final String EXPECTED_ASPECT_VERSIONABLE = "cm:versionable";
+    private static final String EXPECTED_ASPECT_NONE = null;
+
+    protected PermissionService permissionService;
+    protected AuthorityService authorityService;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+
+
+    @Parameterized.Parameter(value = 0)
+    public String type;
+
+    @Parameterized.Parameter(value = 1)
+    public String versioningEnabled;
+
+    @Parameterized.Parameter(value = 2)
+    public Boolean majorVersion;
+
+    @Parameterized.Parameter(value = 3)
+    public String expectedVersion;
+
+    @Parameterized.Parameter(value = 4)
+    public String expectedAspect;
+
+    @Parameterized.Parameters //parameters source - MMT-22462 comments
+    public static Collection<Object[]> data()
+    {
+        Collection<Object[]> params = new ArrayList();
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_UNSET, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_TRUE, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+        params.add(new Object[]{TYPE_CM_CONTENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_FALSE, VERSION_NOT_EXPECTED, EXPECTED_ASPECT_NONE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_UNSET, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_TRUE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_UNSET, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_TRUE, EXPECTED_VERSION_1_0, EXPECTED_ASPECT_VERSIONABLE});
+        params.add(new Object[]{TYPE_CUSTOM_DOCUMENT, VERSIONING_ENABLED_FALSE, MAJOR_VERSION_ENABLED_FALSE, EXPECTED_VERSION_0_1, EXPECTED_ASPECT_VERSIONABLE});
+
+        return params;
+    }
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        permissionService = applicationContext.getBean("permissionService", PermissionService.class);
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+        nodeService = applicationContext.getBean("NodeService", NodeService.class);
+        namespaceService= (NamespaceService) applicationContext.getBean("NamespaceService");
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    @Test
+    public void versionableDocumentMultipartNodeCreationTest() throws Exception
+    {
+        setRequestContext(user1);
+        String myNodeId = getMyNodeId();
+
+        String fileName = "myfile" + UUID.randomUUID() + ".txt";
+        File file = getResourceFile("quick-2.pdf");
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file));
+        multiPartBuilder.setNodeType(type);
+        multiPartBuilder.setVersioningEnabled(versioningEnabled);
+        if(majorVersion != null)
+        {
+            multiPartBuilder.setMajorVersion(majorVersion);
+        }
+
+        MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build();
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        Map<String, Object> documentProperties = documentResponse.getProperties();
+
+        assertExpectedVersion(expectedVersion, documentProperties);
+        assertContainsAspect(expectedAspect, documentResponse);
+    }
+
+    private void assertExpectedVersion(String expectedVersion, Map<String, Object> documentProperties)
+    {
+        if(documentProperties != null) {
+            assertEquals(expectedVersion, documentProperties.get("cm:versionLabel"));
+        }
+    }
+
+    private void assertContainsAspect(String expectedAspect, Document documentResponse)
+    {
+        if(expectedAspect != null) {
+            assertTrue(!documentResponse.getAspectNames().isEmpty());
+            assertTrue(documentResponse.getAspectNames().contains(expectedAspect));
+        }
+    }
+}
--- a/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java
+++ b/remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java
@@ -0,0 +1,190 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.web.app.servlet;
+
+import static junit.framework.TestCase.assertEquals;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import java.util.Properties;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.httpclient.HttpClientFactory.SecureCommsType;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ *  Unit tests for {@link AlfrescoX509ServletFilter}.
+ */
+public class AlfrescoX509ServletFilterTest
+{
+
+    private static final String BEAN_GLOBAL_PROPERTIES = "global-properties";
+    private static final String PROP_SECURE_COMMS = "solr.secureComms";
+    private static final String PROP_SHARED_SECRET = "solr.sharedSecret";
+    private static final String PROP_SHARED_SECRET_HEADER = "solr.sharedSecret.header";
+    private static final String SHARED_SECRET_HEADER = "X-Alfresco-Search-Secret";
+    private static final String SECRET = "secret";
+    private static final String ALLOW_UNAUTHORIZED_SOLR_ENDPOINT = "allow-unauthenticated-solr-endpoint";
+
+    private static final String MISSING_SHARED_SECRET_EXCEPTION_MSG = "Missing value for solr.sharedSecret configuration property";
+    private static final String MISSING_SHARED_SECRET_HEADER_EXCEPTION_MSG = "Missing value for sharedSecretHeader";
+    private static final String SECURE_COMMS_NONE_IS_NOT_SUPPORTED_EXCEPTION_MSG = "solr.secureComms=none is no longer supported. Please use https or secret";
+
+    private FilterConfig filterConfig;
+    private Properties globalProperties;
+    private AlfrescoX509ServletFilter filter;
+
+    @Before
+    public void before()
+    {
+        FilterConfig filterConfig = Mockito.mock(FilterConfig.class);
+        WebApplicationContext webApplicationContext = Mockito.mock(WebApplicationContext.class);
+        ServletContext servletContext = Mockito.mock(ServletContext.class);
+        Properties globalProperties = Mockito.mock(Properties.class);
+
+        Mockito.when(servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).thenReturn(webApplicationContext);
+        Mockito.when(filterConfig.getServletContext()).thenReturn(servletContext);
+        Mockito.when(WebApplicationContextUtils.getRequiredWebApplicationContext(filterConfig.getServletContext())).thenReturn(webApplicationContext);
+        Mockito.when(webApplicationContext.getBean(BEAN_GLOBAL_PROPERTIES)).thenReturn(globalProperties);
+
+        this.filterConfig = filterConfig;
+        this.globalProperties = globalProperties;
+        this.filter = new AlfrescoX509ServletFilter();
+    }
+
+    @Test (expected = AlfrescoRuntimeException.class)
+    public void testSharedSecretIsEmpty() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.SECRET.name());
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET)).thenReturn("");
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET_HEADER)).thenReturn(SHARED_SECRET_HEADER);
+
+        try
+        {
+            filter.init(filterConfig);
+        }
+        catch (AlfrescoRuntimeException ex)
+        {
+            assertEquals(MISSING_SHARED_SECRET_EXCEPTION_MSG, ex.getMsgId());
+            throw ex;
+        }
+    }
+
+    @Test (expected = AlfrescoRuntimeException.class)
+    public void testSharedSecretIsNull() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.SECRET.name());
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET)).thenReturn(null);
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET_HEADER)).thenReturn(SHARED_SECRET_HEADER);
+
+        try
+        {
+            filter.init(filterConfig);
+        }
+        catch (AlfrescoRuntimeException ex)
+        {
+            assertEquals(MISSING_SHARED_SECRET_EXCEPTION_MSG, ex.getMsgId());
+            throw ex;
+        }
+    }
+
+    @Test (expected = AlfrescoRuntimeException.class)
+    public void testSharedSecretHeaderIsEmpty() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.SECRET.name());
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET)).thenReturn(SECRET);
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET_HEADER)).thenReturn("");
+
+        try
+        {
+            filter.init(filterConfig);
+        }
+        catch (AlfrescoRuntimeException ex)
+        {
+            assertEquals(MISSING_SHARED_SECRET_HEADER_EXCEPTION_MSG, ex.getMsgId());
+            throw ex;
+        }
+    }
+
+    @Test (expected = AlfrescoRuntimeException.class)
+    public void testSharedSecretHeaderIsNull() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.SECRET.name());
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET)).thenReturn(SECRET);
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET_HEADER)).thenReturn("");
+
+        try
+        {
+            filter.init(filterConfig);
+        }
+        catch (AlfrescoRuntimeException ex)
+        {
+            assertEquals(MISSING_SHARED_SECRET_HEADER_EXCEPTION_MSG, ex.getMsgId());
+            throw ex;
+        }
+    }
+
+    @Test
+    public void testSharedSecretProperlyConfigured() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.SECRET.name());
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET)).thenReturn(SECRET);
+        Mockito.when(globalProperties.getProperty(PROP_SHARED_SECRET_HEADER)).thenReturn(SHARED_SECRET_HEADER);
+
+        filter.init(filterConfig);
+    }
+
+    @Test (expected = AlfrescoRuntimeException.class)
+    public void testSecureCommsNoneAndNotAllowUnauthenticatedSolrEndpoint() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.NONE.name());
+        Mockito.when(filterConfig.getInitParameter(ALLOW_UNAUTHORIZED_SOLR_ENDPOINT)).thenReturn("false");
+
+        try
+        {
+            filter.init(filterConfig);
+        }
+        catch (AlfrescoRuntimeException ex)
+        {
+            assertEquals(SECURE_COMMS_NONE_IS_NOT_SUPPORTED_EXCEPTION_MSG, ex.getMsgId());
+            throw ex;
+        }
+    }
+
+    @Test
+    public void testSecureCommsNoneAndAllowUnauthenticatedSolrEndpoint() throws ServletException
+    {
+        Mockito.when(globalProperties.getProperty(PROP_SECURE_COMMS)).thenReturn(SecureCommsType.NONE.name());
+        Mockito.when(filterConfig.getInitParameter(ALLOW_UNAUTHORIZED_SOLR_ENDPOINT)).thenReturn("true");
+
+        filter.init(filterConfig);
+    }
+
+}
--- a/remote-api/src/test/resources/models/custom-model.xml
+++ b/remote-api/src/test/resources/models/custom-model.xml
@@ -54,7 +54,20 @@
      		</property>
         </properties>
      </type>
-	  
+
+       <type name="custom:document">
+           <title>Sample Document Type</title>
+           <parent>cm:content</parent>
+           <properties>
+               <property name="custom:sample">
+                   <type>d:text</type>
+               </property>
+           </properties>
+           <mandatory-aspects>
+               <aspect>cm:versionable</aspect>
+           </mandatory-aspects>
+       </type>
+
 	</types>
 	 
 	
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>14.119</version>
+        <version>23.1.0.1-TEST2</version>
    </parent>

    <dependencies>
@@ -77,8 +77,8 @@
        </dependency>

        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-fileupload</groupId>
--- a/repository/src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java
+++ b/repository/src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java
@@ -51,7 +51,7 @@ import org.alfresco.service.cmr.workflow.WorkflowAdminService;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.traitextender.SpringExtensionBundle;
 import org.alfresco.util.PropertyCheck;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -89,7 +89,7 @@ import javax.sql.DataSource;
 *          </li>
 *          <li><b>db:</b> Database configuration
 *              <ul>
- *                  <li>maxConnections: int - The maximum number of active connections. {@link BasicDataSource#getMaxActive()}</li>
+ *                  <li>maxConnections: int - The maximum number of active connections. {@link BasicDataSource#getMaxTotal()}</li>
 *              </ul>
 *          </li>
 *          <li><b>authentication</b>: Authentication configuration.
@@ -326,7 +326,7 @@ public class ConfigurationDataCollector extends HBBaseDataCollector implements I
        if (dataSource instanceof BasicDataSource)
        {
            Map<String, Object> db = new HashMap<>();
-            db.put("maxConnections", ((BasicDataSource) dataSource).getMaxActive());
+            db.put("maxConnections", ((BasicDataSource) dataSource).getMaxTotal());
            configurationValues.put("db", db);
        }

--- a/repository/src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java
+++ b/repository/src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java
@@ -31,7 +31,7 @@ import org.alfresco.heartbeat.datasender.HBData;
 import org.alfresco.heartbeat.jobs.HeartBeatJobScheduler;
 import org.alfresco.repo.descriptor.DescriptorDAO;
 import org.alfresco.util.PropertyCheck;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
--- a/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -35,6 +35,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
--- a/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java
@@ -29,6 +29,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -944,4 +945,49 @@ public interface NodeDAO extends NodeBulkLoader
     */
    public Long getNextTxCommitTime(Long fromCommitTime);

+    /**
+     *
+     * @param maxCommitTime
+     * @return Iterator over node ids
+     */
+     default public Iterator<Long> selectDeletedNodesByCommitTime(long maxCommitTime)
+     {
+         throw new UnsupportedOperationException("Not Implemented");
+     }
+
+    /**
+     * Purge the nodes marked as deleted
+     * @param minAge
+     * @param deleteBatchSize
+     * @return the count of nodes deleted in each batch
+     */
+     default public List<String> purgeDeletedNodes(long minAge, int deleteBatchSize)
+     {
+         throw new UnsupportedOperationException("This operation is not supported");
+     }
+
+    /**
+     *
+     * @param maxCommitTime
+     * @return Iterator over transaction ids
+     */
+    default public Iterator<Long> selectUnusedTransactionsByCommitTime(long maxCommitTime)
+    {
+        throw new UnsupportedOperationException("Not Implemented");
+    }
+
+
+    /**
+     * Purge the transactions of purged nodes
+     * @param minAge
+     * @param deleteBatchSize
+     * @return the count of transactions deleted in each batch
+     */
+    default public List<String> purgeEmptyTransactions(long minAge, int deleteBatchSize)
+    {
+        throw new UnsupportedOperationException("This operation is not supported");
+    }
+
+
+
 }
--- 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
@@ -25,16 +25,6 @@
 */
 package org.alfresco.repo.domain.node.ibatis;

-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.ibatis.IdsEntity;
 import org.alfresco.model.ContentModel;
@@ -65,6 +55,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
+import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.executor.result.DefaultResultContext;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
@@ -72,6 +63,17 @@ import org.apache.ibatis.session.RowBounds;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.util.Assert;

+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+

 /**
 * iBatis-specific extension of the Node abstract DAO 
@@ -166,6 +168,12 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
    private static final String SELECT_TXN_MIN_TX_ID_IN_NODE_IDRANGE = "alfresco.node.select_TxnMinTxIdInNodeIdRange";
    private static final String SELECT_TXN_MAX_TX_ID_IN_NODE_IDRANGE = "alfresco.node.select_TxnMaxTxIdInNodeIdRange";
    private static final String SELECT_TXN_NEXT_TXN_COMMIT_TIME = "select_TxnNextTxnCommitTime";
+    private static final String SELECT_NODES_DELETED_BY_TXN_COMMIT_TIME = "alfresco.node.select.select_Deleted_NodesByTxnCommitTime";
+    private static final String DELETE_NODES_BY_ID = "alfresco.node.delete_NodesById";
+    private static final String DELETE_NODE_PROPS_BY_NODE_ID = "alfresco.node.delete_NodePropsByNodeId";
+    private static final String SELECT_TXNS_UNUSED_BY_TXN_COMMIT_TIME = "alfresco.node.select.select_Txns_UnusedByTxnCommitTime";
+    private static final String DELETE_TXNS_UNUSED_BY_ID = "alfresco.node.delete_Txns_UnusedById";
+
    
    protected QNameDAO qnameDAO;
    protected DictionaryService dictionaryService;
@@ -1794,8 +1802,138 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
        
        return template.selectOne(SELECT_TXN_NEXT_TXN_COMMIT_TIME, fromCommitTimeEntity);
    }
-    
-    
+
+    public Iterator<Long> selectDeletedNodesByCommitTime(long maxCommitTime)
+    {
+        // Get the deleted nodes
+        Pair<Long, QName> deletedTypePair = qnameDAO.getQName(ContentModel.TYPE_DELETED);
+        if (deletedTypePair == null)
+        {
+            // Nothing to do
+            return null;
+        }
+
+        TransactionQueryEntity transactionQueryEntity = new TransactionQueryEntity();
+        transactionQueryEntity.setMaxCommitTime(maxCommitTime);
+        transactionQueryEntity.setTypeQNameId(deletedTypePair.getFirst());
+        Cursor<Long> cursor = template.selectCursor(SELECT_NODES_DELETED_BY_TXN_COMMIT_TIME, transactionQueryEntity);
+
+        return cursor.iterator();
+    }
+
+    public Iterator<Long> selectUnusedTransactionsByCommitTime(long maxCommitTime)
+    {
+        TransactionQueryEntity maxCommitTimeEntity = new TransactionQueryEntity();
+        maxCommitTimeEntity.setMaxCommitTime(maxCommitTime);
+        Cursor<Long> cursor = template.selectCursor(SELECT_TXNS_UNUSED_BY_TXN_COMMIT_TIME, maxCommitTimeEntity);
+
+        return cursor.iterator();
+    }
+
+    @Override
+    public List<String> purgeDeletedNodes(long minAge, int deleteBatchSize)
+    {
+        final long maxCommitTime = System.currentTimeMillis() - minAge;
+        Iterator<Long> nodeIdIterator = this.selectDeletedNodesByCommitTime(maxCommitTime);
+        ArrayList<Long> nodeIdList = new ArrayList<>();
+        List<String> deleteResult = new ArrayList<>();
+        if (isDebugEnabled)
+        {
+            logger.debug("nodes selected for deletion, deleteBatchSize:" + deleteBatchSize);
+        }
+        while (nodeIdIterator != null && nodeIdIterator.hasNext())
+        {
+            if (deleteBatchSize == nodeIdList.size())
+            {
+                int count = deleteSelectedNodesAndProperties(nodeIdList);
+                if (isDebugEnabled)
+                {
+                    logger.debug("nodes deleted:" + count);
+                }
+                deleteResult.add("Purged old nodes: " + count);
+                nodeIdList.clear();
+            }
+            else
+            {
+                nodeIdList.add(nodeIdIterator.next());
+            }
+        }
+        if (nodeIdList.size() > 0)
+        {
+            int count = deleteSelectedNodesAndProperties(nodeIdList);
+            if (isDebugEnabled)
+            {
+                logger.debug("remaining nodes deleted:" + count);
+            }
+            deleteResult.add("Purged old nodes: " + count);
+            nodeIdList.clear();
+        }
+        return deleteResult;
+    }
+
+    public List<String> purgeEmptyTransactions(long minAge, int deleteBatchSize)
+    {
+        final long maxCommitTime = System.currentTimeMillis() - minAge;
+        Iterator<Long> transactionIdIterator = this.selectUnusedTransactionsByCommitTime(maxCommitTime);
+        ArrayList<Long> transactionIdList = new ArrayList<>();
+        List<String> deleteResult = new ArrayList<>();
+        if (isDebugEnabled)
+        {
+            logger.debug("transactions selected for deletion, deleteBatchSize:" + deleteBatchSize);
+        }
+        while (transactionIdIterator.hasNext())
+        {
+            if (deleteBatchSize == transactionIdList.size())
+            {
+                int count = deleteSelectedTransactions(transactionIdList);
+                deleteResult.add("Purged old transactions: " + count);
+                if (isDebugEnabled)
+                {
+                    logger.debug("transactions deleted:" + count);
+                }
+                transactionIdList.clear();
+
+            }
+            else
+            {
+                transactionIdList.add(transactionIdIterator.next());
+            }
+        }
+        if (transactionIdList.size() > 0)
+        {
+            int count = deleteSelectedTransactions(transactionIdList);
+            deleteResult.add("Purged old transactions: " + count);
+            if (isDebugEnabled)
+            {
+                logger.debug("final batch of transactions deleted:" + count);
+            }
+            transactionIdList.clear();
+        }
+        return deleteResult;
+    }
+
+    private int deleteSelectedNodesAndProperties(List<Long> nodeIdList)
+    {
+        int cnt = template.delete(DELETE_NODE_PROPS_BY_NODE_ID, nodeIdList);
+        if (isDebugEnabled)
+        {
+            logger.debug("nodes props deleted:" + cnt);
+        }
+        // Finally, remove the nodes
+        cnt = template.delete(DELETE_NODES_BY_ID, nodeIdList);
+        if (isDebugEnabled)
+        {
+            logger.debug("nodes  deleted:" + cnt);
+        }
+        return cnt;
+    }
+
+    private int deleteSelectedTransactions(List<Long> transactionIdList)
+    {
+        return template.delete(DELETE_TXNS_UNUSED_BY_ID, transactionIdList);
+    }
+
+
    /*
     * DAO OVERRIDES
     */
@@ -1936,4 +2074,4 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
                                assocQName);
        }
    }
-}
+}
--- a/repository/src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
+++ b/repository/src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
@@ -50,6 +50,13 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
    // of the chunk (in ms). Default is a couple of hours.
    private int purgeSize = 7200000; // ms

+    //to determine if we need a time based window deletion of nodes or in fixed size batches.
+    private  String algorithm;
+
+    private int deleteBatchSize;
+
+    private static final String NODE_TABLE_CLEANER_ALG_V2 = "V2";
+
    /**
     * Default constructor
     */
@@ -67,15 +74,57 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
        {
            return Collections.singletonList("Minimum purge age is negative; purge disabled");
        }
-        
-        List<String> purgedNodes = purgeOldDeletedNodes(minPurgeAgeMs);
-        List<String> purgedTxns = purgeOldEmptyTransactions(minPurgeAgeMs);
-        
-        List<String> allResults = new ArrayList<String>(100);
+        List<String> purgedNodes, purgedTxns;
+
+        if (NODE_TABLE_CLEANER_ALG_V2.equals(algorithm))
+        {
+            refreshLock();
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("DeletedNodeCleanupWorker using batch deletion: About to execute the clean up nodes ");
+
+            }
+            purgedNodes = purgeOldDeletedNodesV2(minPurgeAgeMs);
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(purgedNodes);
+            }
+            refreshLock();
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("DeletedNodeCleanupWorker: About to execute the clean up txns ");
+            }
+
+            purgedTxns = purgeOldEmptyTransactionsV2(minPurgeAgeMs);
+        }
+        else
+        {
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("DeletedNodeCleanupWorker: About to start purgeOldDeletedNodes ");
+            }
+
+            purgedNodes = purgeOldDeletedNodes(minPurgeAgeMs);
+            logger.debug(purgedNodes);
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("DeletedNodeCleanupWorker: About to start purgeOldEmptyTransactions ");
+            }
+
+            purgedTxns = purgeOldEmptyTransactions(minPurgeAgeMs);
+        }
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(purgedTxns);
+        }
+
+        List<String> allResults = new ArrayList<>(100);
        allResults.addAll(purgedNodes);
        allResults.addAll(purgedTxns);
-        
-        // Done
+
        return allResults;
    }

@@ -110,7 +159,17 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
        this.purgeSize = purgeSize;
    }

-	/**
+    public void setAlgorithm(String algorithm)
+    {
+        this.algorithm = algorithm;
+    }
+
+    public void setDeleteBatchSize(int deleteBatchSize)
+    {
+        this.deleteBatchSize = deleteBatchSize;
+    }
+
+    /**
     * Cleans up deleted nodes that are older than the given minimum age.
     * 
     * @param minAge        the minimum age of a transaction or deleted node
@@ -122,10 +181,12 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker

        final long maxCommitTime = System.currentTimeMillis() - minAge;
        long fromCommitTime = fromCustomCommitTime;
+
        if (fromCommitTime <= 0L)
        {
            fromCommitTime = nodeDAO.getMinTxnCommitTimeForDeletedNodes().longValue();
        }
+
        if ( fromCommitTime == 0L )
        {
              String msg = "There are no old nodes to purge.";
@@ -134,7 +195,10 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
        }
        
        long loopPurgeSize = purgeSize;
-        Long purgeCount = new Long(0);
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("DeletedNodeCleanupWorker: purgeOldDeletedNodes started ");
+        }
        while (true)
        {
            // Ensure we keep the lock
@@ -153,9 +217,9 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
            try
            {
                DeleteNodesByTransactionsCallback purgeNodesCallback = new DeleteNodesByTransactionsCallback(nodeDAO, fromCommitTime, toCommitTime);
-                purgeCount = txnHelper.doInTransaction(purgeNodesCallback, false, true);
+                Long purgeCount = txnHelper.doInTransaction(purgeNodesCallback, false, true);

-                if (purgeCount.longValue() > 0)
+                if (purgeCount > 0)
                {
                    String msg =
                        "Purged old nodes: \n" +
@@ -220,7 +284,8 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
                break;
            }
        }
-            
+
+        logger.debug("DeletedNodeCleanupWorker: purgeOldDeletedNodes finished ");
        // Done
        return results;
    }
@@ -245,6 +310,10 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
        {
            fromCommitTime = nodeDAO.getMinUnusedTxnCommitTime().longValue();
        }
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("DeletedNodeCleanupWorker: purgeOldEmptyTransactions started ");
+        }
    	// delete unused transactions in batches of size 'purgeTxnBlockSize'
        while (true)
        {
@@ -298,14 +367,46 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
            }

            fromCommitTime += purgeSize;
-            if(fromCommitTime >= maxCommitTime)
+            if (fromCommitTime >= maxCommitTime)
            {
-            	break;
+                break;
            }
        }
+        logger.debug("DeletedNodeCleanupWorker: purgeOldEmptyTransactions finished ");
        // Done
        return results;
    }
+
+
+    private List<String> purgeOldDeletedNodesV2(long minAge)
+    {
+        refreshLock();
+        final List<String> returnList = new ArrayList<>();
+        RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
+
+        RetryingTransactionCallback<Void> callback = () -> {
+            returnList.addAll(nodeDAO.purgeDeletedNodes(minAge, deleteBatchSize));
+            return null;
+        };
+
+        txnHelper.doInTransaction(callback, false, true);
+        return returnList;
+    }
+
+    private List<String> purgeOldEmptyTransactionsV2(long minAge)
+    {
+        refreshLock();
+        final List<String> returnList = new ArrayList<>();
+        RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
+
+        RetryingTransactionCallback<Void> callback = () -> {
+            returnList.addAll(nodeDAO.purgeEmptyTransactions(minAge, deleteBatchSize));
+            return null;
+        };
+        txnHelper.doInTransaction(callback, false, true);
+
+        return returnList;
+    }
    
    private static abstract class DeleteByTransactionsCallback implements RetryingTransactionCallback<Long>
    {
@@ -356,4 +457,5 @@ public class DeletedNodeCleanupWorker extends AbstractNodeCleanupWorker
            return count;
        }       
    }
-}
+
+}
--- a/repository/src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java
+++ b/repository/src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java
@@ -1,33 +1,33 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.tenant;

 import java.sql.SQLException;

-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;

 /**
 * Experimental
@@ -41,7 +41,7 @@ public class TenantBasicDataSource extends BasicDataSource
    {
        // tenant-specific
        this.setUrl(tenantUrl);
-        this.setMaxActive(tenantMaxActive == -1 ? bds.getMaxActive() : tenantMaxActive);
+        this.setMaxTotal(tenantMaxActive == -1 ? bds.getMaxTotal() : tenantMaxActive);
        
        // defaults/overrides - see also 'baseDefaultDataSource' (core-services-context.xml + repository.properties)
        
@@ -54,7 +54,7 @@ public class TenantBasicDataSource extends BasicDataSource
        this.setMaxIdle(bds.getMaxIdle());
        this.setDefaultAutoCommit(bds.getDefaultAutoCommit());
        this.setDefaultTransactionIsolation(bds.getDefaultTransactionIsolation());
-        this.setMaxWait(bds.getMaxWait());
+        this.setMaxWaitMillis(bds.getMaxWaitMillis());
        this.setValidationQuery(bds.getValidationQuery());
        this.setTimeBetweenEvictionRunsMillis(bds.getTimeBetweenEvictionRunsMillis());
        this.setMinEvictableIdleTimeMillis(bds.getMinEvictableIdleTimeMillis());
@@ -62,7 +62,7 @@ public class TenantBasicDataSource extends BasicDataSource
        this.setTestOnBorrow(bds.getTestOnBorrow());
        this.setTestOnReturn(bds.getTestOnReturn());
        this.setTestWhileIdle(bds.getTestWhileIdle());
-        this.setRemoveAbandoned(bds.getRemoveAbandoned());
+        this.setRemoveAbandonedOnBorrow(bds.getRemoveAbandonedOnBorrow());
        this.setRemoveAbandonedTimeout(bds.getRemoveAbandonedTimeout());
        this.setPoolPreparedStatements(bds.isPoolPreparedStatements());
        this.setMaxOpenPreparedStatements(bds.getMaxOpenPreparedStatements());
--- a/repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java
+++ b/repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * 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 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.tenant;

 import java.sql.SQLException;
@@ -32,7 +32,7 @@ import java.util.Map;
 import javax.sql.DataSource;

 import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.springframework.extensions.surf.util.ParameterCheck;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;

--- a/repository/src/main/resources/alfresco/activiti-context.xml
+++ b/repository/src/main/resources/alfresco/activiti-context.xml
@@ -30,7 +30,7 @@
    	<property name="initialSize">
    		<value>0</value>
    	</property>
-    	<property name="maxActive">
+    	<property name="maxTotal">
    		<value>1</value>
    	</property>
    	<property name="maxIdle">
--- a/repository/src/main/resources/alfresco/core-services-context.xml
+++ b/repository/src/main/resources/alfresco/core-services-context.xml
@@ -156,7 +156,7 @@
    <bean id="defaultDataSource" parent="baseDefaultDataSource" />

    <!-- Datasource bean -->
-    <bean id="baseDefaultDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" abstract="true">
+    <bean id="baseDefaultDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" abstract="true">
        <property name="driverClassName">
            <value>${db.driver}</value>
        </property>
@@ -172,7 +172,7 @@
        <property name="initialSize" >
            <value>${db.pool.initial}</value>
        </property>
-        <property name="maxActive" >
+        <property name="maxTotal" >
            <value>${db.pool.max}</value>
        </property>
        <property name="minIdle" >
@@ -187,7 +187,7 @@
        <property name="defaultTransactionIsolation" >
            <value>${db.txn.isolation}</value>
        </property>
-        <property name="maxWait" >
+        <property name="maxWaitMillis" >
            <value>${db.pool.wait.max}</value>
        </property>
        <property name="validationQuery" >
@@ -211,7 +211,7 @@
        <property name="testWhileIdle" >
            <value>${db.pool.evict.validate}</value>
        </property>
-        <property name="removeAbandoned" >
+        <property name="removeAbandonedOnBorrow" >
            <value>${db.pool.abandoned.detect}</value>
        </property>
        <property name="removeAbandonedTimeout" >
--- a/repository/src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml
+++ b/repository/src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml
@@ -203,6 +203,7 @@ Inbound settings from iBatis
        <mapper resource="alfresco/ibatis/#resource.dialect#/content-insert-SqlMap.xml"/>
        <mapper resource="alfresco/ibatis/#resource.dialect#/node-common-SqlMap.xml"/>
        <mapper resource="alfresco/ibatis/#resource.dialect#/node-select-children-SqlMap.xml"/>
+        <mapper resource="alfresco/ibatis/#resource.dialect#/node-select-SqlMap.xml"/>
        <mapper resource="alfresco/ibatis/#resource.dialect#/node-update-SqlMap.xml"/>
        <mapper resource="alfresco/ibatis/#resource.dialect#/node-delete-SqlMap.xml"/>
        <mapper resource="alfresco/ibatis/#resource.dialect#/node-insert-SqlMap.xml"/>
--- 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
@@ -1505,5 +1505,32 @@
        where 
            commit_time_ms > #{minCommitTime} 
    </select>
+
+    <delete id="delete_NodesById" parameterType="list">
+        delete from alf_node
+        where
+        id IN
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <delete id="delete_NodePropsByNodeId" parameterType="list">
+        delete from alf_node_properties
+        where
+        node_id IN
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <delete id="delete_Txns_UnusedById" parameterType="list">
+        delete from alf_transaction
+        where
+        id in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
        
 </mapper>
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
@@ -36,5 +36,5 @@
        )
        ]]>
    </delete>
-    
+
 </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
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="alfresco.node.select">
+
+    <select id="select_Deleted_NodesByTxnCommitTime" parameterType="TransactionQuery" fetchSize="100000" resultType="java.lang.Long">
+        select
+            node.id
+        from
+            alf_node node
+                join alf_transaction txn on (node.transaction_id = txn.id)
+        where
+            node.type_qname_id = #{typeQNameId}
+        <![CDATA[and commit_time_ms < #{maxCommitTime}]]>
+    </select>
+
+    <select id="select_Txns_UnusedByTxnCommitTime" parameterType="TransactionQuery" fetchSize="100000" resultType="java.lang.Long">
+        select
+            id
+        from alf_transaction
+        where not exists
+            (
+           select 1
+           from
+               alf_node node
+           where
+               node.transaction_id = alf_transaction.id
+            )
+      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
+    </select>
+
+</mapper>
--- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
+++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
@@ -27,5 +27,5 @@
             txn.commit_time_ms < #{maxCommitTime})
        ]]>
    </delete>
-    
+
 </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
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="alfresco.node.select">
+
+    <select id="select_Deleted_NodesByTxnCommitTime" parameterType="TransactionQuery" fetchSize="-2147483648" resultType="java.lang.Long">
+        select
+            node.id
+        from
+            alf_node node
+                join alf_transaction txn on (node.transaction_id = txn.id)
+        where
+            node.type_qname_id = #{typeQNameId}
+        <![CDATA[and commit_time_ms < #{maxCommitTime}]]>
+    </select>
+
+    <select id="select_Txns_UnusedByTxnCommitTime" parameterType="TransactionQuery" fetchSize="-2147483648" resultType="java.lang.Long">
+        select
+            id
+        from alf_transaction
+        where not exists
+            (
+           select 1
+           from
+               alf_node node
+           where
+               node.transaction_id = alf_transaction.id
+            )
+      <![CDATA[and commit_time_ms <= #{maxCommitTime}]]>
+    </select>
+
+</mapper>
--- a/repository/src/main/resources/alfresco/node-services-context.xml
+++ b/repository/src/main/resources/alfresco/node-services-context.xml
@@ -238,8 +238,14 @@
      <property name="purgeSize">
         <value>${index.tracking.purgeSize}</value>
      </property>
+      <property name="algorithm">
+         <value>${system.node_table_cleaner.algorithm}</value>
+      </property>
+      <property name="deleteBatchSize">
+         <value>${system.node_cleanup.delete_batchSize}</value>
+      </property>
   </bean>
-   
+
   <!-- String length adjustment -->
   <bean id="nodeStringLengthWorker" class="org.alfresco.repo.node.db.NodeStringLengthWorker">
      <constructor-arg index="0" ref="nodeDAO" />
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository

 # Schema number
-version.schema=16000
+version.schema=17000

 # Directory configuration

@@ -1246,6 +1246,11 @@ system.delete_not_exists.read_only=false
 system.delete_not_exists.timeout_seconds=-1
 system.prop_table_cleaner.algorithm=V2

+# --Node cleanup batch - default settings
+system.node_cleanup.delete_batchSize=1000
+system.node_table_cleaner.algorithm=V1
+
+
 # Configure the system-wide (ACS) settings for direct access urls.
 #
 # For Direct Access URLs to be usable on the service-layer, the feature must be enabled both system-wide and on the
--- a/repository/src/test/java/org/alfresco/AllDBTestsTestSuite.java
+++ b/repository/src/test/java/org/alfresco/AllDBTestsTestSuite.java
@@ -87,7 +87,8 @@ import org.junit.runners.Suite;
    org.alfresco.repo.node.cleanup.TransactionCleanupTest.class,
    org.alfresco.repo.security.person.GetPeopleCannedQueryTest.class,

-    org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutorTest.class
+    org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutorTest.class,
+    org.alfresco.repo.node.cleanup.DeletedNodeBatchCleanupTest.class
 })
 public class AllDBTestsTestSuite
 {
--- a/repository/src/test/java/org/alfresco/AppContext03TestSuite.java
+++ b/repository/src/test/java/org/alfresco/AppContext03TestSuite.java
@@ -84,6 +84,7 @@ import org.junit.runners.Suite;
    org.alfresco.repo.node.archive.ArchiveAndRestoreTest.class,
    org.alfresco.repo.node.db.DbNodeServiceImplTest.class,
    org.alfresco.repo.node.cleanup.TransactionCleanupTest.class,
+    org.alfresco.repo.node.cleanup.DeletedNodeBatchCleanupTest.class,
    org.alfresco.repo.node.db.DbNodeServiceImplPropagationTest.class,
 })
 public class AppContext03TestSuite
--- a/repository/src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java
+++ b/repository/src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java
@@ -57,7 +57,7 @@ import org.alfresco.service.cmr.workflow.WorkflowAdminService;
 import org.alfresco.service.descriptor.Descriptor;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.traitextender.SpringExtensionBundle;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Before;
 import org.junit.Test;

--- a/repository/src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java
+++ b/repository/src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java
@@ -32,7 +32,7 @@ import org.alfresco.heartbeat.jobs.HeartBeatJobScheduler;
 import org.alfresco.repo.descriptor.DescriptorDAO;
 import org.alfresco.service.cmr.repository.HBDataCollectorService;
 import org.alfresco.service.descriptor.Descriptor;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Before;
 import org.junit.Test;

--- a/repository/src/test/java/org/alfresco/repo/node/cleanup/DeletedNodeBatchCleanupTest.java
+++ b/repository/src/test/java/org/alfresco/repo/node/cleanup/DeletedNodeBatchCleanupTest.java
@@ -0,0 +1,366 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.node.cleanup;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Stream.of;
+
+import javax.transaction.UserTransaction;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.domain.node.NodeDAO;
+import org.alfresco.repo.domain.node.Transaction;
+import org.alfresco.repo.domain.node.ibatis.NodeDAOImpl;
+import org.alfresco.repo.node.db.DeletedNodeCleanupWorker;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+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.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.BaseSpringTest;
+import org.alfresco.util.testing.category.DBTests;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.extensions.webscripts.GUID;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+
+@Category({ OwnJVMTestsCategory.class, DBTests.class })
+@DirtiesContext(classMode = ClassMode.BEFORE_EACH_TEST_METHOD)
+public class DeletedNodeBatchCleanupTest extends BaseSpringTest
+{
+
+    @Autowired
+    private AuthenticationService authenticationService;
+    @Autowired
+    private NodeDAO nodeDAO;
+    @Autowired
+    @Qualifier("node.nodesSharedCache")
+    private SimpleCache<Serializable, Serializable> nodesCache;
+    @Autowired
+    private DeletedNodeCleanupWorker worker;
+    @Autowired
+    private NamespaceService namespaceService;
+    @Autowired
+    private TransactionService transactionService;
+    @Autowired
+    private NodeService nodeService;
+    @Autowired
+    private SearchService searchService;
+    private RetryingTransactionHelper helper;
+    private List<NodeRef> testNodes;
+
+    @Before
+    public void before()
+    {
+        helper = transactionService.getRetryingTransactionHelper();
+        authenticationService.authenticate("admin", "admin".toCharArray());
+
+        resetWorkerConfig();
+
+        // create 5 test nodes
+        final NodeRef companyHome = getCompanyHome();
+        testNodes = IntStream.range(0, 5)
+            .mapToObj(i -> helper.doInTransaction(createNodeCallback(companyHome), false, true))
+            .collect(toList());
+
+        // clean up pre-existing data
+        helper.doInTransaction(() -> worker.doClean(), false, true);
+    }
+
+    private void resetWorkerConfig()
+    {
+        worker.setMinPurgeAgeDays(0);
+        worker.setAlgorithm("V2");
+        worker.setDeleteBatchSize(20);
+    }
+
+    private NodeRef getCompanyHome()
+    {
+        StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+        NodeRef storeRoot = nodeService.getRootNode(storeRef);
+        List<NodeRef> nodeRefs = searchService.selectNodes(storeRoot, "/app:company_home", null, namespaceService,
+            false);
+
+        return nodeRefs.get(0);
+    }
+
+    private RetryingTransactionCallback<NodeRef> createNodeCallback(NodeRef companyHome)
+    {
+        return () -> nodeService.createNode(
+            companyHome, ContentModel.ASSOC_CONTAINS, QName.createQName("test", GUID.generate()),
+            ContentModel.TYPE_CONTENT).getChildRef();
+    }
+
+    private void deleteNodes(NodeRef nodeRef, NodeRef... additionalNodeRefs)
+    {
+        Stream.concat(of(nodeRef), of(additionalNodeRefs))
+            .forEach(this::deleteNode);
+    }
+
+    private void deleteNode(NodeRef nodeRef)
+    {
+        helper.doInTransaction(new DeleteNode(nodeRef), false, true);
+    }
+
+    @Test
+    public void testPurgeNodesDeleted()
+    {
+        final NodeRef nodeRef4 = getNode(4);
+        final NodeRef nodeRef5 = getNode(5);
+
+        // delete nodes 4 and 5
+        deleteNodes(nodeRef4, nodeRef5);
+
+        // double-check that node 4 and 5 are present in deleted form
+        nodesCache.clear();
+        assertTrue("Node 4 is deleted but not purged", nodeDAO.getNodeRefStatus(nodeRef4).isDeleted());
+        assertTrue("Node 5 is deleted but not purged", nodeDAO.getNodeRefStatus(nodeRef5).isDeleted());
+
+        worker.doClean();
+
+        // verify that node 4 and 5 were purged
+        nodesCache.clear();
+        assertNull("Node 4 was not cleaned up", nodeDAO.getNodeRefStatus(nodeRef4));
+        assertNull("Node 5 was not cleaned up", nodeDAO.getNodeRefStatus(nodeRef5));
+    }
+
+    @Test
+    public void testNodesDeletedNotPurgedWhenNotAfterPurgeAge()
+    {
+        final NodeRef nodeRef1 = getNode(1);
+        final NodeRef nodeRef2 = getNode(2);
+
+        // delete nodes 1 and 2
+        deleteNodes(nodeRef1, nodeRef2);
+
+        // double-check that node 1 and 2 are present in deleted form
+        nodesCache.clear();
+        assertTrue("Node 1 is deleted but not purged", nodeDAO.getNodeRefStatus(nodeRef1).isDeleted());
+        assertTrue("Node 2 is deleted but not purged", nodeDAO.getNodeRefStatus(nodeRef2).isDeleted());
+
+        // run the worker
+        worker.setMinPurgeAgeDays(1);
+        worker.doClean();
+
+        // verify that node 1 and 2 were not purged
+        nodesCache.clear();
+        assertNotNull("Node 1 was cleaned up", nodeDAO.getNodeRefStatus(nodeRef1));
+        assertNotNull("Node 2 was cleaned up", nodeDAO.getNodeRefStatus(nodeRef2));
+    }
+
+    @Test
+    public void testPurgeUnusedTransactions() throws Exception
+    {
+        // Execute transactions that update a number of nodes. For nodeRef1, all but the last txn will be unused.
+        final long start = System.currentTimeMillis();
+        final Long minTxnId = nodeDAO.getMinTxnId();
+
+        final Map<NodeRef, List<String>> txnIds = createTransactions();
+        final List<String> txnIds1 = txnIds.get(getNode(1));
+        final List<String> txnIds2 = txnIds.get(getNode(2));
+        final List<String> txnIds3 = txnIds.get(getNode(3));
+
+        // Double-check that n4 and n5 are present in deleted form
+        nodesCache.clear();
+        UserTransaction txn = transactionService.getUserTransaction(true);
+        txn.begin();
+        try
+        {
+            assertTrue("Node 4 is deleted but not purged", nodeDAO.getNodeRefStatus(getNode(4)).isDeleted());
+            assertTrue("Node 5 is deleted but not purged", nodeDAO.getNodeRefStatus(getNode(5)).isDeleted());
+        }
+        finally
+        {
+            txn.rollback();
+        }
+
+        // run the transaction cleaner
+        worker.doClean();
+
+        // Get transactions committed after the test started
+        RetryingTransactionHelper.RetryingTransactionCallback<List<Transaction>> getTxnsCallback = () -> ((NodeDAOImpl) nodeDAO).selectTxns(
+            start, Long.MAX_VALUE, Integer.MAX_VALUE, null, null, true);
+        List<Transaction> txns = transactionService.getRetryingTransactionHelper()
+            .doInTransaction(getTxnsCallback, true, false);
+
+        List<String> expectedUnusedTxnIds = new ArrayList<>(10);
+        expectedUnusedTxnIds.addAll(txnIds1.subList(0, txnIds1.size() - 1));
+
+        List<String> expectedUsedTxnIds = new ArrayList<>(5);
+        expectedUsedTxnIds.add(txnIds1.get(txnIds1.size() - 1));
+        expectedUsedTxnIds.addAll(txnIds2);
+        expectedUsedTxnIds.addAll(txnIds3);
+        // 4 and 5 should not be in the list because they are deletes
+
+        // check that the correct transactions have been purged i.e. all except the last one to update the node
+        // i.e. in this case, all but the last one in txnIds1
+        List<String> unusedTxnsNotPurged = expectedUnusedTxnIds.stream()
+            .filter(txnId -> containsTransaction(txns, txnId))
+            .collect(toList());
+        if (!unusedTxnsNotPurged.isEmpty())
+        {
+            fail("Unused transaction(s) were not purged: " + unusedTxnsNotPurged);
+        }
+
+        long numFoundUnusedTxnIds = expectedUnusedTxnIds.stream()
+            .filter(txnId -> !containsTransaction(txns, txnId))
+            .count();
+        assertEquals(9, numFoundUnusedTxnIds);
+
+        // check that the correct transactions remain i.e. all those in txnIds2, txnIds3, txnIds4 and txnIds5
+        long numFoundUsedTxnIds = expectedUsedTxnIds.stream()
+            .filter(txnId -> containsTransaction(txns, txnId))
+            .count();
+        assertEquals(3, numFoundUsedTxnIds);
+
+        // Get transactions committed after the test started
+        RetryingTransactionHelper.RetryingTransactionCallback<List<Long>> getTxnsUnusedCallback = () -> nodeDAO.getTxnsUnused(
+            minTxnId, Long.MAX_VALUE, Integer.MAX_VALUE);
+        List<Long> txnsUnused = transactionService.getRetryingTransactionHelper()
+            .doInTransaction(getTxnsUnusedCallback, true, false);
+        assertEquals(0, txnsUnused.size());
+
+        // Double-check that n4 and n5 were removed as well
+        nodesCache.clear();
+        assertNull("Node 4 was not cleaned up", nodeDAO.getNodeRefStatus(getNode(4)));
+        assertNull("Node 5 was not cleaned up", nodeDAO.getNodeRefStatus(getNode(5)));
+    }
+
+    private boolean containsTransaction(List<Transaction> txns, String txnId)
+    {
+        return txns.stream()
+            .map(Transaction::getChangeTxnId)
+            .filter(changeTxnId -> changeTxnId.equals(txnId))
+            .map(match -> true)
+            .findFirst()
+            .orElse(false);
+    }
+
+    private Map<NodeRef, List<String>> createTransactions()
+    {
+        Map<NodeRef, List<String>> txnIds = new HashMap<>();
+
+        UpdateNode updateNode1 = new UpdateNode(getNode(1));
+        UpdateNode updateNode2 = new UpdateNode(getNode(2));
+        UpdateNode updateNode3 = new UpdateNode(getNode(3));
+        DeleteNode deleteNode4 = new DeleteNode(getNode(4));
+        DeleteNode deleteNode5 = new DeleteNode(getNode(5));
+
+        List<String> txnIds1 = new ArrayList<>();
+        List<String> txnIds2 = new ArrayList<>();
+        List<String> txnIds3 = new ArrayList<>();
+        List<String> txnIds4 = new ArrayList<>();
+        List<String> txnIds5 = new ArrayList<>();
+        txnIds.put(getNode(1), txnIds1);
+        txnIds.put(getNode(2), txnIds2);
+        txnIds.put(getNode(3), txnIds3);
+        txnIds.put(getNode(4), txnIds4);
+        txnIds.put(getNode(5), txnIds5);
+
+        for (int i = 0; i < 10; i++)
+        {
+            String txnId1 = helper.doInTransaction(updateNode1, false, true);
+            txnIds1.add(txnId1);
+            if (i == 0)
+            {
+                String txnId2 = helper.doInTransaction(updateNode2, false, true);
+                txnIds2.add(txnId2);
+            }
+            if (i == 1)
+            {
+                String txnId3 = helper.doInTransaction(updateNode3, false, true);
+                txnIds3.add(txnId3);
+            }
+        }
+        String txnId4 = helper.doInTransaction(deleteNode4, false, true);
+        txnIds4.add(txnId4);
+        String txnId5 = helper.doInTransaction(deleteNode5, false, true);
+        txnIds5.add(txnId5);
+
+        return txnIds;
+    }
+
+    private class UpdateNode implements RetryingTransactionHelper.RetryingTransactionCallback<String>
+    {
+        private final NodeRef nodeRef;
+
+        UpdateNode(NodeRef nodeRef)
+        {
+            this.nodeRef = nodeRef;
+        }
+
+        @Override
+        public String execute() throws Throwable
+        {
+            nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, GUID.generate());
+            return AlfrescoTransactionSupport.getTransactionId();
+        }
+    }
+
+    private class DeleteNode implements RetryingTransactionHelper.RetryingTransactionCallback<String>
+    {
+        private final NodeRef nodeRef;
+
+        DeleteNode(NodeRef nodeRef)
+        {
+            this.nodeRef = nodeRef;
+        }
+
+        @Override
+        public String execute() throws Throwable
+        {
+            nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
+            nodeService.deleteNode(nodeRef);
+            return AlfrescoTransactionSupport.getTransactionId();
+        }
+    }
+
+    private NodeRef getNode(int i)
+    {
+        return testNodes.get(i - 1);
+    }
+
+}
--- a/repository/src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
+++ b/repository/src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
@@ -110,6 +110,8 @@ public class TransactionCleanupTest
 		this.nodesCache = (SimpleCache<Serializable, Serializable>) ctx.getBean("node.nodesSharedCache");
        this.worker = (DeletedNodeCleanupWorker)ctx.getBean("nodeCleanup.deletedNodeCleanup");
        this.worker.setMinPurgeAgeDays(0);
+        this.worker.setAlgorithm("V1");
+

    	this.helper = transactionService.getRetryingTransactionHelper();
        authenticationService.authenticate("admin", "admin".toCharArray());
--- a/repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml
+++ b/repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml
@@ -37,7 +37,7 @@
    </bean>
    
    <!--  dummy -->
-    <bean id="defaultDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <bean id="defaultDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
    </bean> 
    
    <bean id="dataSource" class="org.alfresco.config.JndiObjectFactoryBean">
--- a/repository/src/test/resources/test-database-context.xml
+++ b/repository/src/test/resources/test-database-context.xml
@@ -1,80 +1,80 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<beans>
-
-   <import resource="classpath:alfresco/extension/dev-context.xml" />
-
-   <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
-      destroy-method="close">
-      <property name="driverClassName">
-         <value>${db.driver}</value>
-      </property>
-      <property name="url">
-         <value>${db.url}</value>
-      </property>
-      <property name="username">
-         <value>${db.username}</value>
-      </property>
-      <property name="password">
-         <value>${db.password}</value>
-      </property>
-      <property name="initialSize">
-         <value>${db.pool.initial}</value>
-      </property>
-      <property name="maxActive">
-         <value>${db.pool.max}</value>
-      </property>
-      <property name="minIdle">
-         <value>${db.pool.min}</value>
-      </property>
-      <property name="maxIdle">
-         <value>${db.pool.idle}</value>
-      </property>
-      <property name="defaultAutoCommit">
-         <value>false</value>
-      </property>
-      <property name="defaultTransactionIsolation">
-         <value>${db.txn.isolation}</value>
-      </property>
-      <property name="maxWait">
-         <value>${db.pool.wait.max}</value>
-      </property>
-      <property name="validationQuery">
-         <value>${db.pool.validate.query}</value>
-      </property>
-      <property name="timeBetweenEvictionRunsMillis">
-         <value>${db.pool.evict.interval}</value>
-      </property>
-      <property name="minEvictableIdleTimeMillis">
-         <value>${db.pool.evict.idle.min}</value>
-      </property>
-      <property name="testOnBorrow">
-         <value>${db.pool.validate.borrow}</value>
-      </property>
-      <property name="testOnReturn">
-         <value>${db.pool.validate.return}</value>
-      </property>
-      <property name="testWhileIdle">
-         <value>${db.pool.evict.validate}</value>
-      </property>
-      <property name="removeAbandoned">
-         <value>${db.pool.abandoned.detect}</value>
-      </property>
-      <property name="removeAbandonedTimeout">
-         <value>${db.pool.abandoned.time}</value>
-      </property>
-      <property name="poolPreparedStatements">
-         <value>${db.pool.statements.enable}</value>
-      </property>
-      <property name="maxOpenPreparedStatements">
-         <value>${db.pool.statements.max}</value>
-      </property>
-   </bean>
-
-   <bean id="transactionManager"
-      class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-      <property name="transactionSynchronizationName" value="SYNCHRONIZATION_ALWAYS" />
-      <property name="dataSource" ref="dataSource" />
-   </bean>
-    
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<beans>
+
+   <import resource="classpath:alfresco/extension/dev-context.xml" />
+
+   <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"
+      destroy-method="close">
+      <property name="driverClassName">
+         <value>${db.driver}</value>
+      </property>
+      <property name="url">
+         <value>${db.url}</value>
+      </property>
+      <property name="username">
+         <value>${db.username}</value>
+      </property>
+      <property name="password">
+         <value>${db.password}</value>
+      </property>
+      <property name="initialSize">
+         <value>${db.pool.initial}</value>
+      </property>
+      <property name="maxTotal">
+         <value>${db.pool.max}</value>
+      </property>
+      <property name="minIdle">
+         <value>${db.pool.min}</value>
+      </property>
+      <property name="maxIdle">
+         <value>${db.pool.idle}</value>
+      </property>
+      <property name="defaultAutoCommit">
+         <value>false</value>
+      </property>
+      <property name="defaultTransactionIsolation">
+         <value>${db.txn.isolation}</value>
+      </property>
+      <property name="maxWaitMillis">
+         <value>${db.pool.wait.max}</value>
+      </property>
+      <property name="validationQuery">
+         <value>${db.pool.validate.query}</value>
+      </property>
+      <property name="timeBetweenEvictionRunsMillis">
+         <value>${db.pool.evict.interval}</value>
+      </property>
+      <property name="minEvictableIdleTimeMillis">
+         <value>${db.pool.evict.idle.min}</value>
+      </property>
+      <property name="testOnBorrow">
+         <value>${db.pool.validate.borrow}</value>
+      </property>
+      <property name="testOnReturn">
+         <value>${db.pool.validate.return}</value>
+      </property>
+      <property name="testWhileIdle">
+         <value>${db.pool.evict.validate}</value>
+      </property>
+      <property name="removeAbandonedOnBorrow">
+         <value>${db.pool.abandoned.detect}</value>
+      </property>
+      <property name="removeAbandonedTimeout">
+         <value>${db.pool.abandoned.time}</value>
+      </property>
+      <property name="poolPreparedStatements">
+         <value>${db.pool.statements.enable}</value>
+      </property>
+      <property name="maxOpenPreparedStatements">
+         <value>${db.pool.statements.max}</value>
+      </property>
+   </bean>
+
+   <bean id="transactionManager"
+      class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+      <property name="transactionSynchronizationName" value="SYNCHRONIZATION_ALWAYS" />
+      <property name="dataSource" ref="dataSource" />
+   </bean>
+    
 </beans>
--- a/repository/src/test/resources/test/alfresco/test-database-context.xml
+++ b/repository/src/test/resources/test/alfresco/test-database-context.xml
@@ -6,7 +6,7 @@
   <import resource="classpath:test/alfresco/test-context.xml" />

   <!-- Datasource bean -->
-   <bean id="testDataSource" class="org.apache.commons.dbcp.BasicDataSource"
+   <bean id="testDataSource" class="org.apache.commons.dbcp2.BasicDataSource"
      destroy-method="close">
      <property name="driverClassName">
         <value>${db.driver}</value>
@@ -23,7 +23,7 @@
      <property name="initialSize">
         <value>${db.pool.initial}</value>
      </property>
-      <property name="maxActive">
+      <property name="maxTotal">
         <value>${db.pool.max}</value>
      </property>
      <property name="minIdle">
@@ -38,7 +38,7 @@
      <property name="defaultTransactionIsolation">
         <value>${db.txn.isolation}</value>
      </property>
-      <property name="maxWait">
+      <property name="maxWaitMillis">
         <value>${db.pool.wait.max}</value>
      </property>
      <property name="validationQuery">
@@ -59,7 +59,7 @@
      <property name="testWhileIdle">
         <value>${db.pool.evict.validate}</value>
      </property>
-      <property name="removeAbandoned">
+      <property name="removeAbandonedOnBorrow">
         <value>${db.pool.abandoned.detect}</value>
      </property>
      <property name="removeAbandonedTimeout">
Author	SHA1	Message	Date
Travis CI User	9a2211e197	[maven-release-plugin][skip ci] prepare release 23.1.0.1-TEST2	2022-05-09 18:21:31 +00:00
alandavis	8e8c773dcc	Manually set AGS test version.properties to latest	2022-05-09 17:52:20 +01:00
alandavis	284293b709	Revert "ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value" This reverts commit `4a4bb2de02`. [skip ci]	2022-05-09 17:51:58 +01:00
alandavis	7a47e703c2	Test build 23.1.0.1-TEST2-SNAPSHOT	2022-05-09 16:44:10 +01:00
alandavis	20295a83bf	Update Master branch to 23.1.0	2022-05-09 16:39:05 +01:00
alandavis	4a4bb2de02	ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value [skip ci]	2022-05-09 16:17:10 +01:00
alandavis	e9ec8acc8f	Revert "Update Master branch to 23.1.0" This reverts commit `cbe29d0a6b`.	2022-05-09 15:34:37 +01:00
alandavis	c0354f8219	Revert "Test build" This reverts commit `71ba844a7e`.	2022-05-09 15:34:37 +01:00
alandavis	023c086811	Revert "Build master-test" This reverts commit `724befdd65`.	2022-05-09 15:34:37 +01:00
alandavis	724befdd65	Build master-test	2022-05-07 09:07:50 +01:00
alandavis	71ba844a7e	Test build	2022-05-07 09:03:43 +01:00
alandavis	cbe29d0a6b	Update Master branch to 23.1.0	2022-05-06 17:29:55 +01:00
alandavis	64efb3332a	Revert "Update Master branch to 23.1.0" This reverts commit `8469b2bb47`.	2022-05-06 17:19:28 +01:00
alandavis	8469b2bb47	Update Master branch to 23.1.0	2022-05-06 17:14:30 +01:00
alandavis	e4974eada0	Revert "Update Master branch to 7.3.0" This reverts commit `1a1e5e01d3`.	2022-05-06 17:12:32 +01:00
alandavis	1a1e5e01d3	Update Master branch to 7.3.0	2022-05-05 17:48:42 +01:00
alandavis	363df9c65d	Revert "Update Master branch to 7.3.0" This reverts commit `49b1d87a4f`.	2022-04-25 15:45:58 +01:00
alandavis	e8b9ade6a1	Revert "Update Master branch to 7.3.0" This reverts commit `ab61e552a5`.	2022-04-25 15:45:58 +01:00
alandavis	ba74b372f9	Revert "Update Master branch to 7.3.0" This reverts commit `e3806ba342`.	2022-04-25 15:45:57 +01:00
alandavis	26586ce473	Revert "Update Master branch to 7.3.0" This reverts commit `b5da6ec1e7`.	2022-04-25 15:45:57 +01:00
alandavis	768cd4d54e	Revert "Update Master branch to 7.3.0" This reverts commit `23409e5370`.	2022-04-25 15:45:57 +01:00
alandavis	23409e5370	Update Master branch to 7.3.0	2022-04-21 18:11:43 +01:00
alandavis	b5da6ec1e7	Update Master branch to 7.3.0	2022-04-21 17:57:10 +01:00
alandavis	e3806ba342	Update Master branch to 7.3.0	2022-04-21 14:36:49 +01:00
alandavis	ab61e552a5	Update Master branch to 7.3.0	2022-04-21 13:45:23 +01:00
alandavis	177a76010a	Update Master branch to 7.3.0	2022-04-20 22:04:57 +01:00
alandavis	d77d4ec7e5	Update Master branch to 7.3.0	2022-04-20 21:33:37 +01:00
alandavis	49b1d87a4f	Update Master branch to 7.3.0	2022-04-20 21:32:02 +01:00
alandavis	859fd2bccf	Revert "Update Master branch to 7.3.0" This reverts commit `d81b0e9d85`.	2022-04-20 21:26:20 +01:00
alandavis	7af773e9b8	Revert "Update Master branch to 7.3.0" This reverts commit `c344eec878`.	2022-04-20 21:26:20 +01:00
alandavis	c344eec878	Update Master branch to 7.3.0	2022-04-20 21:23:18 +01:00
alandavis	d81b0e9d85	Update Master branch to 7.3.0	2022-04-20 19:05:21 +01:00
alandavis	dc8f4bdb99	ACS-2864 Script the creation of new repo, share and packaging branches after a release Create a test 'master' branch just after the release of 7.2.0 [skip ci]	2022-04-14 12:58:32 +01:00
Travis CI User	5ecd4c2593	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-16 19:34:33 +00:00
Travis CI User	b4a2e2d8cf	[maven-release-plugin][skip ci] prepare release 14.145	2022-03-16 19:34:30 +00:00
alandavis	bdf4fd7e16	Build again with replacement alfresco.aos-module 1.4.1	2022-03-16 18:48:07 +00:00
Travis CI User	e3b3e4b099	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-16 10:07:00 +00:00
Travis CI User	895ab9dbbf	[maven-release-plugin][skip ci] prepare release 14.144	2022-03-16 10:06:57 +00:00
dependabot[bot]	85054a7649	Bump license-maven-plugin from 2.0.1.alfresco-1 to 2.0.1.alfresco-2 (#1021 ) Bumps [license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 2.0.1.alfresco-1 to 2.0.1.alfresco-2. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/commits) --- updated-dependencies: - dependency-name: org.codehaus.mojo:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-03-16 09:21:46 +00:00
Travis CI User	c60a182b89	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-15 16:43:19 +00:00
Travis CI User	94ba463db8	[maven-release-plugin][skip ci] prepare release 14.143	2022-03-15 16:43:16 +00:00
Domenico Sibilio	cf67b6791a	ACS-2307 Update IE/SS to 2.0.3	2022-03-15 16:25:31 +01:00
Travis CI User	506441a7ec	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-14 14:21:41 +00:00
Travis CI User	9b01a3fa1f	[maven-release-plugin][skip ci] prepare release 14.142	2022-03-14 14:21:37 +00:00
Piotr Żurek	3dc00da2a5	ACS-2658 Fix missing metadata extraction while uploading new version (#1016 )	2022-03-14 14:37:47 +01:00
Travis CI User	c20bdd754f	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-13 11:52:06 +00:00
Travis CI User	d3a52be71a	[maven-release-plugin][skip ci] prepare release 14.141	2022-03-13 11:52:04 +00:00
Domenico Sibilio	07c3ca5bab	ACS-2307 Update IE/SS to 2.0.3-RC5	2022-03-13 12:08:48 +01:00
Travis CI User	e593a17e88	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-12 18:10:01 +00:00
Travis CI User	1975729174	[maven-release-plugin][skip ci] prepare release 14.140	2022-03-12 18:09:58 +00:00
Andrea Ligios	1491a9a7dd	ACS-2664 - Bump Alfresco Messaging Repo to 1.2.19	2022-03-12 18:19:54 +01:00
Andrea Ligios	3923560588	ACS-2664 - Bump Alfresco Messaging Repo to 1.2.18	2022-03-12 16:59:29 +01:00
Andrea Ligios	af1aa6528b	Bumped alfresco-messaging-repo to 1.2.17 To cope with the `camel-spring-xml` split from `camel-spring` in Camel 3.9	2022-03-11 18:01:49 +01:00
Nithin Nambiar	8cf9cd3ed5	ACS-1601 Node cleanup job improvements for Postgres	2022-03-11 17:58:22 +01:00
Travis CI User	b2dd06eef8	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-11 11:36:52 +00:00
Travis CI User	8d46151e41	[maven-release-plugin][skip ci] prepare release 14.139	2022-03-11 11:36:49 +00:00
alandavis	3d5166b5d2	ACS-2669 Upgrade to t-core 2.5.7	2022-03-11 10:19:52 +00:00
Travis CI User	847af44db0	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-10 14:34:55 +00:00
Travis CI User	66cd9d4194	[maven-release-plugin][skip ci] prepare release 14.138	2022-03-10 14:34:52 +00:00
Domenico Sibilio	a26eeef847	ACS-2307 Update SS/IE to 2.0.3-RC4	2022-03-10 14:43:20 +01:00
Travis CI User	7ba414eff9	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-10 12:44:42 +00:00
Travis CI User	55abd66da6	[maven-release-plugin][skip ci] prepare release 14.137	2022-03-10 12:44:39 +00:00
Piotr Żurek	6ed43a9a87	ACS-2318 Upgrade tomcat base docker images (#1012 )	2022-03-10 12:54:32 +01:00
Travis CI User	e657c2a1f7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-09 09:48:16 +00:00
Travis CI User	31aa55366f	[maven-release-plugin][skip ci] prepare release 14.136	2022-03-09 09:48:13 +00:00
alandavis	c7f1f808a1	Upgrade to t-core 2.5.7-A11	2022-03-09 08:57:51 +00:00
Travis CI User	40b537b589	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-08 18:58:18 +00:00
Travis CI User	902b569b41	[maven-release-plugin][skip ci] prepare release 14.135	2022-03-08 18:58:15 +00:00
Sara	5c3bf1772a	Bump dependency tas-restapi from 1.78 to 1.79 (#1009 )	2022-03-08 18:06:25 +00:00
Travis CI User	7ffea85c17	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-08 17:52:57 +00:00
Travis CI User	4ea51d7229	[maven-release-plugin][skip ci] prepare release 14.134	2022-03-08 17:52:54 +00:00
Piotr Żurek	5f5f6a1577	ACS-2318 Upgrade base docker images (#1007 )	2022-03-08 17:17:46 +01:00
Travis CI User	74f27b68c2	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-08 13:50:22 +00:00
Travis CI User	592dabfbd0	[maven-release-plugin][skip ci] prepare release 14.133	2022-03-08 13:50:19 +00:00
George Evangelopoulos	275a19b634	ACS-2614 Upgraded REST-API-explorer to 7.2.0 (#1008 )	2022-03-08 12:58:47 +00:00
Travis CI User	ee95350a7a	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-07 23:41:00 +00:00
Travis CI User	6d78c0eafc	[maven-release-plugin][skip ci] prepare release 14.132	2022-03-07 23:40:56 +00:00
alandavis	ba8ad595cc	Upgrade to t-core 2.5.7-A10	2022-03-07 22:19:08 +00:00
alandavis	cd49f188ea	ACS-2641 truncate Direct Access URLs in TransformerDebug [skip ci]	2022-03-07 18:30:22 +00:00
Travis CI User	5bcff826d2	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-06 22:12:27 +00:00
Travis CI User	d62cc18604	[maven-release-plugin][skip ci] prepare release 14.131	2022-03-06 22:12:24 +00:00
Jamal Kaabi-Mofrad	e23d356da7	ACS-2307: Updated Solr.	2022-03-06 21:22:48 +00:00
Travis CI User	4ac828acca	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-06 13:35:59 +00:00
Travis CI User	0cad7c4c89	[maven-release-plugin][skip ci] prepare release 14.130	2022-03-06 13:35:56 +00:00
alandavis	d6bb44343c	Upgrade to t-core 2.5.7-A9	2022-03-06 12:46:48 +00:00
Travis CI User	4b46fd6e10	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-04 15:39:25 +00:00
Travis CI User	3cc3fb081f	[maven-release-plugin][skip ci] prepare release 14.129	2022-03-04 15:39:22 +00:00
Piotr Żurek	82add3f32f	ACS-2631 Upgrade AOS module (#1001 )	2022-03-04 15:49:16 +01:00
Travis CI User	76b0d5ee5a	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-04 09:08:06 +00:00
Travis CI User	3b36d26609	[maven-release-plugin][skip ci] prepare release 14.128	2022-03-04 09:08:03 +00:00
Aleksandra Onych	76ce1db950	Feature/acs 2562 disallow secure comms none (#994 ) ACS-2562 Disallow SecureComms=none Co-authored-by: Domenico Sibilio <domenicosibilio@gmail.com> Co-authored-by: Stefan Kopf <stefan.kopf@alfresco.com>	2022-03-04 09:18:36 +01:00
Travis CI User	cd11c54422	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-03 20:28:40 +00:00
Travis CI User	bd4bdab0ff	[maven-release-plugin][skip ci] prepare release 14.127	2022-03-03 20:28:37 +00:00
alandavis	9ad7175237	Upgrade to t-core 2.5.7-A6	2022-03-03 19:39:05 +00:00
Travis CI User	15b5bf93af	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-03 18:07:42 +00:00
Travis CI User	bb6d3b0716	[maven-release-plugin][skip ci] prepare release 14.126	2022-03-03 18:07:39 +00:00
Piotr Żurek	ac68fbdf09	ACS-2627 Upgrade base docker images (#1000 ) [skip ci]	2022-03-03 17:28:11 +01:00
Travis CI User	3dae151864	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-03 14:52:33 +00:00
Travis CI User	ae4d0f695e	[maven-release-plugin][skip ci] prepare release 14.125	2022-03-03 14:52:30 +00:00
kcichonczyk	1b44b5825c	[MNT-22462] 7.2.0-A4 rest-api-explorer version bump (#999 )	2022-03-03 14:59:51 +01:00
Travis CI User	a51a4e7cf2	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-03 11:01:26 +00:00
Travis CI User	d82b35a2c6	[maven-release-plugin][skip ci] prepare release 14.124	2022-03-03 11:01:22 +00:00
Piotr Żurek	2b081589ea	ACS-2620 tas rest api failures (#998 )	2022-03-03 11:10:06 +01:00
kcichonczyk	d6974d8504	cm:versionable mandatory aspect cause the node creation REST API to create 2 versions instead of one (#993 ) * [MNT-22462] Covered with tests all required combintations of creating a new node with versioningEnabled/majorVersion flags for multipart and json	2022-03-03 10:45:42 +01:00
Travis CI User	f319377697	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-02 21:24:35 +00:00
Travis CI User	72801ae27f	[maven-release-plugin][skip ci] prepare release 14.123	2022-03-02 21:24:32 +00:00
Sara	bc4bc6703f	Revert "Bump dependency.tas-restapi from 1.71 to 1.77 [skip tests] [no downstream] (#995 )" (#996 ) This reverts commit `ee2b80ab13`.	2022-03-02 21:13:53 +00:00
Travis CI User	f501050285	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-02 20:58:07 +00:00
Travis CI User	a38c428a9e	[maven-release-plugin][skip ci] prepare release 14.122	2022-03-02 20:58:04 +00:00
Sara	ee2b80ab13	Bump dependency.tas-restapi from 1.71 to 1.77 [skip tests] [no downstream] (#995 )	2022-03-02 20:47:02 +00:00
Travis CI User	bfda737651	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-02 17:43:31 +00:00
Travis CI User	280e29f326	[maven-release-plugin][skip ci] prepare release 14.121	2022-03-02 17:43:28 +00:00
alandavis	d60d8e1f5b	Revert "Bump dependency.tas-restapi from 1.71 to 1.76" This reverts commit `b7ed25a741`.	2022-03-02 16:50:34 +00:00
alandavis	40679b3f59	Upgrade to t-core 2.5.7-A5	2022-03-02 15:55:50 +00:00
Travis CI User	c3adbcdf3f	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-02 12:39:57 +00:00
Travis CI User	1487a8ecca	[maven-release-plugin][skip ci] prepare release 14.120	2022-03-02 12:39:55 +00:00
alandavis	0e0a7831be	Bump dependency.tas-restapi from 1.71 to 1.76 [skip tests] [no downstream] so Sara can try out something quickly in S3	2022-03-02 12:29:40 +00:00
alandavis	b7ed25a741	Bump dependency.tas-restapi from 1.71 to 1.76 [skip ci] [no downstream]	2022-03-02 12:28:04 +00:00
Travis CI User	bec9cf86b1	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-02 10:47:11 +00:00