split failing job in two separate jobs

test core without build-cache but latest maven
[skip ci] remove push branch
2025-10-29 15:21:53 +00:00 · 2023-10-31 12:20:15 +01:00 · 2023-10-31 12:20:15 +01:00 · 2023-10-31 12:20:15 +01:00 · 2023-10-31 12:20:15 +01:00 · 2023-10-31 12:20:15 +01:00
70 changed files with 1573 additions and 569 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,11 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Prepare maven cache and check compilation"
@@ -55,11 +58,12 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.35.2
        continue-on-error: true
        with:
          srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
@@ -76,12 +80,10 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force]')
    steps:
-      - uses: Alfresco/ya-pmd-scan@v2.0.0
-        with:
-          fail-on-new-issues: "false"
+      - uses: Alfresco/ya-pmd-scan@v2.0.5

-  all_unit_tests_suite:
-    name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
+  core_datamodel_tests:
+    name: "Core, Data-Model - Build and test"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -90,14 +92,37 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run tests"
-        run: |
-          mvn -B test -pl core,data-model -am -DfailIfNoTests=false
-          mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
+        run: mvn -B test -pl core,data-model -am -DfailIfNoTests=false
+      - name: "Clean Maven cache"
+        run: bash ./scripts/ci/cleanup_cache.sh
+
+  all_unit_tests_suite:
+    name: "Repository - AllUnitTestsSuite - Build and test"
+    runs-on: ubuntu-latest
+    needs: [prepare]
+    if: >
+      !contains(github.event.head_commit.message, '[skip repo]') &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
+      - name: "Init"
+        run: bash ./scripts/ci/init.sh
+      - name: "Run tests"
+        run: mvn -B test -pl repository,mmt  -am -Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite -DfailIfNoTests=false
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -127,8 +152,11 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -157,11 +185,14 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        version: ['10.2.18', '10.4', '10.5']
+        version: ["10.2.18", "10.4", "10.5"]
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: Run MariaDB ${{ matrix.version }} database
@@ -186,8 +217,11 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MariaDB 10.6 database"
@@ -212,8 +246,11 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MySQL 8 database"
@@ -225,8 +262,8 @@ jobs:
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_postgresql_13_7_tests:
-    name: "Repository - PostgreSQL 13.7 tests"
+  repository_postgresql_13_12_tests:
+    name: "Repository - PostgreSQL 13.12 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -237,21 +274,52 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 13.7 database"
+      - name: "Run PostgreSQL 13.12 database"
        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 13.7
+          POSTGRES_VERSION: 13.12
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_postgresql_14_4_tests:
-    name: "Repository - PostgreSQL 14.4 tests"
+  repository_postgresql_14_9_tests:
+    name: "Repository - PostgreSQL 14.9 tests"
+    runs-on: ubuntu-latest
+    needs: [prepare]
+    if: >
+      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' &&
+      !contains(github.event.head_commit.message, '[skip db]')) ||
+      contains(github.event.head_commit.message, '[db]')) &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
+      - name: "Init"
+        run: bash ./scripts/ci/init.sh
+      - name: "Run PostgreSQL 14.9 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+        env:
+          POSTGRES_VERSION: 14.9
+      - name: "Run tests"
+        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      - name: "Clean Maven cache"
+        run: bash ./scripts/ci/cleanup_cache.sh
+
+  repository_postgresql_15_4_tests:
+    name: "Repository - PostgreSQL 15.4 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -262,14 +330,17 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.4 database"
+      - name: "Run PostgreSQL 15.4 database"
        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 14.4
+          POSTGRES_VERSION: 15.4
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
@@ -285,8 +356,11 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run ActiveMQ"
@@ -327,16 +401,19 @@ jobs:
            compose-profile: with-transform-core-aio
          - testSuite: SearchTestSuite
            compose-profile: default
-            mvn-options: '-Dindex.subsystem.name=solr6'
+            mvn-options: "-Dindex.subsystem.name=solr6"
          - testSuite: MTLSTestSuite
            compose-profile: with-mtls-transform-core-aio
            mtls: true
            disabledHostnameVerification: false
-            mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
+            mvn-options: "-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore"
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Set transformers tag"
@@ -405,8 +482,11 @@ jobs:
      REQUIRES_LOCAL_IMAGES: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -442,11 +522,14 @@ jobs:
      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run Postgres 14.4 database"
+      - name: "Run Postgres 15.4 database"
        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
      - name: "Run tests"
        run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
@@ -471,8 +554,11 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -502,8 +588,11 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -529,8 +618,11 @@ jobs:
      REQUIRES_LOCAL_IMAGES: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -565,7 +657,7 @@ jobs:
  ags_start_api_explorer:
    name: "Test Tomcat deployment of api explorer"
    runs-on: ubuntu-latest
-    needs: [ prepare ]
+    needs: [prepare]
    if: >
      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
      !contains(github.event.head_commit.message, '[skip ags]')) ||
@@ -574,8 +666,11 @@ jobs:
      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+        with:
+          build-cache: "true"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -34,11 +34,12 @@ jobs:
      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
@@ -62,11 +63,12 @@ jobs:
      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
--- 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.211</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.211</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.1.0.211</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
@@ -135,7 +135,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     * <p>
     * <p/> TestRail Test C775<p/>
     **/
-    @Test
+    @Test(enabled = false) // temporary disabled, see ACS-6073
    @AlfrescoTest(jira = "RM-1622")
    public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
        STEP("Create record category");
@@ -202,7 +202,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     * Check the disposition steps for a record can be executed
     * When the record is linked to a folder with the same disposition schedule
     * */
-    @Test
+    @Test(enabled = false) // temporary disabled, see ACS-6073
    @AlfrescoTest (jira = "RM-3060")
    public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {

--- 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.211</version>
+      <version>23.1.0.256-SNAPSHOT</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.8.1
-POSTGRES_TAG=14.4
+POSTGRES_TAG=15.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.211</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <properties>
@@ -416,9 +416,7 @@
                  <configuration>
                     <images>
                        <image>
-                           <!-- TODO upgrade this old postgres version -->
-                           <name>postgres:9.4.12</name>
-                           <!--<name>postgres:13.3</name>-->
+                           <name>postgres:15.4</name>
                           <run>
                              <ports>
                                 <port>${postgresql.tests.port}:${postgresql.port}</port>
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
@@ -61,6 +61,7 @@ public class RFC822MetadataExtracter extends org.alfresco.repo.content.metadata.
    public void setNodeService(NodeService nodeService)
    {
        this.nodeService = nodeService;
+        super.setNodeService(nodeService);
    }

    /**
--- 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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</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.211</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <dependencies>
--- a/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java
+++ b/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java
@@ -74,8 +74,6 @@ public abstract class X509ServletFilterBase implements Filter
                logger.debug("Initializing X509ServletFilter");
            }

-            this.handleClientAuth();
-
            this.enforce = checkEnforce(config.getServletContext());

            if(logger.isDebugEnabled())
@@ -85,6 +83,8 @@ public abstract class X509ServletFilterBase implements Filter

            if (this.enforce)
            {
+                this.handleClientAuth();
+
                /*
                * We are enforcing so get the cert-contains string.
                */
--- 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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/distribution/src/main/resources/licenses/notice.txt
+++ b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -208,10 +208,6 @@ Hibernate   http://www.hibernate.org/
 jid3lib http://javamusictag.sourceforge.net/
 TinyMCE http://www.tinymce.com/

-                
-=== LGPL 3.0 ===
-Gytheio https://github.com/Alfresco/gytheio
-

 === MIT License ===
 Bouncy Castle   http://www.bouncycastle.org/ 
--- a/packaging/docker-alfresco/Dockerfile
+++ b/packaging/docker-alfresco/Dockerfile
@@ -98,4 +98,4 @@ EXPOSE 10001
 # For remote debug
 EXPOSE 8000

-USER ${IMAGEUSERNAME}
+USER ${IMAGEUSERNAME}
--- 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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.8.1
-POSTGRES_TAG=14.4
+POSTGRES_TAG=15.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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

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

    <properties>
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
@@ -35,6 +35,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Stream;

 import io.restassured.http.ContentType;
 import org.alfresco.rest.core.JsonBodyGenerator;
@@ -51,9 +52,11 @@ import org.alfresco.rest.model.RestCommentModelsCollection;
 import org.alfresco.rest.model.RestNodeAssocTargetModel;
 import org.alfresco.rest.model.RestNodeAssociationModel;
 import org.alfresco.rest.model.RestNodeAssociationModelCollection;
+import org.alfresco.rest.model.RestNodeAssociationTypeModel;
 import org.alfresco.rest.model.RestNodeBodyModel;
 import org.alfresco.rest.model.RestNodeBodyMoveCopyModel;
 import org.alfresco.rest.model.RestNodeChildAssocModelCollection;
+import org.alfresco.rest.model.RestNodeChildAssociationModel;
 import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.rest.model.RestNodeModelsCollection;
 import org.alfresco.rest.model.RestRatingModel;
@@ -72,6 +75,7 @@ import org.alfresco.rest.model.body.RestNodeLockBodyModel;
 import org.alfresco.rest.model.builder.NodesBuilder;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.RepoTestModel;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.reporters.Files;
@@ -824,25 +828,118 @@ public class Node extends ModelRequest<Node>
    }

    /**
-     * Create secondary children association using POST call 'nodes/{nodeId}/secondary-children
-     * Use a list of secondary children nodes
+     * Creates a secondary child association using POST call to: 'nodes/{nodeId}/secondary-children'.
     *
-     * @return a collection of nodes
+     * @param secondaryChild - node, which should become a secondary child
+     * @return a node's parent-child association
     */
-    public RestNodeChildAssocModelCollection createSecondaryChildren(String secondaryChildren)
+    public RestNodeChildAssociationModel addSecondaryChild(RepoTestModel secondaryChild)
    {
-        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, secondaryChildren, "nodes/{nodeId}/secondary-children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
+        return addSecondaryChild("cm:contains", secondaryChild);
+    }
+
+    /**
+     * Creates a secondary child association using POST call to: 'nodes/{nodeId}/secondary-children'.
+     *
+     * @param associationType - type of secondary parent-child relationship association
+     * @param secondaryChild - node, which should become a secondary child
+     * @return a node's parent-child association
+     */
+    public RestNodeChildAssociationModel addSecondaryChild(String associationType, RepoTestModel secondaryChild)
+    {
+        return addSecondaryChild(new RestNodeChildAssociationModel(secondaryChild.getNodeRef(), associationType));
+    }
+
+    /**
+     * Creates a secondary child association using POST call to: 'nodes/{nodeId}/secondary-children'.
+     *
+     * @param secondaryChildAssociation - node's secondary parent-child association model
+     * @return a node's parent-child association
+     */
+    public RestNodeChildAssociationModel addSecondaryChild(RestNodeChildAssociationModel secondaryChildAssociation)
+    {
+        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, secondaryChildAssociation.toJson(), "nodes/{nodeId}/secondary-children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
+        return restWrapper.processModel(RestNodeChildAssociationModel.class, request);
+    }
+
+    /**
+     * Creates a secondary children association using POST call to: 'nodes/{nodeId}/secondary-children'.
+     *
+     * @param secondaryChildren - nodes, which should become secondary children
+     * @return a collection of node's parent-child associations
+     */
+    public RestNodeChildAssocModelCollection addSecondaryChildren(RepoTestModel... secondaryChildren)
+    {
+        return addSecondaryChildren("cm:contains", secondaryChildren);
+    }
+
+    /**
+     * Creates a secondary children association using POST call to: 'nodes/{nodeId}/secondary-children'.
+     *
+     * @param associationType - type of secondary parent-child relationship association
+     * @param secondaryChildren - nodes, which should become secondary children
+     * @return a collection of node's parent-child associations
+     */
+    public RestNodeChildAssocModelCollection addSecondaryChildren(String associationType, RepoTestModel... secondaryChildren)
+    {
+        return addSecondaryChildren(Stream.of(secondaryChildren)
+            .map(child -> new RestNodeChildAssociationModel(child.getNodeRef(), associationType))
+            .toArray(RestNodeChildAssociationModel[]::new));
+    }
+
+    /**
+     * Creates a secondary children association using POST call to: 'nodes/{nodeId}/secondary-children'.
+     *
+     * @param secondaryChildrenAssociations - node's secondary parent-child association models
+     * @return a collection of node's parent-child associations
+     */
+    public RestNodeChildAssocModelCollection addSecondaryChildren(RestNodeChildAssociationModel... secondaryChildrenAssociations)
+    {
+        String requestBody = arrayToJson(Stream.of(secondaryChildrenAssociations).toList());
+        RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, requestBody, "nodes/{nodeId}/secondary-children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
        return restWrapper.processModels(RestNodeChildAssocModelCollection.class, request);
    }

    /**
-     * Delete secondary children using DELETE call 'nodes/{nodeId}/secondary-children/{childId}
+     * Removes secondary child association using DELETE call 'nodes/{nodeId}/secondary-children/{childId}'.
     *
-     * @return a collection of nodes
+     * @param secondaryChild - node, which should NOT be a secondary child anymore
     */
-    public void deleteSecondaryChild(RestNodeAssociationModel child)
+    public void removeSecondaryChild(RepoTestModel secondaryChild)
    {
-        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/secondary-children/{childId}?{parameters}", repoModel.getNodeRef(), child.getId(), restWrapper.getParameters());
+        removeSecondaryChild(null, secondaryChild);
+    }
+
+    /**
+     * Removes secondary child association using DELETE call 'nodes/{nodeId}/secondary-children/{childId}'.
+     *
+     * @param associationType - type of secondary parent-child relationship association
+     * @param secondaryChild - node, which should NOT be a secondary child anymore
+     */
+    public void removeSecondaryChild(String associationType, RepoTestModel secondaryChild)
+    {
+        RestNodeAssociationModel associationModel = new RestNodeAssociationModel();
+        RestNodeAssociationTypeModel associationTypeModel = new RestNodeAssociationTypeModel();
+        if (associationType != null)
+        {
+            associationTypeModel.setAssocType(associationType);
+        }
+        associationModel.setAssociation(associationTypeModel);
+        associationModel.setId(secondaryChild.getNodeRef());
+        removeSecondaryChild(associationModel);
+    }
+
+    /**
+     * Removes secondary child association using DELETE call 'nodes/{nodeId}/secondary-children/{childId}'.
+     *
+     * @param secondaryChildAssociation - node's secondary parent-child association to remove
+     */
+    public void removeSecondaryChild(RestNodeAssociationModel secondaryChildAssociation)
+    {
+        String parameters = StringUtils.isNotEmpty(secondaryChildAssociation.getAssociation().getAssocType()) ?
+            "assocType=" + secondaryChildAssociation.getAssociation().getAssocType() + "&" + restWrapper.getParameters() :
+            restWrapper.getParameters();
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/secondary-children/{childId}?{parameters}", repoModel.getNodeRef(), secondaryChildAssociation.getId(), parameters);
        restWrapper.processEmptyModel(request);
    }

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/ResponseHighlightModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/ResponseHighlightModel.java
@@ -44,6 +44,7 @@
 package org.alfresco.rest.search;

 import java.util.List;
+import java.util.Objects;

 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.utility.model.TestModel;
@@ -52,11 +53,11 @@ import org.alfresco.utility.model.TestModel;
 * @author Michael Suzuki
 *
 */
-public class ResponseHighLightModel extends TestModel implements IRestModel<ResponseHighLightModel>
+public class ResponseHighlightModel extends TestModel implements IRestModel<ResponseHighlightModel>
 {
-    private ResponseHighLightModel model;
+    private ResponseHighlightModel model;
    private String field;
-    private List<Object> snippets;
+    private List<String> snippets;
    
    public String getField()
    {
@@ -66,19 +67,44 @@ public class ResponseHighLightModel extends TestModel implements IRestModel<Resp
    {
        this.field = field;
    }
-    public List<Object> getSnippets()
+    public List<String> getSnippets()
    {
        return snippets;
    }
-    public void setSnippets(List<Object> snippets)
+    public void setSnippets(List<String> snippets)
    {
        this.snippets = snippets;
    }
    @Override
-    public ResponseHighLightModel onModel()
+    public ResponseHighlightModel onModel()
    {
        return model;
    }
-    

+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        ResponseHighlightModel that = (ResponseHighlightModel) o;
+        return Objects.equals(model, that.model) && Objects.equals(field, that.field) && Objects.equals(snippets, that.snippets);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(model, field, snippets);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "ResponseHighlightModel{model=%s, field=%s, snippets=%s}".formatted(model, field, snippets);
+    }
 }
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFieldsModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFieldsModel.java
@@ -2,7 +2,7 @@
 * #%L
 * alfresco-tas-restapi
 * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software. 
 * If the software was purchased under a paid Alfresco license, the terms of 
@@ -23,24 +23,6 @@
 * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
 * #L%
 */
-/*
- * Copyright (C) 2017 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * 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/>.
- */
 package org.alfresco.rest.search;

 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -55,23 +37,43 @@ import org.alfresco.utility.model.TestModel;
 */
 public class RestRequestFieldsModel extends TestModel implements IRestModel<RestRequestFieldsModel>
 {
-    public RestRequestFieldsModel(){}
-    
-    public RestRequestFieldsModel(String fieldValue)
-    {
-        this.field = fieldValue;
-    }
    
    @JsonProperty(value = "entry")
    RestRequestFieldsModel model;

+    @JsonProperty(required = true)
+    private String field;
+    private String prefix;
+    private String postfix;
+    private Integer snippetCount;
+    private Integer fragmentSize;
+    private Boolean mergeContiguous;
+
+    public RestRequestFieldsModel() {
+        super();
+    }
+
+    public static RestRequestFieldsModel of(String field)
+    {
+        RestRequestFieldsModel fieldModel = new RestRequestFieldsModel();
+        fieldModel.setField(field);
+        return fieldModel;
+    }
+
+    public static RestRequestFieldsModel of(String field, String prefix, String postfix)
+    {
+        RestRequestFieldsModel fieldModel = new RestRequestFieldsModel();
+        fieldModel.setField(field);
+        fieldModel.setPrefix(prefix);
+        fieldModel.setPostfix(postfix);
+        return fieldModel;
+    }
+
    @Override
    public RestRequestFieldsModel onModel()
    {
        return model;
    }
-    @JsonProperty(required = true)
-    private String field;

    public String getField()
    {
@@ -82,8 +84,116 @@ public class RestRequestFieldsModel extends TestModel implements IRestModel<Rest
    {
        this.field = field;
    }
-    
-    

+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix)
+    {
+        this.prefix = prefix;
+    }
+
+    public String getPostfix()
+    {
+        return postfix;
+    }
+
+    public void setPostfix(String postfix)
+    {
+        this.postfix = postfix;
+    }
+
+    public Integer getSnippetCount()
+    {
+        return snippetCount;
+    }
+
+    public void setSnippetCount(Integer snippetCount)
+    {
+        this.snippetCount = snippetCount;
+    }
+
+    public Integer getFragmentSize()
+    {
+        return fragmentSize;
+    }
+
+    public void setFragmentSize(Integer fragmentSize)
+    {
+        this.fragmentSize = fragmentSize;
+    }
+
+    public Boolean getMergeContiguous()
+    {
+        return mergeContiguous;
+    }
+
+    public void setMergeContiguous(Boolean mergeContiguous)
+    {
+        this.mergeContiguous = mergeContiguous;
+    }
+
+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public static class Builder
+    {
+        private String field;
+        private String prefix;
+        private String postfix;
+        private Integer snippetCount;
+        private Integer fragmentSize;
+        private Boolean mergeContiguous;
+
+        public Builder field(String field)
+        {
+            this.field = field;
+            return this;
+        }
+
+        public Builder prefix(String prefix)
+        {
+            this.prefix = prefix;
+            return this;
+        }
+
+        public Builder postfix(String postfix)
+        {
+            this.postfix = postfix;
+            return this;
+        }
+
+        public Builder snippetCount(Integer snippetCount)
+        {
+            this.snippetCount = snippetCount;
+            return this;
+        }
+        public Builder fragmentSize(Integer fragmentSize)
+        {
+            this.fragmentSize = fragmentSize;
+            return this;
+        }
+
+        public Builder mergeContiguous(Boolean mergeContiguous)
+        {
+            this.mergeContiguous = mergeContiguous;
+            return this;
+        }
+
+        public RestRequestFieldsModel build()
+        {
+            RestRequestFieldsModel fieldModel = new RestRequestFieldsModel();
+            fieldModel.setField(field);
+            fieldModel.setPrefix(prefix);
+            fieldModel.setPostfix(postfix);
+            fieldModel.setSnippetCount(snippetCount);
+            fieldModel.setFragmentSize(fragmentSize);
+            fieldModel.setMergeContiguous(mergeContiguous);
+            return fieldModel;
+        }
+    }
 }
- 
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestHighlightModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestHighlightModel.java
@@ -2,29 +2,30 @@
 * #%L
 * alfresco-tas-restapi
 * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 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 
+ * 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.search;

+import java.util.Arrays;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,62 +34,38 @@ import org.alfresco.rest.core.IRestModel;
 import org.alfresco.utility.model.TestModel;

 /**
- * Generated by 'msuzuki' on '2017-02-23 13:41' from 'Alfresco Search REST API' swagger file 
+ * Generated by 'msuzuki' on '2017-02-23 13:41' from 'Alfresco Search REST API' swagger file
 * Generated from 'Alfresco Search REST API' swagger file
 * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
 */
 public class RestRequestHighlightModel extends TestModel implements IRestModel<RestRequestHighlightModel>
 {
-    @JsonProperty(value = "entry")
+    @JsonProperty("entry")
    RestRequestHighlightModel model;

+    /** The string used to mark the start of a highlight in a fragment. */
+    private String prefix;
+    /** The string used to mark the end of a highlight in a fragment. */
+    private String postfix;
+    /** The maximum number of distinct highlight snippets to return for each highlight field. */
+    private int snippetCount;
+    /** The character length of each snippet. */
+    private int fragmentSize;
+    /** The number of characters to be considered for highlighting. Matches after this count will not be shown. */
+    private int maxAnalyzedChars;
+    /** If fragments overlap they can be merged into one larger fragment */
+    private boolean mergeContiguous;
+    /** Should phrases be identified. */
+    private boolean usePhraseHighlighter;
+    /** The fields to highlight and field specific configuration properties for each field */
+    private List<RestRequestFieldsModel> fields;
+
    @Override
    public RestRequestHighlightModel onModel()
    {
        return model;
    }

-    /**
-    The string used to mark the start of a highlight in a fragment.
-    */	        
-
-    private String prefix;	    
-    /**
-    The string used to mark the end of a highlight in a fragment.
-    */	        
-
-    private String postfix;	    
-    /**
-    The maximum number of distinct highlight snippets to return for each highlight field.
-    */	        
-
-    private int snippetCount;	    
-    /**
-    The character length of each snippet.
-    */	        
-
-    private int fragmentSize;	    
-    /**
-    The number of characters to be considered for highlighting. Matches after this count will not be shown.
-    */	        
-
-    private int maxAnalyzedChars;	    
-    /**
-    If fragments over lap they can be  merged into one larger fragment
-    */	        
-
-    private boolean mergeContiguous;	    
-    /**
-    Should phrases be identified.
-    */	        
-
-    private boolean usePhraseHighlighter;	    
-    /**
-    The fields to highlight and field specific configuration properties for each field
-    */	        
-
-    private List<RestRequestFieldsModel> fields;	    
-
    public String getPrefix()
    {
        return this.prefix;
@@ -97,7 +74,7 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setPrefix(String prefix)
    {
        this.prefix = prefix;
-    }				
+    }

    public String getPostfix()
    {
@@ -107,7 +84,7 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setPostfix(String postfix)
    {
        this.postfix = postfix;
-    }				
+    }

    public int getSnippetCount()
    {
@@ -117,7 +94,7 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setSnippetCount(int snippetCount)
    {
        this.snippetCount = snippetCount;
-    }				
+    }

    public int getFragmentSize()
    {
@@ -127,7 +104,7 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setFragmentSize(int fragmentSize)
    {
        this.fragmentSize = fragmentSize;
-    }				
+    }

    public int getMaxAnalyzedChars()
    {
@@ -137,9 +114,9 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setMaxAnalyzedChars(int maxAnalyzedChars)
    {
        this.maxAnalyzedChars = maxAnalyzedChars;
-    }				
+    }

-    public boolean getMergeContiguous()
+    public boolean isMergeContiguous()
    {
        return this.mergeContiguous;
    }
@@ -147,9 +124,9 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setMergeContiguous(boolean mergeContiguous)
    {
        this.mergeContiguous = mergeContiguous;
-    }				
+    }

-    public boolean getUsePhraseHighlighter()
+    public boolean isUsePhraseHighlighter()
    {
        return this.usePhraseHighlighter;
    }
@@ -157,7 +134,7 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setUsePhraseHighlighter(boolean usePhraseHighlighter)
    {
        this.usePhraseHighlighter = usePhraseHighlighter;
-    }				
+    }

    public List<RestRequestFieldsModel> getFields()
    {
@@ -167,6 +144,91 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R
    public void setFields(List<RestRequestFieldsModel> fields)
    {
        this.fields = fields;
-    }				
+    }
+
+    public static RestRequestHighlightModelBuilder builder()
+    {
+        return new RestRequestHighlightModelBuilder();
+    }
+
+    public static class RestRequestHighlightModelBuilder
+    {
+        private String prefix;
+        private String postfix;
+        private int snippetCount;
+        private int fragmentSize;
+        private int maxAnalyzedChars;
+        private boolean mergeContiguous;
+        private boolean usePhraseHighlighter;
+        private List<RestRequestFieldsModel> fields;
+
+        public RestRequestHighlightModelBuilder prefix(String prefix)
+        {
+            this.prefix = prefix;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder postfix(String postfix)
+        {
+            this.postfix = postfix;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder snippetCount(int snippetCount)
+        {
+            this.snippetCount = snippetCount;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder fragmentSize(int fragmentSize)
+        {
+            this.fragmentSize = fragmentSize;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder maxAnalyzedChars(int maxAnalyzedChars)
+        {
+            this.maxAnalyzedChars = maxAnalyzedChars;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder mergeContinuous(boolean mergeContiguous)
+        {
+            this.mergeContiguous = mergeContiguous;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder usePhraseHighlighter(boolean usePhraseHighlighter)
+        {
+            this.usePhraseHighlighter = usePhraseHighlighter;
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder fields(List<String> fields)
+        {
+            this.fields = fields.stream().map(RestRequestFieldsModel::of).toList();
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder fields(RestRequestFieldsModel... fields)
+        {
+            this.fields = Arrays.stream(fields).toList();
+            return this;
+        }
+
+        public RestRequestHighlightModel build()
+        {
+            RestRequestHighlightModel highlightModel = new RestRequestHighlightModel();
+            highlightModel.setPrefix(prefix);
+            highlightModel.setPostfix(postfix);
+            highlightModel.setSnippetCount(snippetCount);
+            highlightModel.setFragmentSize(fragmentSize);
+            highlightModel.setMaxAnalyzedChars(maxAnalyzedChars);
+            highlightModel.setMergeContiguous(mergeContiguous);
+            highlightModel.setUsePhraseHighlighter(usePhraseHighlighter);
+            highlightModel.setFields(fields);
+            return highlightModel;
+        }
+    }
 }
 
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchScoreModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchScoreModel.java
@@ -60,7 +60,7 @@ public class SearchScoreModel extends TestModel implements IRestModel<SearchScor
    @JsonProperty(required = true)
    private float score;
    
-    private List<ResponseHighLightModel> highlight;
+    private List<ResponseHighlightModel> highlight;

    public float getScore()
    {
@@ -78,12 +78,12 @@ public class SearchScoreModel extends TestModel implements IRestModel<SearchScor
        return this;
    }

-    public List<ResponseHighLightModel> getHighlight()
+    public List<ResponseHighlightModel> getHighlight()
    {
        return highlight;
    }

-    public void setHighlight(List<ResponseHighLightModel> highlight)
+    public void setHighlight(List<ResponseHighlightModel> highlight)
    {
        this.highlight = highlight;
    }
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java
@@ -125,11 +125,10 @@ public class NodesParentChildrenTests extends RestTest
        RestNodeChildAssociationModel childAssoc1 = new RestNodeChildAssociationModel(nodesBuilder.getNode("f1").getId(), "cm:contains");
        RestNodeChildAssociationModel childAssoc2 = new RestNodeChildAssociationModel(nodesBuilder.getNode("f2").getId(), "cm:contains");
        RestNodeChildAssociationModel childAssoc3 = new RestNodeChildAssociationModel(nodesBuilder.getNode("f3").getId(), "cm:preferenceImage");
-        String secondaryChildrenBody = "[" + childAssoc1.toJson() + "," + childAssoc2.toJson() + "," + childAssoc3.toJson() + "]";

        STEP("3. Create secondary child associations using POST /nodes/{nodeId}/secondary-children");
        RestNodeChildAssocModelCollection secondaryChildAssoc = restClient.withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel())
-                .createSecondaryChildren(secondaryChildrenBody);
+            .addSecondaryChildren(childAssoc1, childAssoc2, childAssoc3);
        restClient.assertStatusCodeIs(HttpStatus.CREATED);
        secondaryChildAssoc.getEntryByIndex(0).assertThat().field("childId").is(childAssoc1.getChildId());
        secondaryChildAssoc.getEntryByIndex(1).assertThat().field("childId").is(childAssoc2.getChildId());
@@ -142,7 +141,7 @@ public class NodesParentChildrenTests extends RestTest
        secondaryChildren.assertThat().entriesListCountIs(2);

        STEP("5. Check using DELETE /nodes/{nodeId}/secondary-children/{childId} that a secondary child can be deleted");
-        restClient.withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel()).deleteSecondaryChild(secondaryChildren.getEntryByIndex(0));
+        restClient.withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel()).removeSecondaryChild(secondaryChildren.getEntryByIndex(0));
        restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT);

        STEP("6. Check using GET /nodes/{nodeId}/secondary-children that a secondary child association was deleted");
@@ -182,7 +181,7 @@ public class NodesParentChildrenTests extends RestTest

        STEP("2. Create secondary child associations using POST /nodes/{nodeId}/secondary-children");
        RestNodeChildAssociationModel childAssoc = new RestNodeChildAssociationModel(nodesBuilder.getNode("f1").getId(), "cm:contains");
-        restClient.withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel()).createSecondaryChildren(childAssoc.toJson());
+        restClient.withCoreAPI().usingNode(nodesBuilder.getNode("F1").toContentModel()).addSecondaryChild(childAssoc);
        restClient.assertStatusCodeIs(HttpStatus.CREATED);

        STEP("3. Get all parents for file 'f1' - both primary and secondary");
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java
@@ -11,6 +11,7 @@ import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;

 import java.util.List;
@@ -47,8 +48,9 @@ public class GetProcessesCoreTests extends RestTest

    @TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW,TestGroup.PROCESSES }, executionType = ExecutionType.REGRESSION, 
            description = "Verify user gets all processes started by him ordered descending by id")
-    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.REGRESSION })
-    public void getProcessesOrderedByIdDESC() throws Exception
+    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.REGRESSION }, enabled = false)
+    @Ignore("Until ACS-6234 is done")
+    public void getProcessesOrderedByIdDESC()
    {
        RestProcessModelsCollection processes = restClient.authenticateUser(userWhoStartsTask).withParams("orderBy=id DESC")
                .withWorkflowAPI().getProcesses();
--- 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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>23.1.0.211</version>
+    <version>23.1.0.256-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -51,13 +51,14 @@
        <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-core.version>5.0.0</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.0.0</dependency.alfresco-transform-service.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.acs-event-model.version>0.0.24</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.spring.version>6.0.12</dependency.spring.version>
+        <dependency.spring-security.version>6.1.4</dependency.spring-security.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>
@@ -66,23 +67,21 @@
        <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.org-json.version>20231013</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.commons-io.version>2.14.0</dependency.commons-io.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>
        <dependency.httpcomponents-httpclient5.version>5.2.1</dependency.httpcomponents-httpclient5.version>
-        <dependency.httpcomponents-httpcore5.version>5.2.2</dependency.httpcomponents-httpcore5.version>
+        <dependency.httpcomponents-httpcore5.version>5.2.3</dependency.httpcomponents-httpcore5.version>
        <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
        <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
-        <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
+        <dependency.slf4j.version>2.0.9</dependency.slf4j.version>
        <dependency.log4j.version>2.20.0</dependency.log4j.version>
-        <dependency.gytheio.version>0.20.0-A1</dependency.gytheio.version>
        <dependency.groovy.version>3.0.19</dependency.groovy.version>
        <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>6.1.3</dependency.spring-security.version>
        <dependency.truezip.version>7.7.10</dependency.truezip.version>
        <dependency.poi.version>5.2.2</dependency.poi.version>
        <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
@@ -90,19 +89,17 @@
        <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>
-        <dependency.java-ee-jaxb-api.version>2.3.3</dependency.java-ee-jaxb-api.version>
        <dependency.jakarta-ws-api.version>3.0.1</dependency.jakarta-ws-api.version>
        <dependency.jakarta-soap-api.version>2.0.1</dependency.jakarta-soap-api.version>
        <dependency.jakarta-annotation-api.version>2.1.1</dependency.jakarta-annotation-api.version>
@@ -116,11 +113,9 @@
        <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.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.googledrive.version>4.0.0</alfresco.googledrive.version>
+        <alfresco.aos-module.version>2.0.0</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>23.1.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</license-maven-plugin.version>
@@ -130,7 +125,7 @@
        <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.21</dependency.tas-webdav.version>
        <dependency.tas-ftp.version>1.19</dependency.tas-ftp.version>
@@ -157,7 +152,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.211</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -220,12 +215,6 @@
                <version>${dependency.jakarta-jws-api.version}</version>
            </dependency>

-<!--            <dependency>-->
-<!--                <groupId>com.sun.mail</groupId>-->
-<!--                <artifactId>javax.mail</artifactId>-->
-<!--                <version>${dependency.java-ee-mail.version}</version>-->
-<!--            </dependency>-->
-
            <dependency>
                <groupId>com.sun.mail</groupId>
                <artifactId>jakarta.mail</artifactId>
@@ -288,17 +277,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>
@@ -595,7 +573,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>
@@ -932,21 +910,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>
@@ -961,7 +924,7 @@
            <dependency>
                <groupId>org.projectlombok</groupId>
                <artifactId>lombok</artifactId>
-                <version>1.18.28</version>
+                <version>1.18.30</version>
                <scope>provided</scope>
            </dependency>
            <dependency>
@@ -997,6 +960,16 @@
    <build>
        <pluginManagement>
            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.11.0</version>
+                    <configuration>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
+                    </configuration>
+                </plugin>
                <!-- Ensure consistent maven-release-plugin version-->
                <plugin>
                    <artifactId>maven-release-plugin</artifactId>
@@ -1008,7 +981,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>
@@ -1065,7 +1038,7 @@
                            <configuration>
                                <failOnMissing>true</failOnMissing>
                                <excludedScopes>provided,test</excludedScopes>
-                                <excludedGroups>^(org\.alfresco|com\.alfresco|org\.activiti|org\.gytheio).*</excludedGroups>
+                                <excludedGroups>^(org\.alfresco|com\.alfresco|org\.activiti).*</excludedGroups>
                                <failIfWarning>true</failIfWarning>
                                <includedLicenses>
                                    https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
@@ -1164,4 +1137,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.211</version>
+        <version>23.1.0.256-SNAPSHOT</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.211</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -560,21 +560,6 @@
            <artifactId>alfresco-sync-events</artifactId>
            <version>1.2.14</version>
        </dependency>
-        <dependency>
-            <groupId>org.gytheio</groupId>
-            <artifactId>gytheio-messaging-camel</artifactId>
-            <version>${dependency.gytheio.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-jackson</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-core</artifactId>
@@ -746,18 +731,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>
@@ -889,6 +862,9 @@
                    <showWeaveInfo>true</showWeaveInfo>
                    <source>1.8</source>
                    <target>1.8</target>
+                    <additionalCompilerArgs>
+                        <arg>-parameters</arg>
+                    </additionalCompilerArgs>
                </configuration>
                <dependencies>
                    <dependency>
--- a/repository/src/main/java/org/alfresco/messaging/LoggingDeadLetterQueue.java
+++ b/repository/src/main/java/org/alfresco/messaging/LoggingDeadLetterQueue.java
@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2023 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.messaging;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoggingDeadLetterQueue
+{
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingDeadLetterQueue.class);
+
+    public void onReceive(Object message)
+    {
+        if (message != null)
+        {
+            LOG.debug("Received:\n\n{}}\n\n", message);
+        }
+    }
+}
--- a/repository/src/main/java/org/alfresco/messaging/jackson/ObjectMapperFactory.java
+++ b/repository/src/main/java/org/alfresco/messaging/jackson/ObjectMapperFactory.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2023 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.messaging.jackson;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serial;
+import java.io.StringWriter;
+
+import org.apache.commons.io.IOUtils;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+public class ObjectMapperFactory
+{
+    private ObjectMapperFactory()
+    {
+        //no instantiation
+    }
+
+    public static ObjectMapper createInstance()
+    {
+        QpidJsonBodyCleanerObjectMapper mapper = new QpidJsonBodyCleanerObjectMapper();
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+        return mapper;
+    }
+
+    private static class QpidJsonBodyCleanerObjectMapper extends ObjectMapper
+    {
+        @Serial
+        private static final long serialVersionUID = 2568701685293341501L;
+
+        private static final String DEFAULT_ENCODING = "utf8";
+
+        public <T> T readValue(InputStream inputStream, Class<T> valueType) throws IOException
+        {
+            try
+            {
+                // Try to unmarshal normally
+                if (inputStream.markSupported())
+                {
+                    inputStream.mark(1024 * 512);
+                }
+                return super.readValue(inputStream, valueType);
+            }
+            catch (JsonParseException e)
+            {
+                if (!inputStream.markSupported())
+                {
+                    // We can't reset this stream, bail out
+                    throw e;
+                }
+                // Reset the stream
+                inputStream.reset();
+            }
+            // Clean the message body and try again
+            StringWriter writer = new StringWriter();
+            IOUtils.copy(inputStream, writer, DEFAULT_ENCODING);
+            String content = writer.toString();
+            content = content.substring(content.indexOf('{'));
+            return readValue(content, valueType);
+        }
+    }
+}
--- 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/event2/EventGenerator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
@@ -311,12 +311,24 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
    public void onCreateChildAssociation(ChildAssociationRef childAssociationRef, boolean isNewNode)
    {
        getEventConsolidator(childAssociationRef).onCreateChildAssociation(childAssociationRef, isNewNode);
+        if (!childAssociationRef.isPrimary())
+        {
+            // if this is a secondary relationship simulate node move event to store state of previous secondary parents
+            ChildAssociationRef oldChildAssociationRef = childAssociationWithoutParentOf(childAssociationRef);
+            getEventConsolidator(childAssociationRef.getChildRef()).onMoveNode(oldChildAssociationRef, childAssociationRef);
+        }
    }

    @Override
    public void beforeDeleteChildAssociation(ChildAssociationRef childAssociationRef)
    {
        getEventConsolidator(childAssociationRef).beforeDeleteChildAssociation(childAssociationRef);
+        if (!childAssociationRef.isPrimary())
+        {
+            // if this is a secondary relationship simulate node move event to store state of previous secondary parents
+            ChildAssociationRef newChildAssociationRef = childAssociationWithoutParentOf(childAssociationRef);
+            getEventConsolidator(childAssociationRef.getChildRef()).onMoveNode(childAssociationRef, newChildAssociationRef);
+        }
    }

    @Override
@@ -503,6 +515,18 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin
        return ZonedDateTime.ofInstant(commitTimeMs, ZoneOffset.UTC);
    }

+    private static ChildAssociationRef childAssociationWithoutParentOf(ChildAssociationRef childAssociationRef)
+    {
+        return new ChildAssociationRef(
+            null,
+            null,
+            childAssociationRef.getQName(),
+            childAssociationRef.getChildRef(),
+            childAssociationRef.isPrimary(),
+            childAssociationRef.getNthSibling()
+        );
+    }
+
    @Override
    protected void onBootstrap(ApplicationEvent applicationEvent)
    {
--- a/repository/src/main/java/org/alfresco/repo/event2/NodeEventConsolidator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/NodeEventConsolidator.java
@@ -65,6 +65,7 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
    private QName nodeType;
    private QName nodeTypeBefore;
    private List<String> primaryHierarchyBefore;
+    private List<String> secondaryParentsBefore;
    private boolean resourceBeforeAllFieldsNull = true;

    public NodeEventConsolidator(NodeResourceHelper nodeResourceHelper)
@@ -144,7 +145,25 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
        eventTypes.add(EventType.NODE_UPDATED);

        createBuilderIfAbsent(newChildAssocRef.getChildRef());
-        setBeforePrimaryHierarchy(helper.getPrimaryHierarchy(oldChildAssocRef.getParentRef(), true));
+        if (newChildAssocRef.isPrimary())
+        {
+            setBeforePrimaryHierarchy(helper.getPrimaryHierarchy(oldChildAssocRef.getParentRef(), true));
+        }
+        else
+        {
+            List<String> secondaryParents = helper.getSecondaryParents(newChildAssocRef.getChildRef());
+            if (newChildAssocRef.getParentRef() != null)
+            {
+                // on create secondary child association event takes place - recreate secondary parents previous state
+                secondaryParents.remove(newChildAssocRef.getParentRef().getId());
+            }
+            else if(oldChildAssocRef.getParentRef() != null && !secondaryParents.contains(oldChildAssocRef.getParentRef().getId()))
+            {
+                // before remove secondary child association event takes place - recreate secondary parents previous state
+                secondaryParents.add(oldChildAssocRef.getParentRef().getId());
+            }
+            setSecondaryParentsBefore(secondaryParents);
+        }
    }

    @Override
@@ -174,7 +193,7 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
    public void beforeDeleteNode(NodeRef nodeRef)
    {
        eventTypes.add(EventType.NODE_DELETED);
-        createBuilderIfAbsent(nodeRef, false);
+        createBuilderIfAbsent(nodeRef);
    }

    @Override
@@ -240,6 +259,19 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
        }
    }

+    private void setSecondaryParentsBefore(List<String> secondaryParents)
+    {
+        if (this.secondaryParentsBefore == null)
+        {
+            this.secondaryParentsBefore = secondaryParents;
+        }
+    }
+
+    List<String> getSecondaryParentsBefore()
+    {
+        return secondaryParentsBefore;
+    }
+
    private NodeResource buildNodeResource()
    {
        if (resourceBuilder == null)
@@ -283,7 +315,7 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
                resourceBeforeAllFieldsNull = false;
            }

-            Map<String, Map<String, String>> localizedProps =helper.getLocalizedPropertiesBefore(changedPropsBefore, after);
+            Map<String, Map<String, String>> localizedProps = helper.getLocalizedPropertiesBefore(changedPropsBefore, after);
            if (!localizedProps.isEmpty())
            {
                builder.setLocalizedProperties(localizedProps);
@@ -309,8 +341,7 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
                builder.setModifiedByUser(modifier);
                resourceBeforeAllFieldsNull = false;
            }
-            modifiedAt =
-                        helper.getZonedDateTime((Date) changedPropsBefore.get(ContentModel.PROP_MODIFIED));
+            modifiedAt = helper.getZonedDateTime((Date) changedPropsBefore.get(ContentModel.PROP_MODIFIED));
        }

        // Handle case where the content does not exist on the propertiesBefore
@@ -334,6 +365,12 @@ public class NodeEventConsolidator extends EventConsolidator<NodeRef, NodeResour
            resourceBeforeAllFieldsNull = false;
        }

+        if (secondaryParentsBefore != null)
+        {
+            builder.setSecondaryParents(secondaryParentsBefore);
+            resourceBeforeAllFieldsNull = false;
+        }
+
        if (nodeTypeBefore != null)
        {
            builder.setNodeType(helper.getQNamePrefixString(nodeTypeBefore));
--- a/repository/src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java
@@ -26,6 +26,7 @@
 package org.alfresco.repo.event2;

 import static java.util.Optional.ofNullable;
+import static java.util.function.Predicate.not;

 import java.io.Serializable;
 import java.time.ZoneId;
@@ -38,6 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;

 import com.google.common.collect.Sets;

@@ -145,21 +147,23 @@ public class NodeResourceHelper implements InitializingBean
        // minor: save one lookup if creator & modifier are the same
        Map<String, UserInfo> mapUserCache = new HashMap<>(2);

-        return NodeResource.builder().setId(nodeRef.getId())
-                           .setName((String) properties.get(ContentModel.PROP_NAME))
-                           .setNodeType(getQNamePrefixString(type))
-                           .setIsFile(isSubClass(type, ContentModel.TYPE_CONTENT))
-                           .setIsFolder(isSubClass(type, ContentModel.TYPE_FOLDER))
-                           .setCreatedByUser(getUserInfo((String) properties.get(ContentModel.PROP_CREATOR), mapUserCache))
-                           .setCreatedAt(getZonedDateTime((Date)properties.get(ContentModel.PROP_CREATED)))
-                           .setModifiedByUser(getUserInfo((String) properties.get(ContentModel.PROP_MODIFIER), mapUserCache))
-                           .setModifiedAt(getZonedDateTime((Date)properties.get(ContentModel.PROP_MODIFIED)))
-                           .setContent(getContentInfo(properties))
-                           .setPrimaryAssocQName(getPrimaryAssocQName(nodeRef))
-                           .setPrimaryHierarchy(PathUtil.getNodeIdsInReverse(path, false))
-                           .setProperties(mapToNodeProperties(properties))
-                           .setLocalizedProperties(mapToNodeLocalizedProperties(properties))
-                           .setAspectNames(getMappedAspects(nodeRef));
+        return NodeResource.builder()
+            .setId(nodeRef.getId())
+            .setName((String) properties.get(ContentModel.PROP_NAME))
+            .setNodeType(getQNamePrefixString(type))
+            .setIsFile(isSubClass(type, ContentModel.TYPE_CONTENT))
+            .setIsFolder(isSubClass(type, ContentModel.TYPE_FOLDER))
+            .setCreatedByUser(getUserInfo((String) properties.get(ContentModel.PROP_CREATOR), mapUserCache))
+            .setCreatedAt(getZonedDateTime((Date)properties.get(ContentModel.PROP_CREATED)))
+            .setModifiedByUser(getUserInfo((String) properties.get(ContentModel.PROP_MODIFIER), mapUserCache))
+            .setModifiedAt(getZonedDateTime((Date)properties.get(ContentModel.PROP_MODIFIED)))
+            .setContent(getContentInfo(properties))
+            .setPrimaryAssocQName(getPrimaryAssocQName(nodeRef))
+            .setPrimaryHierarchy(PathUtil.getNodeIdsInReverse(path, false))
+            .setProperties(mapToNodeProperties(properties))
+            .setLocalizedProperties(mapToNodeLocalizedProperties(properties))
+            .setAspectNames(getMappedAspects(nodeRef))
+            .setSecondaryParents(getSecondaryParents(nodeRef));
    }

    private boolean isSubClass(QName className, QName ofClassQName)
@@ -413,6 +417,21 @@ public class NodeResourceHelper implements InitializingBean
        return PathUtil.getNodeIdsInReverse(path, showLeaf);
    }

+    /**
+     * Gathers node's secondary parents.
+     *
+     * @param nodeRef - node reference
+     * @return a list of node's secondary parents.
+     */
+    public List<String> getSecondaryParents(final NodeRef nodeRef)
+    {
+        return nodeService.getParentAssocs(nodeRef).stream()
+            .filter(not(ChildAssociationRef::isPrimary))
+            .map(ChildAssociationRef::getParentRef)
+            .map(NodeRef::getId)
+            .collect(Collectors.toList());
+    }
+
    public PermissionService getPermissionService()
    {
        return permissionService;
--- a/repository/src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * If the software was purchased under a paid Alfresco license, the terms of
@@ -48,19 +48,31 @@ public class NodePropertyFilter extends AbstractNodeEventFilter
                                                                      ContentModel.PROP_CREATOR,
                                                                      ContentModel.PROP_CREATED,
                                                                      ContentModel.PROP_CONTENT);
+    // These properties should not be excluded from the properties object
+    private static final Set<QName> ALLOWED_PROPERTIES = Set.of(ContentModel.PROP_CASCADE_TX,
+                                                                ContentModel.PROP_CASCADE_CRC);

-    private final List<String> nodeAspectsBlackList;
+    private final List<String> nodePropertiesBlackList;

    public NodePropertyFilter()
    {
-        this.nodeAspectsBlackList = parseFilterList(FILTERED_PROPERTIES);
+        this.nodePropertiesBlackList = parseFilterList(FILTERED_PROPERTIES);
    }

    @Override
    public Set<QName> getExcludedTypes()
    {
        Set<QName> result = new HashSet<>(EXCLUDED_TOP_LEVEL_PROPS);
-        nodeAspectsBlackList.forEach(nodeAspect -> result.addAll(expandTypeDef(nodeAspect)));
+        nodePropertiesBlackList.forEach(nodeProperty-> result.addAll(expandTypeDef(nodeProperty)));
        return result;
    }
+
+    @Override
+    public boolean isExcluded(QName qName)
+    {
+        if(qName != null && ALLOWED_PROPERTIES.contains(qName)){
+            return false;
+        }
+        return super.isExcluded(qName);
+    }
 }
--- a/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java
+++ b/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java
@@ -74,8 +74,6 @@ import org.alfresco.util.transaction.TransactionSupportUtil;
 import org.apache.chemistry.opencmis.commons.server.CallContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.gytheio.messaging.MessageProducer;
-import org.gytheio.messaging.MessagingException;

 import com.google.common.base.Splitter;
 import com.google.common.collect.Sets;
@@ -294,7 +292,7 @@ public abstract class AbstractEventsService extends TransactionListenerAdapter
    }

    /**
-     * Filter out event before sending them to {@link org.gytheio.messaging.MessageProducer}
+     * Filter out event before sending them to {@link MessageProducer}
     * 
     * @param events the events to be filtered
     * 
--- a/repository/src/main/java/org/alfresco/repo/events/CamelMessageProducer.java
+++ b/repository/src/main/java/org/alfresco/repo/events/CamelMessageProducer.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2023 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.events;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.camel.ProducerTemplate;
+
+class CamelMessageProducer implements MessageProducer
+{
+    private static final Map<String, Object> AMQP_HEADERS = Map.of("JMS_AMQP_MESSAGE_FORMAT", 0L);
+    private final ProducerTemplate producer;
+    private final String endpoint;
+
+    CamelMessageProducer(ProducerTemplate producer, String endpoint)
+    {
+        this.producer = Objects.requireNonNull(producer);
+        this.endpoint = Objects.requireNonNull(endpoint);
+    }
+
+    @Override
+    public void send(Object message)
+    {
+        try
+        {
+            producer.sendBodyAndHeaders(endpoint, message, AMQP_HEADERS);
+        }
+        catch (Exception e)
+        {
+            throw new MessagingException("Could not send message", e);
+        }
+    }
+}
--- a/repository/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java
@@ -30,8 +30,6 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.gytheio.messaging.MessageProducer;
-import org.gytheio.messaging.MessagingException;

 public class ExceptionEventsServiceImpl extends AbstractEventsService implements ExceptionEventsService
 {
--- a/repository/src/main/java/org/alfresco/repo/events/MessageProducer.java
+++ b/repository/src/main/java/org/alfresco/repo/events/MessageProducer.java
@@ -0,0 +1,37 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2023 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.events;
+
+public interface MessageProducer
+{
+    /**
+     * Send the given POJO message to the default queue for the producer
+     *
+     * @param message message to send
+     * @throws MessagingException on failure
+     */
+    void send(Object message) throws MessagingException;
+}
--- a/repository/src/main/java/org/alfresco/repo/events/MessagingException.java
+++ b/repository/src/main/java/org/alfresco/repo/events/MessagingException.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2023 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.events;
+
+import java.io.Serial;
+import java.time.LocalDate;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class MessagingException extends RuntimeException
+{
+    @Serial
+    private static final long serialVersionUID = 8192266871339806688L;
+    private static final AtomicInteger ERROR_COUNTER = new AtomicInteger();
+
+    public MessagingException(String message, Throwable cause)
+    {
+        super(buildErrorLogNumber(message), cause);
+    }
+
+    private static String buildErrorLogNumber(String message)
+    {
+        final LocalDate today = LocalDate.now();
+        message = message == null ? "" : message;
+
+        return "%02d%02d%04d %s".formatted(today.getMonthValue(), today.getDayOfMonth(), ERROR_COUNTER.getAndIncrement(), message);
+    }
+}
--- a/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software. 
 * If the software was purchased under a paid Alfresco license, the terms of 
@@ -3203,13 +3203,16 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                    // Invoke policy behaviour
                    invokeBeforeUpdateNode(parentNodeRef);

+                    Map<QName, Serializable> propertiesBefore = nodeDAO.getNodeProperties(parentNodeId);
                    // Touch the node; it is cm:auditable
                    boolean changed = nodeDAO.setModifiedProperties(parentNodeId, modifiedDate, modifiedByToPropagate);

                    if (changed)
                    {
+                        Map<QName, Serializable> propertiesAfter = nodeDAO.getNodeProperties(parentNodeId);
                        // Invoke policy behaviour
                        invokeOnUpdateNode(parentNodeRef);
+                        invokeOnUpdateProperties(parentNodeRef, propertiesBefore, propertiesAfter);
                    }

                    return null;
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java
@@ -57,6 +57,7 @@ import com.nimbusds.jose.proc.JWSVerificationKeySelector;
 import com.nimbusds.jose.proc.SecurityContext;
 import com.nimbusds.jose.util.ResourceRetriever;
 import com.nimbusds.jwt.proc.ConfigurableJWTProcessor;
+import com.nimbusds.oauth2.sdk.id.Issuer;
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;

 import org.alfresco.repo.security.authentication.identityservice.IdentityServiceFacade.IdentityServiceFacadeException;
@@ -91,7 +92,9 @@ import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
 import org.springframework.security.oauth2.core.OAuth2TokenValidator;
+import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult;
 import org.springframework.security.oauth2.core.converter.ClaimTypeConverter;
 import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter;
 import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
@@ -99,7 +102,6 @@ import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.jwt.JwtClaimNames;
 import org.springframework.security.oauth2.jwt.JwtClaimValidator;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
-import org.springframework.security.oauth2.jwt.JwtIssuerValidator;
 import org.springframework.security.oauth2.jwt.JwtTimestampValidator;
 import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
 import org.springframework.web.client.RestOperations;
@@ -375,12 +377,18 @@ public class IdentityServiceFacadeFactoryBean implements FactoryBean<IdentitySer
                                           .map(OIDCProviderMetadata::getAuthorizationEndpointURI)
                                           .map(URI::toASCIIString)
                                           .orElse(null);
+
+            final String issuerUri = Optional.of(metadata)
+                    .map(OIDCProviderMetadata::getIssuer)
+                    .map(Issuer::getValue)
+                    .orElseGet(config::getIssuerUrl);
+
            return ClientRegistration
                    .withRegistrationId("ids")
                    .authorizationUri(authUri)
                    .tokenUri(metadata.getTokenEndpointURI().toASCIIString())
                    .jwkSetUri(metadata.getJWKSetURI().toASCIIString())
-                    .issuerUri(config.getIssuerUrl())
+                    .issuerUri(issuerUri)
                    .authorizationGrantType(AuthorizationGrantType.PASSWORD);
        }

@@ -565,6 +573,34 @@ public class IdentityServiceFacadeFactoryBean implements FactoryBean<IdentitySer
        }
    }

+    static class JwtIssuerValidator implements OAuth2TokenValidator<Jwt>
+    {
+        private final String requiredIssuer;
+
+        public JwtIssuerValidator(String issuer)
+        {
+            this.requiredIssuer = requireNonNull(issuer, "issuer cannot be null");
+        }
+
+        @Override
+        public OAuth2TokenValidatorResult validate(Jwt token)
+        {
+            requireNonNull(token, "token cannot be null");
+            final Object issuer = token.getClaim(JwtClaimNames.ISS);
+            if (issuer != null && requiredIssuer.equals(issuer.toString()))
+            {
+                return OAuth2TokenValidatorResult.success();
+            }
+
+            final OAuth2Error error = new OAuth2Error(
+                    OAuth2ErrorCodes.INVALID_TOKEN,
+                    "The iss claim is not valid. Expected `%s` but got `%s`.".formatted(requiredIssuer, issuer),
+                    "https://tools.ietf.org/html/rfc6750#section-3.1");
+            return OAuth2TokenValidatorResult.failure(error);
+        }
+
+    }
+
    private static boolean isDefined(String value)
    {
        return value != null && !value.isBlank();
--- 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
@@ -1221,7 +1221,7 @@ contentPropertyRestrictions.whitelist=
 repo.event2.enabled=true
 # Type and aspect filters which should be excluded
 # Note: System folders node types are added by default
-repo.event2.filter.nodeTypes=sys:*, fm:*, cm:thumbnail, cm:failedThumbnail, cm:rating, rma:rmsite include_subtypes
+repo.event2.filter.nodeTypes=sys:*, fm:*, cm:thumbnail, cm:failedThumbnail, cm:rating, rma:rmsite include_subtypes, usr:user
 repo.event2.filter.nodeAspects=sys:*
 repo.event2.filter.childAssocTypes=rn:rendition
 # Comma separated list of users which should be excluded
@@ -1231,6 +1231,7 @@ repo.event2.filter.users=
 repo.event2.topic.endpoint=amqp:topic:alfresco.repo.event2
 # Specifies if messages should be enqueued in in-memory queue or sent directly to the topic
 repo.event2.queue.skip=false
+#repo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2
 # Thread pool for async enqueue of repo events
 repo.event2.queue.enqueueThreadPool.priority=1
 repo.event2.queue.enqueueThreadPool.coreSize=8
@@ -1254,6 +1255,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/main/resources/alfresco/scheduled-jobs-context.xml
+++ b/repository/src/main/resources/alfresco/scheduled-jobs-context.xml
@@ -187,7 +187,7 @@
        <property name="startDelay" value="${system.cronJob.startDelayMilliseconds}"/>
        <property name="jobDetail">
            <bean id="upgradePasswordHashJobDetail" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
-                <property name="jobClass" value="org.alfresco.repo.admin.patch.AsynchronousPatch$AsynchronousPatchJob"/>
+                <property name="jobClass" value="org.alfresco.repo.security.authentication.UpgradePasswordHashWorker$UpgradePasswordHashJob"/>
                <property name="jobDataAsMap">
                    <map>
                        <entry key="upgradePasswordHashWorker" value-ref="upgradePasswordHashWorker"/>
--- a/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml
@@ -9,9 +9,9 @@
                           http://www.springframework.org/schema/tx      http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
                           http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">

-    <bean id="eventsDispatcher" class="org.gytheio.messaging.camel.CamelMessageProducer">
-        <property name="producer" ref="camelProducerTemplate" />
-        <property name="endpoint" value="direct:alfresco.events" />
+    <bean id="eventsDispatcher" class="org.alfresco.repo.events.CamelMessageProducer">
+        <constructor-arg ref="camelProducerTemplate" />
+        <constructor-arg value="direct:alfresco.events" />
    </bean>

    <bean id="eventsRegistry" class="org.alfresco.sync.events.EventRegistryImpl">
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -11,7 +11,7 @@

    <context:component-scan base-package="org.alfresco.messaging.camel.configuration"/>

-    <bean id="messagingObjectMapper" class="org.gytheio.messaging.jackson.ObjectMapperFactory"
+    <bean id="messagingObjectMapper" class="org.alfresco.messaging.jackson.ObjectMapperFactory"
        factory-method="createInstance" />
        
    <bean id="defaultDataFormat" class="org.apache.camel.component.jackson.JacksonDataFormat">
@@ -96,6 +96,6 @@
    </bean>
    
    <!-- In the default routes, this is where a message goes if no queue is specified -->
-    <bean id="deadLetterQueue" class="org.gytheio.messaging.LoggingDeadLetterQueue" />
+    <bean id="deadLetterQueue" class="org.alfresco.messaging.LoggingDeadLetterQueue" />
    
 </beans>
--- a/repository/src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java
+++ b/repository/src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java
@@ -158,7 +158,7 @@ public class AccessAuditorTest
                    {
                        Object[] args = invocation.getArguments();
                        Map<String, Serializable> auditMap = (Map<String, Serializable>)args[1];
-                        if ("/alfresco-access/transaction".equals(args[0]))
+                        if ("/alfresco-access/transaction".equals(args[0]) && !"updateNodeProperties".equals(auditMap.get("action")))
                        {
                            auditMapList.add(auditMap);
                        }
--- 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));
+            }
+        }
+    }
+}
--- a/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * If the software was purchased under a paid Alfresco license, the terms of
@@ -28,6 +28,7 @@ package org.alfresco.repo.event2;

 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.IntStream;

 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.ChildAssociationResource;
@@ -64,12 +65,11 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(),
            resultRepoEvent.getType());

-        retryingTransactionHelper.doInTransaction(() ->
-                                                      nodeService.addChild(
-                                                          parentNodeRef,
-                                                          childNodeRef,
-                                                          ContentModel.ASSOC_CONTAINS,
-                                                          QName.createQName(TEST_NAMESPACE, assocLocalName)));
+        retryingTransactionHelper.doInTransaction(() -> nodeService.addChild(
+            parentNodeRef,
+            childNodeRef,
+            ContentModel.ASSOC_CONTAINS,
+            QName.createQName(TEST_NAMESPACE, assocLocalName)));

        List<ChildAssociationRef> childAssociationRefs = retryingTransactionHelper.doInTransaction(() ->
                nodeService.getChildAssocs(parentNodeRef));
@@ -77,10 +77,32 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals(1, childAssociationRefs.size());
        assertFalse(childAssociationRefs.get(0).isPrimary());

-        checkNumOfEvents(3);
+        checkNumOfEvents(4);

-        final RepoEvent<EventData<ChildAssociationResource>> childAssocRepoEvent = getRepoEventWithoutWait(3);
+        // node event
+        final RepoEvent<EventData<NodeResource>> nodeRepoEvent = getRepoEventWithoutWait(3);
+        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(), nodeRepoEvent.getType());
+        assertNotNull("Repo event ID is not available.", nodeRepoEvent.getId());
+        assertNotNull("Source is not available", nodeRepoEvent.getSource());
+        assertEquals("Repo event source is not available.",
+            "/" + descriptorService.getCurrentRepositoryDescriptor().getId(),
+            nodeRepoEvent.getSource().toString());
+        assertNotNull("Repo event creation time is not available.", nodeRepoEvent.getTime());
+        assertEquals("Invalid repo event datacontenttype", "application/json",
+            nodeRepoEvent.getDatacontenttype());
+        assertNotNull(nodeRepoEvent.getDataschema());
+        assertEquals(EventJSONSchema.NODE_UPDATED_V1.getSchema(), nodeRepoEvent.getDataschema());

+        final EventData<NodeResource> nodeResourceEventData = getEventData(nodeRepoEvent);
+        assertNotNull("Event data group ID is not available. ", nodeResourceEventData.getEventGroupId());
+        assertNotNull("resourceBefore property is not available", nodeResourceEventData.getResourceBefore());
+
+        final NodeResource nodeResource = getNodeResource(nodeRepoEvent);
+        final NodeResource nodeResourceBefore = getNodeResourceBefore(nodeRepoEvent);
+        assertNotSame("Secondary parents actual and earlier state should differ", nodeResource.getSecondaryParents(), nodeResourceBefore.getSecondaryParents());
+
+        // child association event
+        final RepoEvent<EventData<ChildAssociationResource>> childAssocRepoEvent = getFilteredEvent(EventType.CHILD_ASSOC_CREATED, 0);
        assertEquals("Wrong repo event type.", EventType.CHILD_ASSOC_CREATED.getType(), childAssocRepoEvent.getType());
        assertNotNull("Repo event ID is not available.", childAssocRepoEvent.getId());
        assertNotNull("Source is not available", childAssocRepoEvent.getSource());
@@ -93,16 +115,18 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertNotNull(childAssocRepoEvent.getDataschema());
        assertEquals(EventJSONSchema.CHILD_ASSOC_CREATED_V1.getSchema(), childAssocRepoEvent.getDataschema());

-        final EventData<ChildAssociationResource> nodeResourceEventData = getEventData(childAssocRepoEvent);
-        // EventData attributes
-        assertNotNull("Event data group ID is not available. ", nodeResourceEventData.getEventGroupId());
-        assertNull("resourceBefore property is not available", nodeResourceEventData.getResourceBefore());
+        final EventData<ChildAssociationResource> childAssocResourceEventData = getEventData(childAssocRepoEvent);
+        assertNotNull("Event data group ID is not available. ", childAssocResourceEventData.getEventGroupId());
+        assertNull("resourceBefore property is not available", childAssocResourceEventData.getResourceBefore());

        final ChildAssociationResource childAssociationResource = getChildAssocResource(childAssocRepoEvent);
        assertEquals("Wrong parent", parentNodeRef.getId(), childAssociationResource.getParent().getId());
        assertEquals("Wrong child", childNodeRef.getId(), childAssociationResource.getChild().getId());
        assertEquals("Wrong assoc type", "cm:contains", childAssociationResource.getAssocType());
        assertEquals("Wrong assoc name", "ce:" + assocLocalName, childAssociationResource.getAssocQName());
+
+        assertEquals("Node and child association events should have same eventGroupId", nodeResourceEventData.getEventGroupId(), childAssocResourceEventData.getEventGroupId());
+        assertTrue("Wrong node's secondary parents", nodeResource.getSecondaryParents().contains(childAssociationResource.getParent().getId()));
    }

    @Test
@@ -131,7 +155,7 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals(1, childAssociationRefs.size());
        assertFalse(childAssociationRefs.get(0).isPrimary());
        
-        checkNumOfEvents(3);
+        checkNumOfEvents(4);
        
        retryingTransactionHelper.doInTransaction(() ->
            nodeService.removeChildAssociation(childAssociationRef));
@@ -141,10 +165,32 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        assertEquals(0, childAssociationRefs.size());

-        checkNumOfEvents(4);
+        checkNumOfEvents(6);

-        final RepoEvent<EventData<ChildAssociationResource>> childAssocRepoEvent = getRepoEventWithoutWait(4);
+        // node repo event
+        final RepoEvent<EventData<NodeResource>> nodeRepoEvent = getRepoEventWithoutWait(5);
+        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(), nodeRepoEvent.getType());
+        assertNotNull("Repo event ID is not available.", nodeRepoEvent.getId());
+        assertNotNull("Source is not available", nodeRepoEvent.getSource());
+        assertEquals("Repo event source is not available.",
+            "/" + descriptorService.getCurrentRepositoryDescriptor().getId(),
+            nodeRepoEvent.getSource().toString());
+        assertNotNull("Repo event creation time is not available.", nodeRepoEvent.getTime());
+        assertEquals("Invalid repo event datacontenttype", "application/json",
+            nodeRepoEvent.getDatacontenttype());
+        assertNotNull(nodeRepoEvent.getDataschema());
+        assertEquals(EventJSONSchema.NODE_UPDATED_V1.getSchema(), nodeRepoEvent.getDataschema());

+        final EventData<NodeResource> nodeResourceEventData = getEventData(nodeRepoEvent);
+        assertNotNull("Event data group ID is not available. ", nodeResourceEventData.getEventGroupId());
+        assertNotNull("resourceBefore property is not available", nodeResourceEventData.getResourceBefore());
+
+        final NodeResource nodeResource = getNodeResource(nodeRepoEvent);
+        final NodeResource nodeResourceBefore = getNodeResourceBefore(nodeRepoEvent);
+        assertNotSame("Secondary parents actual and earlier state should differ", nodeResource.getSecondaryParents(), nodeResourceBefore.getSecondaryParents());
+
+        // child association repo event
+        final RepoEvent<EventData<ChildAssociationResource>> childAssocRepoEvent = getFilteredEvent(EventType.CHILD_ASSOC_DELETED, 0);
        assertEquals("Wrong repo event type.", EventType.CHILD_ASSOC_DELETED.getType(), childAssocRepoEvent.getType());
        assertNotNull("Repo event ID is not available. ", childAssocRepoEvent.getId());
        assertNotNull("Source is not available", childAssocRepoEvent.getSource());
@@ -156,15 +202,17 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertNotNull(childAssocRepoEvent.getDataschema());
        assertEquals(EventJSONSchema.CHILD_ASSOC_DELETED_V1.getSchema(), childAssocRepoEvent.getDataschema());

-        final EventData<ChildAssociationResource> nodeResourceEventData = getEventData(childAssocRepoEvent);
-        // EventData attributes
-        assertNotNull("Event data group ID is not available. ", nodeResourceEventData.getEventGroupId());
-        assertNull("resourceBefore property is not available", nodeResourceEventData.getResourceBefore());
+        final EventData<ChildAssociationResource> childAssocResourceEventData = getEventData(childAssocRepoEvent);
+        assertNotNull("Event data group ID is not available. ", childAssocResourceEventData.getEventGroupId());
+        assertNull("resourceBefore property is not available", childAssocResourceEventData.getResourceBefore());

        final ChildAssociationResource childAssociationResource = getChildAssocResource(childAssocRepoEvent);
        assertEquals("Wrong parent", parentNodeRef.getId(), childAssociationResource.getParent().getId());
        assertEquals("Wrong child", childNodeRef.getId(), childAssociationResource.getChild().getId());
        assertEquals("Wrong assoc type", "cm:contains", childAssociationResource.getAssocType());
+
+        assertEquals("Node and child association events should have same eventGroupId", nodeResourceEventData.getEventGroupId(), childAssocResourceEventData.getEventGroupId());
+        assertTrue("Wrong node's secondary parents", nodeResourceBefore.getSecondaryParents().contains(childAssociationResource.getParent().getId()));
    }

    @Test
@@ -179,17 +227,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() ->
            nodeService.addChild(
@@ -212,12 +253,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(7);
-        
-        // 3 assoc.child.Created events should be created
+        checkNumOfEvents(8);

+        // 1 node.Updated events should be created
+        List<RepoEvent<EventData<NodeResource>>> nodeUpdateEvent = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong association events number", 1, nodeUpdateEvent.size());
+
+        // 3 assoc.child.Created events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_CREATED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());
    }
    
    @Test
@@ -231,17 +275,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        List<NodeRef> parents = Arrays.asList(parent1NodeRef, parent2NodeRef, parent3NodeRef);
        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() -> {
            for (NodeRef parent : parents)
@@ -268,10 +305,14 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(7);
+        checkNumOfEvents(8);
+
+        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(5);
+        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(), resultRepoEvent.getType());
+
        // 3 assoc.child.Created events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_CREATED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());

        // All events in the transaction should have the same eventGroupId
        String assocEventGroupID1 = getEventData(childAssocEvents.get(0)).getEventGroupId();
@@ -294,17 +335,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        for (NodeRef parent : parents)
        {
@@ -330,10 +364,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(7);
+        checkNumOfEvents(10);
+
+        // 3 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 3, nodeUpdateEvents.size());
+
        // 3 assoc.child.Created events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_CREATED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());

        assertEquals(parent1NodeRef.getId(), getChildAssocResource(childAssocEvents.get(0)).getParent().getId());
        assertEquals(childNodeRef.getId(), getChildAssocResource(childAssocEvents.get(0)).getChild().getId());
@@ -360,17 +399,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() -> {
            for (NodeRef child : children)
@@ -388,10 +420,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(7);
+        checkNumOfEvents(10);
+
+        // 3 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 3, nodeUpdateEvents.size());
+
        // 3 assoc.child.Created events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_CREATED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());
    }

    @Test
@@ -406,17 +443,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        for (NodeRef child : children)
        {
@@ -432,10 +462,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(7);
+        checkNumOfEvents(10);
+
+        // 3 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 3, nodeUpdateEvents.size());
+
        // 3 assoc.child.Created events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_CREATED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());

        assertEquals(parentNodeRef.getId(), getChildAssocResource(childAssocEvents.get(0)).getParent().getId());
        assertEquals(child1NodeRef.getId(), getChildAssocResource(childAssocEvents.get(0)).getChild().getId());
@@ -462,17 +497,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() ->
            nodeService.addChild(parents, childNodeRef, ContentModel.ASSOC_CONTAINS,
@@ -501,15 +529,19 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        checkNumOfEvents(10);
+        checkNumOfEvents(12);
+
+        // 2 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 2, nodeUpdateEvents.size());

        // 3 assoc.child.Deleted events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_DELETED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());
    }
    
    @Test
-    public void testDeleteAssociationOneParentMultipleChildrenDifferentTransactions()
+    public void testDeleteAssociationMultipleParentOneChildrenDifferentTransactions()
    {
        final NodeRef parent1NodeRef = createNode(ContentModel.TYPE_FOLDER);
        final NodeRef parent2NodeRef = createNode(ContentModel.TYPE_FOLDER);
@@ -520,17 +552,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() ->
            nodeService.addChild(parents, childNodeRef, ContentModel.ASSOC_CONTAINS,
@@ -557,7 +582,7 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
                nodeService.removeChildAssociation(childAssociationRef));
        }

-        checkNumOfEvents(10);
+        checkNumOfEvents(14);

        // 3 assoc.child.Deleted events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_DELETED);
@@ -588,17 +613,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() -> {
            for (NodeRef child : children)
@@ -619,11 +637,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        deleteNode(parentNodeRef);

-        checkNumOfEvents(11);
+        checkNumOfEvents(17);
+
+        // 6 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 6, nodeUpdateEvents.size());

        // 3 assoc.child.Deleted events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_DELETED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());
    }

    @Test
@@ -638,17 +660,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(4);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(3);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(4);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2, 3, 4).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() ->
            nodeService.addChild(parents, childNodeRef, ContentModel.ASSOC_CONTAINS,
@@ -670,11 +685,15 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        deleteNode(childNodeRef);

-        checkNumOfEvents(11);
+        checkNumOfEvents(12);
+
+        // 2 node.Updated events should be created
+        List<RepoEvent<EventData<ChildAssociationResource>>> nodeUpdateEvents = getFilteredEvents(EventType.NODE_UPDATED);
+        assertEquals("Wrong node update events number", 2, nodeUpdateEvents.size());

        // 3 assoc.child.Deleted events should be created
        List<RepoEvent<EventData<ChildAssociationResource>>> childAssocEvents = getFilteredEvents(EventType.CHILD_ASSOC_DELETED);
-        assertEquals("Wrong association events number",3, childAssocEvents.size());
+        assertEquals("Wrong association events number", 3, childAssocEvents.size());
    }

    @Test
@@ -685,11 +704,10 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent

        checkNumOfEvents(2);

-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(1);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
-
-        resultRepoEvent = getRepoEventWithoutWait(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        IntStream.of(1, 2).forEach(i -> {
+            RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEventWithoutWait(i);
+            assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        });

        retryingTransactionHelper.doInTransaction(() ->
                {
@@ -708,13 +726,14 @@ public class ChildAssociationRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals(1, childAssociationRefs.size());
        assertFalse(childAssociationRefs.get(0).isPrimary());

-        checkNumOfEvents(4);
+        checkNumOfEvents(5);

        // Check the node events occur before the child association event
        List<RepoEvent<?>> repoEvents = getRepoEventsContainer().getEvents();
-        assertEquals("org.alfresco.event.node.Created", repoEvents.get(0).getType());
-        assertEquals("org.alfresco.event.node.Created", repoEvents.get(1).getType());
-        assertEquals("org.alfresco.event.node.Updated", repoEvents.get(2).getType());
-        assertEquals("org.alfresco.event.assoc.child.Created", repoEvents.get(3).getType());
+        assertEquals(EventType.NODE_CREATED.getType(), repoEvents.get(0).getType());
+        assertEquals(EventType.NODE_CREATED.getType(), repoEvents.get(1).getType());
+        assertEquals(EventType.NODE_UPDATED.getType(), repoEvents.get(2).getType());
+        assertEquals(EventType.NODE_UPDATED.getType(), repoEvents.get(3).getType());
+        assertEquals(EventType.CHILD_ASSOC_CREATED.getType(), repoEvents.get(4).getType());
    }
 }
--- a/repository/src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java
@@ -27,24 +27,38 @@ package org.alfresco.repo.event2;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;

 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;

 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.event.v1.model.EventType;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.junit.Before;
 import org.junit.Test;

 public class EventConsolidatorUnitTest
 {
-    private NodeResourceHelper nodeResourceHelper = mock(NodeResourceHelper.class);
-    
+    private final NodeResourceHelper nodeResourceHelper = mock(NodeResourceHelper.class);
+    private NodeEventConsolidator eventConsolidator;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
+    }
+
    @Test
    public void testGetMappedAspectsBeforeRemovedAndAddedEmpty()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
-        
        Set<String> currentAspects = new HashSet<>();
        currentAspects.add("cm:geographic");
        currentAspects.add("cm:auditable");
@@ -57,7 +71,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectRemoved()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

        Set<String> currentAspects = new HashSet<>();
@@ -79,7 +92,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectAdded()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

        Set<String> currentAspects = new HashSet<>();
@@ -102,7 +114,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectAddedAndRemoved()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

        Set<String> currentAspects = new HashSet<>();
@@ -125,7 +136,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectRemovedAndAdded()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);

@@ -150,8 +160,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectAddedTwiceRemovedOnce()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
-
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

@@ -178,8 +186,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_AspectRemovedTwiceAddedOnce()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
-
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

@@ -206,7 +212,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testGetMappedAspectsBefore_FilteredAspectAdded()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASPECT_COPIEDFROM);

        Set<String> currentAspects = new HashSet<>();
@@ -227,7 +232,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testAddAspect()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        
        assertEquals(1, eventConsolidator.getAspectsAdded().size());
@@ -238,7 +242,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testRemoveAspect()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);

        assertEquals(0, eventConsolidator.getAspectsAdded().size());
@@ -249,7 +252,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testAddAspectRemoveAspect()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);

@@ -260,7 +262,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testRemoveAspectAddAspect()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);

@@ -271,7 +272,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testAddAspectTwiceRemoveAspectOnce()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
@@ -284,7 +284,6 @@ public class EventConsolidatorUnitTest
    @Test
    public void testAddAspectOnceRemoveAspectTwice()
    {
-        NodeEventConsolidator eventConsolidator = new NodeEventConsolidator(nodeResourceHelper);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.addAspect(ContentModel.ASSOC_CONTAINS);
        eventConsolidator.removeAspect(ContentModel.ASSOC_CONTAINS);
@@ -293,4 +292,83 @@ public class EventConsolidatorUnitTest
        assertEquals(1, eventConsolidator.getAspectsRemoved().size());
        assertTrue(eventConsolidator.getAspectsRemoved().contains(ContentModel.ASSOC_CONTAINS));
    }
+
+    @Test
+    public void testOnMoveNodeWithPrimaryParent()
+    {
+        ChildAssociationRef oldAssociationMock = mock(ChildAssociationRef.class);
+        ChildAssociationRef newAssociationMock = mock(ChildAssociationRef.class);
+        NodeRef parentRefMock = mock(NodeRef.class);
+        given(newAssociationMock.isPrimary()).willReturn(true);
+        given(oldAssociationMock.getParentRef()).willReturn(parentRefMock);
+
+        eventConsolidator.onMoveNode(oldAssociationMock, newAssociationMock);
+
+        then(newAssociationMock).should().getChildRef();
+        then(newAssociationMock).should().isPrimary();
+        then(newAssociationMock).shouldHaveNoMoreInteractions();
+        then(nodeResourceHelper).should().getPrimaryHierarchy(parentRefMock, true);
+        assertTrue("Node event consolidator should contain event type: UPDATED", eventConsolidator.getEventTypes().contains(EventType.NODE_UPDATED));
+
+    }
+
+    @Test
+    public void testOnMoveNodeAfterSecondaryParentAdded()
+    {
+        ChildAssociationRef oldAssociationMock = mock(ChildAssociationRef.class);
+        ChildAssociationRef newAssociationMock = mock(ChildAssociationRef.class);
+        NodeRef nodeRefMock = mock(NodeRef.class);
+        NodeRef parentRefMock = mock(NodeRef.class);
+        List<String> secondaryParentsMock = mock(List.class);
+        given(newAssociationMock.isPrimary()).willReturn(false);
+        given(newAssociationMock.getChildRef()).willReturn(nodeRefMock);
+        given(newAssociationMock.getParentRef()).willReturn(parentRefMock);
+        given(parentRefMock.getId()).willReturn("parent-id");
+        given(nodeResourceHelper.getSecondaryParents(any(NodeRef.class))).willReturn(secondaryParentsMock);
+
+        // when
+        eventConsolidator.onMoveNode(oldAssociationMock, newAssociationMock);
+
+        then(newAssociationMock).should().isPrimary();
+        then(newAssociationMock).should(times(2)).getChildRef();
+        then(newAssociationMock).should(times(2)).getParentRef();
+        then(newAssociationMock).shouldHaveNoMoreInteractions();
+        then(oldAssociationMock).shouldHaveNoInteractions();
+        then(nodeResourceHelper).should().getSecondaryParents(nodeRefMock);
+        then(secondaryParentsMock).should().remove("parent-id");
+        then(secondaryParentsMock).shouldHaveNoMoreInteractions();
+        assertTrue("Node event consolidator should contain event type: UPDATED", eventConsolidator.getEventTypes().contains(EventType.NODE_UPDATED));
+        assertEquals(secondaryParentsMock, eventConsolidator.getSecondaryParentsBefore());
+    }
+
+    @Test
+    public void testOnMoveNodeBeforeSecondaryParentRemoved()
+    {
+        ChildAssociationRef oldAssociationMock = mock(ChildAssociationRef.class);
+        ChildAssociationRef newAssociationMock = mock(ChildAssociationRef.class);
+        NodeRef nodeRefMock = mock(NodeRef.class);
+        NodeRef parentRefMock = mock(NodeRef.class);
+        List<String> secondaryParentsMock = mock(List.class);
+        given(newAssociationMock.isPrimary()).willReturn(false);
+        given(newAssociationMock.getChildRef()).willReturn(nodeRefMock);
+        given(oldAssociationMock.getParentRef()).willReturn(parentRefMock);
+        given(parentRefMock.getId()).willReturn("parent-id");
+        given(nodeResourceHelper.getSecondaryParents(any(NodeRef.class))).willReturn(secondaryParentsMock);
+
+        // when
+        eventConsolidator.onMoveNode(oldAssociationMock, newAssociationMock);
+
+        then(newAssociationMock).should().isPrimary();
+        then(newAssociationMock).should(times(2)).getChildRef();
+        then(newAssociationMock).should().getParentRef();
+        then(newAssociationMock).shouldHaveNoMoreInteractions();
+        then(oldAssociationMock).should(times(3)).getParentRef();
+        then(oldAssociationMock).shouldHaveNoMoreInteractions();
+        then(nodeResourceHelper).should().getSecondaryParents(nodeRefMock);
+        then(secondaryParentsMock).should().contains("parent-id");
+        then(secondaryParentsMock).should().add("parent-id");
+        then(secondaryParentsMock).shouldHaveNoMoreInteractions();
+        assertTrue("Node event consolidator should contain event type: NODE_UPDATED", eventConsolidator.getEventTypes().contains(EventType.NODE_UPDATED));
+        assertEquals(secondaryParentsMock, eventConsolidator.getSecondaryParentsBefore());
+    }
 }
--- a/repository/src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java
@@ -119,6 +119,9 @@ public class EventFilterUnitTest
        assertTrue("System properties are excluded by default.",
                   propertyFilter.isExcluded(ContentModel.PROP_NODE_DBID));

+        assertFalse("Property cascadeTx is not excluded", propertyFilter.isExcluded(ContentModel.PROP_CASCADE_TX));
+        assertFalse("Property cascadeCRC is not excluded", propertyFilter.isExcluded(ContentModel.PROP_CASCADE_CRC));
+
        assertFalse(propertyFilter.isExcluded(ContentModel.PROP_TITLE));
    }

--- a/repository/src/test/java/org/alfresco/repo/event2/NodeResourceHelperUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/NodeResourceHelperUnitTest.java
@@ -28,14 +28,43 @@ package org.alfresco.repo.event2;
 import static org.alfresco.repo.event2.NodeResourceHelper.getLocalizedPropertiesBefore;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.mock;

 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;

+@RunWith(MockitoJUnitRunner.class)
 public class NodeResourceHelperUnitTest
 {
+    @Mock
+    private NodeService nodeServiceMock;
+
+    @InjectMocks
+    private NodeResourceHelper nodeResourceHelper;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        MockitoAnnotations.openMocks(this);
+    }
+
    @Test
    public void shouldExtractOnlyRelevantPropertiesForBeforeNode()
    {
@@ -111,4 +140,39 @@ public class NodeResourceHelperUnitTest
            return this;
        }
    }
+
+    @Test
+    public void testGetSecondaryParents()
+    {
+        NodeRef nodeRefMock = mock(NodeRef.class);
+        NodeRef parentRefMock = mock(NodeRef.class);
+        ChildAssociationRef secondaryParentMock = mock(ChildAssociationRef.class);
+        given(nodeServiceMock.getParentAssocs(any(NodeRef.class))).willReturn(List.of(secondaryParentMock));
+        given(secondaryParentMock.isPrimary()).willReturn(false);
+        given(secondaryParentMock.getParentRef()).willReturn(parentRefMock);
+
+        // when
+        List<String> secondaryParents = nodeResourceHelper.getSecondaryParents(nodeRefMock);
+
+        then(nodeServiceMock).should().getParentAssocs(nodeRefMock);
+        then(nodeServiceMock).shouldHaveNoMoreInteractions();
+        then(secondaryParentMock).should().isPrimary();
+        then(secondaryParentMock).should().getParentRef();
+        then(secondaryParentMock).shouldHaveNoMoreInteractions();
+        then(parentRefMock).should().getId();
+        then(parentRefMock).shouldHaveNoMoreInteractions();
+        assertNotNull(secondaryParents);
+    }
+
+    @Test
+    public void testGetNoneSecondaryParents()
+    {
+        NodeRef nodeRefMock = mock(NodeRef.class);
+
+        // when
+        List<String> secondaryParents = nodeResourceHelper.getSecondaryParents(nodeRefMock);
+
+        assertNotNull(secondaryParents);
+        assertTrue(secondaryParents.isEmpty());
+    }
 }
--- a/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
@@ -87,7 +87,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        });

        checkNumOfEvents(2);
-        
+
        resultRepoEvent = getRepoEvent(2);
        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(),
            resultRepoEvent.getType());
@@ -227,7 +227,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        });

        checkNumOfEvents(2);
-        
+
        resultRepoEvent = getRepoEvent(2);
        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(), resultRepoEvent.getType());

@@ -625,7 +625,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent

        // Create active model
        CustomModelDefinition modelDefinition =
-                retryingTransactionHelper.doInTransaction(() -> customModelService.createCustomModel(model, true));
+            retryingTransactionHelper.doInTransaction(() -> customModelService.createCustomModel(model, true));

        assertNotNull(modelDefinition);
        assertEquals(modelName, modelDefinition.getName().getLocalName());
@@ -635,8 +635,11 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        Collection<TypeDefinition> types = modelDefinition.getTypeDefinitions();
        assertEquals(1, types.size());

+        // we should have only 2 events, node.Created and node.Updated
+        checkNumOfEvents(2);
+
        // node.Created event should be generated for the model
-        RepoEvent<EventData<NodeResource>> resultRepoEvent = getRepoEvent(1);
+        RepoEvent<EventData<NodeResource>> resultRepoEvent = getFilteredEvent(EventType.NODE_CREATED, 0);
        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
        NodeResource nodeResource = getNodeResource(resultRepoEvent);
        assertEquals("Incorrect node type was found", "cm:dictionaryModel", nodeResource.getNodeType());
@@ -647,9 +650,9 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        assertEquals(ContentModel.TYPE_CONTENT, nodeService.getType(nodeRef));

        // node.Created event should be generated
-        resultRepoEvent = getRepoEvent(2);
-        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
+        resultRepoEvent = getRepoEvent(3);
        nodeResource = getNodeResource(resultRepoEvent);
+        assertEquals("Wrong repo event type.", EventType.NODE_CREATED.getType(), resultRepoEvent.getType());
        assertEquals("cm:content node type was not found", "cm:content", nodeResource.getNodeType());

        QName typeQName = QName.createQName("{" + namespacePair.getFirst()+ "}" + typeName);
@@ -661,15 +664,15 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
            return null;
        });

-        // we should have 3 events, node.Created for the model, node.Created for the node and node.Updated
-        checkNumOfEvents(3);
+        // we should have 4 events, node.Created for the model, node.Updated for the parent, node.Created for the node and node.Updated
+        checkNumOfEvents(4);

-        resultRepoEvent = getRepoEvent(3);
+        resultRepoEvent = getRepoEvent(4);
        assertEquals("Wrong repo event type.", EventType.NODE_UPDATED.getType(), resultRepoEvent.getType());
        nodeResource = getNodeResource(resultRepoEvent);
        assertEquals("Incorrect node type was found", namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typeName, nodeResource.getNodeType());

-        NodeResource resourceBefore = getNodeResourceBefore(3);
+        NodeResource resourceBefore = getNodeResourceBefore(4);
        assertEquals("Incorrect node type was found", "cm:content", resourceBefore.getNodeType());
        assertNull(resourceBefore.getId());
        assertNull(resourceBefore.getContent());
@@ -788,7 +791,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        });

        checkNumOfEvents(4);
-        
+
        NodeResource resourceBefore = getNodeResourceBefore(4);
        NodeResource resource = getNodeResource(4);

@@ -808,7 +811,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        assertNull(resourceBefore.getModifiedByUser());
        assertNull(resourceBefore.getCreatedAt());
        assertNull(resourceBefore.getCreatedByUser());
-        assertNull(resourceBefore.getProperties());
+        assertNotNull(resourceBefore.getProperties());
        assertNull(resourceBefore.getAspectNames());
        assertNotNull(resourceBefore.getPrimaryHierarchy());
        assertNull("Content should have been null.", resource.getContent());
@@ -818,7 +821,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        assertNotNull(resource.getModifiedByUser());
        assertNotNull(resource.getAspectNames());
        assertNull(resource.getContent());
-        assertTrue(resource.getProperties().isEmpty());
+        assertFalse(resource.getProperties().isEmpty());
    }

    @Test
@@ -1020,7 +1023,7 @@ public class UpdateRepoEventIT extends AbstractContextAwareRepoEvent
        NodeResource resource = getNodeResource(1);
        final Set<String> originalAspects = resource.getAspectNames();
        assertNotNull(originalAspects);
-        
+
        retryingTransactionHelper.doInTransaction(() -> {
            // Add cm:geographic aspect with default value
            nodeService.addAspect(nodeRef, ContentModel.ASPECT_GEOGRAPHIC, null);
--- a/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java
+++ b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java
@@ -31,15 +31,20 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

 import java.util.Map;
+import java.util.UUID;

 import org.alfresco.repo.security.authentication.identityservice.IdentityServiceFacadeFactoryBean.JwtDecoderProvider;
+import org.alfresco.repo.security.authentication.identityservice.IdentityServiceFacadeFactoryBean.JwtIssuerValidator;
 import org.junit.Test;
 import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails;
+import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.jwt.JwtDecoder;

 public class IdentityServiceFacadeFactoryBeanTest
 {
+    private static final String EXPECTED_ISSUER = "expected-issuer";
    @Test
    public void shouldCreateJwtDecoderWithoutIDSWhenPublicKeyIsProvided()
    {
@@ -62,4 +67,53 @@ public class IdentityServiceFacadeFactoryBeanTest
                          .containsEntry(USERNAME_CLAIM, "piotrek");
    }

+    @Test
+    public void shouldFailWithNotMatchingIssuerURIs()
+    {
+        final JwtIssuerValidator issuerValidator = new JwtIssuerValidator(EXPECTED_ISSUER);
+
+        final OAuth2TokenValidatorResult validationResult = issuerValidator.validate(tokenWithIssuer("different-issuer"));
+        assertThat(validationResult).isNotNull();
+        assertThat(validationResult.hasErrors()).isTrue();
+        assertThat(validationResult.getErrors()).hasSize(1);
+
+        final OAuth2Error error = validationResult.getErrors().iterator().next();
+        assertThat(error).isNotNull();
+        assertThat(error.getDescription()).contains(EXPECTED_ISSUER, "different-issuer");
+    }
+
+    @Test
+    public void shouldFailWithNullIssuerURI()
+    {
+        final JwtIssuerValidator issuerValidator = new JwtIssuerValidator(EXPECTED_ISSUER);
+
+        final OAuth2TokenValidatorResult validationResult = issuerValidator.validate(tokenWithIssuer(null));
+        assertThat(validationResult).isNotNull();
+        assertThat(validationResult.hasErrors()).isTrue();
+        assertThat(validationResult.getErrors()).hasSize(1);
+
+        final OAuth2Error error = validationResult.getErrors().iterator().next();
+        assertThat(error).isNotNull();
+        assertThat(error.getDescription()).contains(EXPECTED_ISSUER, "null");
+    }
+
+    @Test
+    public void shouldSucceedWithMatchingIssuerURI()
+    {
+        final JwtIssuerValidator issuerValidator = new JwtIssuerValidator(EXPECTED_ISSUER);
+
+        final OAuth2TokenValidatorResult validationResult = issuerValidator.validate(tokenWithIssuer(EXPECTED_ISSUER));
+        assertThat(validationResult).isNotNull();
+        assertThat(validationResult.hasErrors()).isFalse();
+        assertThat(validationResult.getErrors()).isEmpty();
+    }
+
+    private Jwt tokenWithIssuer(String issuer)
+    {
+        return Jwt.withTokenValue(UUID.randomUUID().toString())
+                  .issuer(issuer)
+                  .header("JUST", "FOR TESTING")
+                  .build();
+    }
+
 }
--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
    ports:
      - "8090:8090"
  postgres:
-    image: postgres:14.4
+    image: postgres:15.4
    profiles: ["default", "with-transform-core-aio", "postgres", "with-mtls-transform-core-aio"]
    environment:
      - POSTGRES_PASSWORD=alfresco
@@ -56,4 +56,4 @@ services:

      CLIENT_SSL_TRUST_STORE: "file:/tengineAIO.truststore"
      CLIENT_SSL_TRUST_STORE_PASSWORD: "password"
-      CLIENT_SSL_TRUST_STORE_TYPE: "JCEKS"
+      CLIENT_SSL_TRUST_STORE_TYPE: "JCEKS"