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

Bump dependency.rest-assured.version from 5.3.1 to 5.3.2 (#2189 )
Bumps `dependency.rest-assured.version` from 5.3.1 to 5.3.2. Updates `io.rest-assured:rest-assured` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:json-path` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:xml-path` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:json-schema-validator` from 5.3.1 to 5.3.2 --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.rest-assured:json-path dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.rest-assured:xml-path dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.rest-assured:json-schema-validator 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>
2025-10-08 14:51:49 +00:00 · 2023-09-19 21:08:49 +00:00 · 2023-09-19 20:29:43 +05:30 · 2023-09-19 16:57:39 +05:30 · 2023-09-19 09:29:55 +00:00 · 2023-09-19 09:29:52 +00:00
37 changed files with 193 additions and 186 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,8 +77,6 @@ jobs:
      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: Alfresco/ya-pmd-scan@v2.0.0
-        with:
-          fail-on-new-issues: "false"

  all_unit_tests_suite:
    name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
--- 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>23.1.0.206</version>
+      <version>23.1.0.223</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>23.1.0.206</version>
+      <version>23.1.0.223</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>23.1.0.206</version>
+      <version>23.1.0.223</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>23.1.0.206</version>
+      <version>23.1.0.223</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.7-A5
+SOLR6_TAG=2.0.8.1
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
--- 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>23.1.0.206</version>
+      <version>23.1.0.223</version>
   </parent>

   <properties>
--- 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>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <properties>
@@ -131,23 +131,6 @@
            <groupId>jakarta.servlet</groupId>
            <artifactId>jakarta.servlet-api</artifactId>
        </dependency>
-
-        <!-- SHA-2432 -->
-        <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-jstlel</artifactId>
-            <scope>provided</scope>
-        </dependency>
    </dependencies>

    <build>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.206</version>
+      <version>23.1.0.223</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.7-A5
+SOLR6_TAG=2.0.8.1
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
--- 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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

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

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+        <version>23.1.0.223</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>23.1.0.206</version>
+    <version>23.1.0.223</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -51,24 +51,25 @@
        <dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>3.0.1-A2</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>4.0.1-A3</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>3.1.0-M1</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>4.1.0-M1</dependency.alfresco-transform-core.version>
        <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.23</dependency.acs-event-model.version>

+        <dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
        <dependency.spring.version>6.0.9</dependency.spring.version>
        <dependency.antlr.version>3.5.3</dependency.antlr.version>
        <dependency.jackson.version>2.15.2</dependency.jackson.version>
        <dependency.cxf.version>4.0.2</dependency.cxf.version>
        <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
-        <dependency.webscripts.version>8.46</dependency.webscripts.version>
+        <dependency.webscripts.version>9.0</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.76</dependency.bouncycastle.version>
        <dependency.mockito-core.version>5.4.0</dependency.mockito-core.version>
        <dependency.assertj.version>3.24.2</dependency.assertj.version>
        <dependency.org-json.version>20230618</dependency.org-json.version>
        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
        <dependency.commons-io.version>2.13.0</dependency.commons-io.version>
-        <dependency.gson.version>2.8.9</dependency.gson.version>
+        <dependency.gson.version>2.10.1</dependency.gson.version>
        <dependency.guava.version>32.1.2-jre</dependency.guava.version>
        <dependency.httpclient.version>4.5.14</dependency.httpclient.version>
        <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
@@ -89,15 +90,14 @@
        <dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
        <dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
        <dependency.activemq.version>5.18.2</dependency.activemq.version>
-        <dependency.apache-compress.version>1.23.0</dependency.apache-compress.version>
-        <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
+        <dependency.apache-compress.version>1.24.0</dependency.apache-compress.version>
        <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
        <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
        <dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
        <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
        <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
        <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
-        <dependency.pooled-jms.version>3.1.1</dependency.pooled-jms.version>
+        <dependency.pooled-jms.version>3.1.2</dependency.pooled-jms.version>

        <dependency.jakarta-ee-jaxb-api.version>4.0.0</dependency.jakarta-ee-jaxb-api.version>
        <dependency.jakarta-ee-jaxb-impl.version>4.0.3</dependency.jakarta-ee-jaxb-impl.version>
@@ -115,10 +115,8 @@
        <dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
        <dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
        <dependency.json-smart.version>2.5.0</dependency.json-smart.version>
-        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
-
-        <alfresco.googledrive.version>3.4.2-A5</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.2-A2</alfresco.aos-module.version>
+        <alfresco.googledrive.version>4.0.0-M1</alfresco.googledrive.version>
+        <alfresco.aos-module.version>2.0.0-M1</alfresco.aos-module.version>
        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
@@ -129,10 +127,10 @@
        <dependency.mysql-image.version>8</dependency.mysql-image.version>
        <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
        <dependency.tas-utility.version>5.0.0</dependency.tas-utility.version>
-        <dependency.rest-assured.version>5.3.1</dependency.rest-assured.version>
+        <dependency.rest-assured.version>5.3.2</dependency.rest-assured.version>
        <dependency.tas-email.version>2.0.0</dependency.tas-email.version>
-        <dependency.tas-webdav.version>1.20</dependency.tas-webdav.version>
-        <dependency.tas-ftp.version>1.18</dependency.tas-ftp.version>
+        <dependency.tas-webdav.version>1.21</dependency.tas-webdav.version>
+        <dependency.tas-ftp.version>1.19</dependency.tas-ftp.version>
        <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>

        <!-- AGS properties shared between community and enterprise -->
@@ -156,7 +154,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.1.0.206</tag>
+        <tag>23.1.0.223</tag>
    </scm>

    <distributionManagement>
@@ -287,17 +285,6 @@
                <version>${dependency.json-smart.version}</version>
            </dependency>

-            <dependency>
-                <groupId>jakarta.xml.rpc</groupId>
-                <artifactId>jakarta.xml.rpc-api</artifactId>
-                <version>${dependency.jakarta-rpc-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.rpc</groupId>
-                <artifactId>jaxrpc-impl</artifactId>
-                <version>${dependency.jakarta-rpc-api.version}</version>
-            </dependency>
-
            <!--CMIS-->
            <dependency>
                <groupId>org.apache.chemistry.opencmis</groupId>
@@ -594,7 +581,7 @@
            <dependency>
                <groupId>org.yaml</groupId>
                <artifactId>snakeyaml</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
            </dependency>
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
@@ -931,21 +918,6 @@
                <version>${dependency.camel.version}</version>
            </dependency>

-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-spec</artifactId>
-                <version>${dependency.apache.taglibs.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-impl</artifactId>
-                <version>${dependency.apache.taglibs.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.taglibs</groupId>
-                <artifactId>taglibs-standard-jstlel</artifactId>
-                <version>${dependency.apache.taglibs.version}</version>
-            </dependency>
            <dependency>
                <groupId>org.reflections</groupId>
                <artifactId>reflections</artifactId>
@@ -1007,7 +979,7 @@
                <plugin>
                    <groupId>io.fabric8</groupId>
                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.43.0</version>
+                    <version>0.43.4</version>
                </plugin>
                <plugin>
                    <artifactId>maven-surefire-plugin</artifactId>
@@ -1163,4 +1135,4 @@
            </plugin>
        </plugins>
    </build>
-</project>
+</project>
--- 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>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <dependencies>
@@ -18,11 +18,6 @@
        </dependency>

        <!-- Jakarta... -->
-        <dependency>
-            <groupId>jakarta.xml.rpc</groupId>
-            <artifactId>jakarta.xml.rpc-api</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.206</version>
+        <version>23.1.0.223</version>
    </parent>

    <dependencies>
@@ -726,7 +726,7 @@
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjrt</artifactId>
-            <version>1.9.19</version>
+            <version>${dependency.aspectj.version}</version>
        </dependency>
        <dependency>
            <groupId>commons-net</groupId>
@@ -746,18 +746,6 @@
            <version>${dependency.opencmis.version}</version>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-spec</artifactId>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.taglibs</groupId>
-           <artifactId>taglibs-standard-impl</artifactId>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.taglibs</groupId>
-           <artifactId>taglibs-standard-jstlel</artifactId>
-        </dependency>
        <!-- Repo Event Model-->
        <dependency>
            <groupId>org.alfresco</groupId>
@@ -870,9 +858,9 @@
                </executions>
            </plugin>
            <plugin>
-                <groupId>com.github.m50d</groupId>
+                <groupId>org.codehaus.mojo</groupId>
                <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.11.1</version>
+                <version>1.14.0</version>
                <executions>
                    <execution>
                        <!-- phase>process-sources</phase -->
@@ -890,6 +878,13 @@
                    <source>1.8</source>
                    <target>1.8</target>
                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${dependency.aspectj.version}</version>
+                    </dependency>
+                </dependencies>
           </plugin>

            <plugin>
--- a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
+++ b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
@@ -196,7 +196,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
     * @param plugins list of plugins
     *
     */
-    public void setPlugins(Interceptor[] plugins) {
+    public void setPlugins(Interceptor... plugins) {
        this.plugins = plugins;
    }

@@ -244,7 +244,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
     *
     * @param typeHandlers Type handler list
     */
-    public void setTypeHandlers(TypeHandler<?>[] typeHandlers) {
+    public void setTypeHandlers(TypeHandler<?>... typeHandlers) {
        this.typeHandlers = typeHandlers;
    }

@@ -255,7 +255,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
     *
     * @param typeAliases Type aliases list
     */
-    public void setTypeAliases(Class<?>[] typeAliases) {
+    public void setTypeAliases(Class<?>... typeAliases) {
        this.typeAliases = typeAliases;
    }

@@ -288,7 +288,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
     * This property being based on Spring's resource abstraction also allows for specifying
     * resource patterns here: e.g. "classpath*:sqlmap/*-mapper.xml".
     */
-    public void setMapperLocations(Resource[] mapperLocations) {
+    public void setMapperLocations(Resource... mapperLocations) {
        this.mapperLocations = mapperLocations;
    }

--- a/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java
+++ b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.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.action.executer;

 import java.io.Serializable;
@@ -34,10 +34,10 @@ import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.jscript.ScriptAction;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.action.Action;
-import org.alfresco.service.cmr.action.ActionDefinition;
-import org.alfresco.service.cmr.action.ActionService;
-import org.alfresco.service.cmr.action.ParameterConstraint;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionDefinition;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ParameterConstraint;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -129,10 +129,10 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase
        if (nodeService.exists(actionedUponNodeRef))
        {
            NodeRef scriptRef = (NodeRef)action.getParameterValue(PARAM_SCRIPTREF);
-            if(!isValidScriptRef(action))
-            {
-                throw new IllegalStateException("Invalid script ref path: " + scriptRef);
-            }
+            if(!isValidScriptRef(action))
+            {
+                throw new IllegalStateException("Invalid script ref path: " + scriptRef);
+            }
            NodeRef spaceRef = this.serviceRegistry.getRuleService().getOwningNodeRef(action);
            if (spaceRef == null)
            {
@@ -229,19 +229,22 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase

        return companyHomeRef;
    }
-    
-    private boolean isValidScriptRef(Action action)
-    {
-        NodeRef scriptRef = (NodeRef) action.getParameterValue(PARAM_SCRIPTREF);
-        ActionService actionService = this.serviceRegistry.getActionService();
-        ActionDefinition actDef = actionService.getActionDefinition(action.getActionDefinitionName());
-        ParameterDefinition parameterDef = actDef.getParameterDefintion(PARAM_SCRIPTREF);
-        String paramConstraintName = parameterDef.getParameterConstraintName();
-        if (paramConstraintName != null)
-        {
-            ParameterConstraint paramConstraint = actionService.getParameterConstraint(paramConstraintName);
-            return paramConstraint.isValidValue(scriptRef.toString());
-        }
-        return true;
-    }
+    
+    private boolean isValidScriptRef(Action action)
+    {
+        NodeRef scriptRef = (NodeRef) action.getParameterValue(PARAM_SCRIPTREF);
+        ActionService actionService = this.serviceRegistry.getActionService();
+        ActionDefinition actDef = actionService.getActionDefinition(action.getActionDefinitionName());
+        ParameterDefinition parameterDef = actDef.getParameterDefintion(PARAM_SCRIPTREF);
+        if (parameterDef != null)
+        {
+            String paramConstraintName = parameterDef.getParameterConstraintName();
+            if (paramConstraintName != null)
+            {
+                ParameterConstraint paramConstraint = actionService.getParameterConstraint(paramConstraintName);
+                return paramConstraint.isValidValue(scriptRef.toString());
+            }
+        }
+        return true;
+    }
 }
--- a/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
@@ -108,7 +108,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor

        // --DELETE_NOT_EXISTS primaryTable.key,secondaryTable1.key1,... batch.size.property
        String[] args = sql.split("[ \\t]+(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
-        if (args.length == 3 && (args[1].indexOf('.')) != -1)
+        if (args.length >= 3 && args[1].indexOf('.') != -1)
        {
            String[] tableColumnArgs = args[1].split(",(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
            if (tableColumnArgs.length >= 2)
@@ -133,6 +133,10 @@ public class DeleteNotExistsExecutor implements StatementExecutor
                String timeoutSecString = globalProperties.getProperty(PROPERTY_TIMEOUT_SECONDS);
                timeoutSec = timeoutSecString == null ? -1 : Long.parseLong(timeoutSecString);

+                // Only implemented in v3. In v2 the skip is not used
+                String skipToIdString = (args.length == 4) ? globalProperties.getProperty(args[3]) : null;
+                Long skipToId = skipToIdString == null ? 0L : Long.parseLong(skipToIdString);
+
                // Compute upper limits
                Long[] tableUpperLimits = new Long[tableColumnArgs.length];
                Pair<String, String>[] tableColumn = new Pair[tableColumnArgs.length];
@@ -159,7 +163,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor
                    }
                }

-                process(tableColumn, tableUpperLimits, optionalWhereClauses);
+                process(tableColumn, tableUpperLimits, optionalWhereClauses, skipToId);
            }
        }
    }
@@ -623,4 +627,10 @@ public class DeleteNotExistsExecutor implements StatementExecutor
            }
        }
    }
+
+    protected void process(Pair<String, String>[] tableColumn, Long[] tableUpperLimits, String[] optionalWhereClauses,
+            Long skipToId) throws SQLException
+    {
+        process(tableColumn, tableUpperLimits, optionalWhereClauses);
+    }
 }
--- a/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsV3Executor.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsV3Executor.java
@@ -108,12 +108,19 @@ public class DeleteNotExistsV3Executor extends DeleteNotExistsExecutor
    @Override
    protected void process(Pair<String, String>[] tableColumn, Long[] tableUpperLimits, String[] optionalWhereClauses)
            throws SQLException
+    {
+        process(tableColumn, tableUpperLimits, optionalWhereClauses, 0L);
+    }
+
+    @Override
+    protected void process(Pair<String, String>[] tableColumn, Long[] tableUpperLimits, String[] optionalWhereClauses, Long skipToId)
+            throws SQLException
    {
        String primaryTableName = tableColumn[0].getFirst();
        String primaryColumnName = tableColumn[0].getSecond();
        String primaryWhereClause = optionalWhereClauses[0];

-        Long primaryId = 0L;
+        Long primaryId = skipToId;

        deletedCount = 0L;
        startTime = new Date();
--- a/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
+++ b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
@@ -156,7 +156,7 @@ public class ChainingSubsystemProxyFactory extends ProxyFactoryBean
     */
    @SuppressWarnings("rawtypes")
    @Override
-    public void setInterfaces(Class[] interfaces)
+    public void setInterfaces(Class... interfaces)
    {
        super.setInterfaces(interfaces);
        // Make it possible to export the object via JMX
--- a/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
+++ b/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
@@ -89,7 +89,7 @@ public class SubsystemProxyFactory extends ProxyFactoryBean implements Applicati

    @SuppressWarnings("unchecked")
    @Override
-    public void setInterfaces(Class[] interfaces)
+    public void setInterfaces(Class... interfaces)
    {
        super.setInterfaces(interfaces);
        // Make it possible to export the object via JMX
--- a/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV3.sql
+++ b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV3.sql
@@ -1,9 +1,9 @@
--DELETE_NOT_EXISTS_V3 alf_prop_root.id,alf_audit_app.disabled_paths_id,alf_audit_entry.audit_values_id,alf_prop_unique_ctx.prop1_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_root.id,alf_audit_app.disabled_paths_id,alf_audit_entry.audit_values_id,alf_prop_unique_ctx.prop1_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_root.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_value.id,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_value.id,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_string_value.id,alf_prop_value.long_value."persisted_type in (3, 5, 6)",alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_string_value.id,alf_prop_value.long_value."persisted_type in (3, 5, 6)",alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_string_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_serializable_value.id,alf_prop_value.long_value.persisted_type=4,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_serializable_value.id,alf_prop_value.long_value.persisted_type=4,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_serializable_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_double_value.id,alf_prop_value.long_value.persisted_type=2,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_double_value.id,alf_prop_value.long_value.persisted_type=2,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_double_value.skipToId
--- a/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV3.sql
+++ b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV3.sql
@@ -1,9 +1,9 @@
--DELETE_NOT_EXISTS_V3 alf_prop_root.id,alf_audit_app.disabled_paths_id,alf_audit_entry.audit_values_id,alf_prop_unique_ctx.prop1_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_root.id,alf_audit_app.disabled_paths_id,alf_audit_entry.audit_values_id,alf_prop_unique_ctx.prop1_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_root.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_value.id,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_value.id,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_string_value.id,alf_prop_value.long_value."persisted_type in (3, 5, 6)",alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_string_value.id,alf_prop_value.long_value."persisted_type in (3, 5, 6)",alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_string_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_serializable_value.id,alf_prop_value.long_value.persisted_type=4,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_serializable_value.id,alf_prop_value.long_value.persisted_type=4,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_serializable_value.skipToId

--DELETE_NOT_EXISTS_V3 alf_prop_double_value.id,alf_prop_value.long_value.persisted_type=2,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize
+--DELETE_NOT_EXISTS_V3 alf_prop_double_value.id,alf_prop_value.long_value.persisted_type=2,alf_audit_app.app_name_id,alf_audit_entry.audit_user_id,alf_prop_link.key_prop_id,alf_prop_link.value_prop_id,alf_prop_unique_ctx.value1_prop_id,alf_prop_unique_ctx.value2_prop_id,alf_prop_unique_ctx.value3_prop_id system.delete_not_exists.batchsize system.delete_not_exists.alf_prop_double_value.skipToId
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -1254,6 +1254,12 @@ system.prop_table_cleaner.algorithm=V2
 system.delete_not_exists.pauseAndRecoverBatchSize=500000
 #Duration of the pause in milliseconds (default 10s)
 system.delete_not_exists.pauseAndRecoverTime=10000
+#Skip ids on job execution
+system.delete_not_exists.alf_prop_root.skipToId=0
+system.delete_not_exists.alf_prop_value.skipToId=0
+system.delete_not_exists.alf_prop_string_value.skipToId=0
+system.delete_not_exists.alf_prop_serializable_value.skipToId=0
+system.delete_not_exists.alf_prop_double_value.skipToId=0

 # --Node cleanup batch - default settings
 system.node_cleanup.delete_batchSize=1000
--- a/repository/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsV3ExecutorTest.java
+++ b/repository/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsV3ExecutorTest.java
@@ -86,7 +86,7 @@ public class DeleteNotExistsV3ExecutorTest
    {
        scriptExecutor.executeScriptUrl("scriptexec/${db.script.dialect}/delete-not-exists/test-data1.sql");

-        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize";
+        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize system.delete_not_exists.temp_tst_tbl_1.skipToId";
        int line = 1;
        File scriptFile = Mockito.mock(File.class);
        Properties properties = Mockito.mock(Properties.class);
@@ -101,8 +101,8 @@ public class DeleteNotExistsV3ExecutorTest
            {
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_READ_ONLY)).thenReturn("true");
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
-                DeleteNotExistsV3Executor DeleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
-                DeleteNotExistsV3Executor.execute();
+                DeleteNotExistsV3Executor deleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
+                deleteNotExistsV3Executor.execute();

                List<String> res = jdbcTmpl.queryForList(select, String.class);
                assertEquals(7, res.size());
@@ -117,8 +117,8 @@ public class DeleteNotExistsV3ExecutorTest
            {
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_READ_ONLY)).thenReturn("false");
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
-                DeleteNotExistsV3Executor DeleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
-                DeleteNotExistsV3Executor.execute();
+                DeleteNotExistsV3Executor deleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
+                deleteNotExistsV3Executor.execute();

                List<String> res = jdbcTmpl.queryForList(select, String.class);
                assertEquals(5, res.size());
@@ -137,7 +137,7 @@ public class DeleteNotExistsV3ExecutorTest
    {
        scriptExecutor.executeScriptUrl("scriptexec/${db.script.dialect}/delete-not-exists/test-data1.sql");

-        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize";
+        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize system.delete_not_exists.temp_tst_tbl_1.skipToId";
        int line = 1;
        File scriptFile = Mockito.mock(File.class);
        Properties properties = Mockito.mock(Properties.class);
@@ -150,8 +150,8 @@ public class DeleteNotExistsV3ExecutorTest
            {
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_DELETE_BATCH_SIZE)).thenReturn("1");
                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_READ_ONLY)).thenReturn("false");
-                DeleteNotExistsV3Executor DeleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
-                DeleteNotExistsV3Executor.execute();
+                DeleteNotExistsV3Executor deleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
+                deleteNotExistsV3Executor.execute();

                List<String> res = jdbcTmpl.queryForList(select, String.class);
                assertEquals(5, res.size());
@@ -170,7 +170,7 @@ public class DeleteNotExistsV3ExecutorTest
    {
        scriptExecutor.executeScriptUrl("scriptexec/${db.script.dialect}/delete-not-exists/test-data1.sql");

-        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize";
+        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize system.delete_not_exists.temp_tst_tbl_1.skipToId";
        int line = 1;
        File scriptFile = Mockito.mock(File.class);
        Properties properties = Mockito.mock(Properties.class);
@@ -198,4 +198,42 @@ public class DeleteNotExistsV3ExecutorTest
            }
        }
    }
-}
+
+    @Test()
+    public void testSkip() throws Exception
+    {
+        scriptExecutor.executeScriptUrl("scriptexec/${db.script.dialect}/delete-not-exists/test-data1.sql");
+
+        String sql = "--DELETE_NOT_EXISTS_V3 temp_tst_tbl_1.id,temp_tst_tbl_2.tbl_2_id,temp_tst_tbl_3.tbl_3_id,temp_tst_tbl_4.tbl_4_id system.delete_not_exists.batchsize system.delete_not_exists.temp_tst_tbl_1.skipToId";
+        int line = 1;
+        File scriptFile = Mockito.mock(File.class);
+        Properties properties = Mockito.mock(Properties.class);
+
+        String select = "select id from temp_tst_tbl_1 order by id ASC";
+
+        try (Connection connection = dataSource.getConnection())
+        {
+            connection.setAutoCommit(true);
+            {
+                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_BATCH_SIZE)).thenReturn("2");
+                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_READ_ONLY)).thenReturn("false");
+                when(properties.getProperty(DeleteNotExistsV3Executor.PROPERTY_TIMEOUT_SECONDS)).thenReturn("-1");
+                when(properties.getProperty("system.delete_not_exists.temp_tst_tbl_1.skipToId")).thenReturn("6");
+                DeleteNotExistsV3Executor deleteNotExistsV3Executor = createDeleteNotExistsV3Executor(dialect, connection, sql, line, scriptFile, properties);
+                deleteNotExistsV3Executor.execute();
+
+                List<String> res = jdbcTmpl.queryForList(select, String.class);
+                assertEquals(7, res.size());
+
+                // We are only processing Ids after 6, so all ids < 6 must remain untouched
+                assertEquals("1", res.get(0));
+                assertEquals("2", res.get(1));
+                assertEquals("3", res.get(2));
+                assertEquals("4", res.get(3));
+                assertEquals("5", res.get(4));
+                assertEquals("10", res.get(5));
+                assertEquals("11", res.get(6));
+            }
+        }
+    }
+}
Author	SHA1	Message	Date
alfresco-build	234222ba4b	[maven-release-plugin][skip ci] prepare release 23.1.0.223	2023-09-19 21:08:49 +00:00
dependabot[bot]	d6c4934910	Bump dependency.rest-assured.version from 5.3.1 to 5.3.2 (#2189 ) Bumps `dependency.rest-assured.version` from 5.3.1 to 5.3.2. Updates `io.rest-assured:rest-assured` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:json-path` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:xml-path` from 5.3.1 to 5.3.2 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits) Updates `io.rest-assured:json-schema-validator` from 5.3.1 to 5.3.2 --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.rest-assured:json-path dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.rest-assured:xml-path dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.rest-assured:json-schema-validator 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>	2023-09-19 20:29:43 +05:30
atkumar14	5fc889a101	Merge pull request #2162 from Alfresco/dependabot/maven/org.yaml-snakeyaml-2.2 Bump org.yaml:snakeyaml from 2.1 to 2.2	2023-09-19 16:57:39 +05:30
alfresco-build	ce8f1bda77	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-19 09:29:55 +00:00
alfresco-build	37606c1aa5	[maven-release-plugin][skip ci] prepare release 23.1.0.222	2023-09-19 09:29:52 +00:00
dependabot[bot]	48d7f4223e	Bump org.apache.commons:commons-compress from 1.23.0 to 1.24.0 (#2191 ) Bumps org.apache.commons:commons-compress from 1.23.0 to 1.24.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-19 14:11:49 +05:30
Tom Page	e070354764	PRODENG-222 Fail builds based on PMD scan. (#2196 )	2023-09-18 18:14:17 +01:00
alfresco-build	0c4ce183be	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-17 00:06:31 +00:00
alfresco-build	c6881ac128	[maven-release-plugin][skip ci] prepare release 23.1.0.221	2023-09-17 00:06:29 +00:00
Alfresco CI User	4c4c561f94	[force] Force release for 2023-09-17.	2023-09-17 00:03:17 +00:00
alfresco-build	7c993ba695	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-15 14:31:23 +00:00
alfresco-build	8f929d9744	[maven-release-plugin][skip ci] prepare release 23.1.0.220	2023-09-15 14:31:20 +00:00
Domenico Sibilio	c28be29c0e	ACS-5944 Bump ATS to the latest -Mx (#2194 )	2023-09-15 15:45:46 +02:00
alfresco-build	285080566a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-15 12:22:24 +00:00
alfresco-build	99f8ba31c4	[maven-release-plugin][skip ci] prepare release 23.1.0.219	2023-09-15 12:22:21 +00:00
MohinishSah	ce9bf0cd71	Updating Google docs and AOS Milestone version	2023-09-15 17:05:03 +05:30
alfresco-build	e436be7f10	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-11 08:39:40 +00:00
alfresco-build	06a4e28b40	[maven-release-plugin][skip ci] prepare release 23.1.0.218	2023-09-11 08:39:36 +00:00
MohinishSah	5b9311a18a	Updating latest AOS and Google drive version	2023-09-11 13:00:02 +05:30
alfresco-build	ccd2f5e996	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-10 00:06:26 +00:00
alfresco-build	94ac09bf44	[maven-release-plugin][skip ci] prepare release 23.1.0.217	2023-09-10 00:06:24 +00:00
Alfresco CI User	9331c33e87	[force] Force release for 2023-09-10.	2023-09-10 00:03:13 +00:00
alfresco-build	ba250f6872	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-08 04:27:40 +00:00
alfresco-build	5343b615e4	[maven-release-plugin][skip ci] prepare release 23.1.0.216	2023-09-08 04:27:37 +00:00
dependabot[bot]	80ffd2826c	Bump org.messaginghub:pooled-jms from 3.1.1 to 3.1.2 (#2183 ) Bumps [org.messaginghub:pooled-jms](https://github.com/messaginghub/pooled-jms) from 3.1.1 to 3.1.2. - [Commits](https://github.com/messaginghub/pooled-jms/compare/3.1.1...3.1.2) --- updated-dependencies: - dependency-name: org.messaginghub:pooled-jms 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>	2023-09-07 23:33:59 +02:00
alfresco-build	41ce8a869e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-06 17:03:00 +00:00
alfresco-build	9ece324e92	[maven-release-plugin][skip ci] prepare release 23.1.0.215	2023-09-06 17:02:57 +00:00
evasques	ddd0fac97e	MNT-23953 - PropTablesCleaner v3 Skip IDs (#2181 ) * Configure v3 to skip ids per table. Added unit test	2023-09-06 17:13:36 +01:00
Domenico Sibilio	c43dc66e2e	ACS-5943 Bump ATS to 4.1.0-A1 / 3.1.0-A1 (#2182 )	2023-09-06 16:56:58 +02:00
alfresco-build	a09c7ef4ca	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-06 11:57:10 +00:00
alfresco-build	e89f0b4e82	[maven-release-plugin][skip ci] prepare release 23.1.0.214	2023-09-06 11:57:07 +00:00
Kacper Magdziarz	e7f9b439ae	[ACS-5936] Remove taglibs-standard jars (#2180 )	2023-09-06 13:10:24 +02:00
alfresco-build	4a0f5eab77	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-06 07:22:38 +00:00
alfresco-build	779c16677b	[maven-release-plugin][skip ci] prepare release 23.1.0.213	2023-09-06 07:22:36 +00:00
kmagdziarz	ddf14c7e31	[ACS-5935] Revert change.	2023-09-06 08:39:25 +02:00
Kacper Magdziarz	71df1b01e2	[ACS-5935] Remove rpc-api (#2178 )	2023-09-06 08:36:28 +02:00
alfresco-build	fc83e0d131	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-06 06:22:33 +00:00
alfresco-build	bce387bbb7	[maven-release-plugin][skip ci] prepare release 23.1.0.212	2023-09-06 06:22:31 +00:00
dependabot[bot]	9fb46ed66c	Bump io.fabric8:docker-maven-plugin from 0.43.0 to 0.43.4 (#2148 ) Bumps [io.fabric8:docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.43.0 to 0.43.4. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.43.0...v0.43.4) --- updated-dependencies: - dependency-name: io.fabric8:docker-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>	2023-09-06 07:35:48 +02:00
alfresco-build	203f2933bc	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-05 18:40:10 +00:00
alfresco-build	5849da3cc1	[maven-release-plugin][skip ci] prepare release 23.1.0.211	2023-09-05 18:40:07 +00:00
dependabot[bot]	c3bcc5f242	Bump org.alfresco.tas:ftp from 1.18 to 1.19 (#2171 ) Bumps [org.alfresco.tas:ftp](https://github.com/Alfresco/alfresco-tas-ftp) from 1.18 to 1.19. - [Changelog](https://github.com/Alfresco/alfresco-tas-ftp/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-ftp/compare/v1.18...v1.19) --- updated-dependencies: - dependency-name: org.alfresco.tas:ftp dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-05 19:58:48 +02:00
alfresco-build	7078ba7d56	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-05 13:02:43 +00:00
alfresco-build	65dd5be19b	[maven-release-plugin][skip ci] prepare release 23.1.0.210	2023-09-05 13:02:40 +00:00
dependabot[bot]	08e67aa004	Bump org.aspectj:aspectjrt from 1.9.19 to 1.9.20.1 (#2176 ) * Bump org.aspectj:aspectjrt from 1.9.19 to 1.9.20.1 Bumps [org.aspectj:aspectjrt](https://github.com/eclipse/org.aspectj) from 1.9.19 to 1.9.20.1. - [Release notes](https://github.com/eclipse/org.aspectj/releases) - [Commits](https://github.com/eclipse/org.aspectj/commits) --- updated-dependencies: - dependency-name: org.aspectj:aspectjrt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Get rid of the aspectj warnings * Switch to the maintained aspectj-maven-plugin --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pzurek <Piotr.Zurek@hyland.com>	2023-09-05 14:01:06 +02:00
dependabot[bot]	63db311d11	Bump dependency.webscripts.version from 8.46 to 9.0 (#2173 ) Bumps `dependency.webscripts.version` from 8.46 to 9.0. Updates `org.alfresco.surf:spring-surf-core-configservice` from 8.46 to 9.0 Updates `org.alfresco.surf:spring-webscripts` from 8.46 to 9.0 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.46...spring-surf-webscripts-parent-9.0) Updates `org.alfresco.surf:spring-webscripts:tests` from 8.46 to 9.0 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.46...spring-surf-webscripts-parent-9.0) Updates `org.alfresco.surf:spring-webscripts-api` from 8.46 to 9.0 --- updated-dependencies: - dependency-name: org.alfresco.surf:spring-surf-core-configservice dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.alfresco.surf:spring-webscripts dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.alfresco.surf:spring-webscripts:tests dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.alfresco.surf:spring-webscripts-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-05 08:44:17 +02:00
dependabot[bot]	ed674cfa2e	Bump org.alfresco.tas:webdav from 1.20 to 1.21 (#2172 ) Bumps [org.alfresco.tas:webdav](https://github.com/Alfresco/alfresco-tas-webdav) from 1.20 to 1.21. - [Changelog](https://github.com/Alfresco/alfresco-tas-webdav/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-webdav/compare/v1.20...v1.21) --- updated-dependencies: - dependency-name: org.alfresco.tas:webdav dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-05 06:08:51 +02:00
alfresco-build	21d7cf8c69	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-03 00:07:11 +00:00
alfresco-build	077ea7f9a5	[maven-release-plugin][skip ci] prepare release 23.1.0.209	2023-09-03 00:07:09 +00:00
Alfresco CI User	6384a33ac9	[force] Force release for 2023-09-03.	2023-09-03 00:03:13 +00:00
Piyush Joshi	0800c0e42a	Merge pull request #2164 from Alfresco/MNT-23107_NullPointer_ScriptLocation [MNT-23107] The scriptLocation property is not picked up when set in a bean definition	2023-09-01 15:46:49 +05:30
alfresco-build	94b0bae03c	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-01 08:45:02 +00:00
alfresco-build	82eef1b975	[maven-release-plugin][skip ci] prepare release 23.1.0.208	2023-09-01 08:44:58 +00:00
Piotr Żurek	67fa274abb	ACS-5933 Switch to SS 2.0.8.1 (#2170 )	2023-09-01 09:59:08 +02:00
alfresco-build	acc50febda	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-01 07:19:12 +00:00
alfresco-build	7b4ba83797	[maven-release-plugin][skip ci] prepare release 23.1.0.207	2023-09-01 07:19:10 +00:00
dependabot[bot]	874835301e	Bump com.google.code.gson:gson from 2.8.9 to 2.10.1 (#2169 ) Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.8.9 to 2.10.1. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.9...gson-parent-2.10.1) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-01 11:50:52 +05:30
alfresco-build	9413bad6ef	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-31 19:25:53 +00:00
pjoshi31	03fe795fba	Added null check	2023-08-30 06:13:41 +05:30
pjoshi31	557292982a	Added null check	2023-08-29 18:46:00 +05:30
dependabot[bot]	d0fabbdf1f	Bump org.yaml:snakeyaml from 2.1 to 2.2 Bumps [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 2.1 to 2.2. - [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.2..snakeyaml-2.1) --- updated-dependencies: - dependency-name: org.yaml:snakeyaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-28 22:31:04 +00:00