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
38 changed files with 442 additions and 142 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 }}
@@ -78,8 +82,8 @@ jobs:
    steps:
      - 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: >
@@ -88,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

@@ -125,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: |
@@ -155,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
@@ -184,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"
@@ -210,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"
@@ -223,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: >
@@ -235,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: >
@@ -260,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"
@@ -283,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"
@@ -325,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"
@@ -403,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: |
@@ -440,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
@@ -469,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: |
@@ -500,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: |
@@ -527,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: |
@@ -572,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.237</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.237</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.237</version>
+      <version>23.1.0.256-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.237</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.237</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.237</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.237</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.237</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.237</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.237</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.237</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.237</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.237</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.237</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.237</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.237</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.237</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.237</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.237</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <properties>
--- 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()
    {
@@ -83,7 +85,115 @@ 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
@@ -25,6 +25,7 @@
 */
 package org.alfresco.rest.search;

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

 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -205,7 +206,13 @@ public class RestRequestHighlightModel extends TestModel implements IRestModel<R

        public RestRequestHighlightModelBuilder fields(List<String> fields)
        {
-            this.fields = fields.stream().map(field -> new RestRequestFieldsModel(field)).toList();
+            this.fields = fields.stream().map(RestRequestFieldsModel::of).toList();
+            return this;
+        }
+
+        public RestRequestHighlightModelBuilder fields(RestRequestFieldsModel... fields)
+        {
+            this.fields = Arrays.stream(fields).toList();
            return this;
        }

--- 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.237</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.237</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.237</version>
+    <version>23.1.0.256-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -51,8 +51,8 @@
        <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-core.version>5.0.0-A3</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.0.0-A3</dependency.alfresco-transform-service.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.24</dependency.acs-event-model.version>

@@ -67,7 +67,7 @@
        <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.14.0</dependency.commons-io.version>
        <dependency.gson.version>2.10.1</dependency.gson.version>
@@ -100,7 +100,6 @@

        <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>
@@ -114,9 +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>
-        <alfresco.googledrive.version>4.0.0-M1</alfresco.googledrive.version>
-        <alfresco.aos-module.version>2.0.0-M1</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.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>
@@ -153,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.237</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -216,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>
--- 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.237</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <dependencies>
--- 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.237</version>
+        <version>23.1.0.256-SNAPSHOT</version>
    </parent>

    <dependencies>
--- 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/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
--- 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/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
Author	SHA1	Message	Date
Giovanni Toraldo	a99e5cdde9	split failing job in two separate jobs	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	7bc6dd142b	test core without build-cache but latest maven	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	6cbd2d7d50	[skip ci] remove push branch	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	1786cbec99	add the new input [db]	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	e16a53a23e	rebuild	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	21fb85f2a9	drop debug	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	7dfd41997a	ssh debug	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	6374aa30d6	Revert "build with maven daemon" This reverts commit 7f70aa3d61f72a5538346329736805e4eabc4782.	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	ed8bdc87da	build with maven daemon	2023-10-31 12:20:15 +01:00
Giovanni Toraldo	5b8d758947	build	2023-10-31 12:20:14 +01:00
Giovanni Toraldo	ed3f170d05	use custom setup-java-build	2023-10-31 12:20:14 +01:00
alfresco-build	8d51e9885a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-30 18:33:51 +00:00
alfresco-build	a61faaece5	[maven-release-plugin][skip ci] prepare release 23.1.0.255	2023-10-30 18:33:47 +00:00
Maciej Pichura	30de66257f	ACS-6143: Bump api-explorer version [skip tests] (#2279 ) `UpdateRecordsTests` failure is unrelated.	2023-10-30 19:29:24 +01:00
Maciej Pichura	ae1f955cc2	ACS-6234: Temporarily disabling flaky test. (#2280 ) UpdateRecordsTests failure is intermittent and unrelated.	2023-10-30 18:31:13 +01:00
rrajoria	452db9a963	Update googledrive and AOS GA-Version	2023-10-30 19:16:26 +05:30
mstrankowski	4eeb7feb74	ACS-6094: Update Transform Core and Transform Service versions	2023-10-30 14:11:51 +01:00
alfresco-build	5aa8c37c53	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-29 00:06:33 +00:00
alfresco-build	aafdd3c46a	[maven-release-plugin][skip ci] prepare release 23.1.0.254	2023-10-29 00:06:30 +00:00
Alfresco CI User	f73cf70cbb	[force] Force release for 2023-10-29.	2023-10-29 00:03:13 +00:00
alfresco-build	dd0e0626bd	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-23 10:05:09 +00:00
alfresco-build	e4a5c1a38e	[maven-release-plugin][skip ci] prepare release 23.1.0.253	2023-10-23 10:05:07 +00:00
rrajoria	c698ed1d6d	Update google drive and AOS Version	2023-10-23 14:20:00 +05:30
alfresco-build	2632486e0f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-22 00:07:16 +00:00
alfresco-build	ea24992b57	[maven-release-plugin][skip ci] prepare release 23.1.0.252	2023-10-22 00:07:14 +00:00
Alfresco CI User	e6b35b7f66	[force] Force release for 2023-10-22.	2023-10-22 00:03:20 +00:00
alfresco-build	0aa5fd7f59	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-21 09:26:41 +00:00
alfresco-build	55862fc394	[maven-release-plugin][skip ci] prepare release 23.1.0.251	2023-10-21 09:26:39 +00:00
mstrankowski	f942c7b9df	Update Transform Core to 5.0.0-A5, Transform Service to 4.0.0-A12	2023-10-21 10:41:39 +02:00
alfresco-build	585111602f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-20 20:16:20 +00:00
alfresco-build	473942f3ba	[maven-release-plugin][skip ci] prepare release 23.1.0.250	2023-10-20 20:16:17 +00:00
Maciej Pichura	99905d349b	ACS-6142: update api-explorer to 23.1.0-A2 (#2262 )	2023-10-20 21:29:33 +02:00
alfresco-build	4f1efa183c	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-20 19:23:38 +00:00
alfresco-build	141c5f3b34	[maven-release-plugin][skip ci] prepare release 23.1.0.249	2023-10-20 19:23:35 +00:00
Krystian Dabrowski	7c863be25e	ACS-6075: Highlight snippet control parameters (#2261 ) - added snippetCount, fragmentSize and mergeContiguous to highlighting field model	2023-10-20 15:52:46 +02:00
alfresco-build	ad6354bd32	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-18 13:27:37 +00:00
alfresco-build	30e191a8cd	[maven-release-plugin][skip ci] prepare release 23.1.0.248	2023-10-18 13:27:34 +00:00
dependabot[bot]	b2bcfd72c1	Bump org.json:json from 20230618 to 20231013 (#2252 ) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230618 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-18 14:35:09 +02:00
alfresco-build	698ca01778	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-16 12:23:19 +00:00
alfresco-build	e16a0820ee	[maven-release-plugin][skip ci] prepare release 23.1.0.247	2023-10-16 12:23:16 +00:00
Manish Kumar	1f99216d37	[MNT-23933] Fixed Null Pointer Exception (#2253 )	2023-10-16 16:44:43 +05:30
alfresco-build	3c60415ea0	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-15 00:08:05 +00:00
alfresco-build	e749ac6478	[maven-release-plugin][skip ci] prepare release 23.1.0.246	2023-10-15 00:08:02 +00:00
Alfresco CI User	6cdcf7928a	[force] Force release for 2023-10-15.	2023-10-15 00:03:18 +00:00
alfresco-build	542230764d	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-13 13:32:06 +00:00
alfresco-build	878cd3ceee	[maven-release-plugin][skip ci] prepare release 23.1.0.245	2023-10-13 13:32:03 +00:00
Piotr Żurek	582fc8ec2d	ACS-6121 MNT-24007 Use issuer URI from the IdP (#2250 )	2023-10-13 14:48:35 +02:00
alfresco-build	53c99a0ba4	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-13 12:14:08 +00:00
alfresco-build	07cd283a1e	[maven-release-plugin][skip ci] prepare release 23.1.0.244	2023-10-13 12:14:06 +00:00
Domenico Sibilio	f7a4da0ba5	Free up GHA runner disk space [db] (#2249 )	2023-10-13 13:28:07 +02:00
alfresco-build	c344f7ab1a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-13 10:19:34 +00:00
alfresco-build	afe100097e	[maven-release-plugin][skip ci] prepare release 23.1.0.243	2023-10-13 10:19:31 +00:00
Manish Kumar	2cc0137be3	[MNT-23896] run handleClientAuth only when this.enforce variable is true (#2248 )	2023-10-13 14:25:49 +05:30
alfresco-build	3e91bf6739	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-12 13:23:31 +00:00
alfresco-build	4b77b77013	[maven-release-plugin][skip ci] prepare release 23.1.0.242	2023-10-12 13:23:28 +00:00
Kacper Magdziarz	7a84e4d5f1	[ACS-6116] Leftovers removal (#2246 )	2023-10-12 14:37:56 +02:00
alfresco-build	eedb601320	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-12 11:23:11 +00:00
alfresco-build	536ac35aab	[maven-release-plugin][skip ci] prepare release 23.1.0.241	2023-10-12 11:23:07 +00:00
Krystian Dabrowski	a61d5a407e	ACS-6070: Support for highlighting prefix and postfix (#2245 ) * ACS-6070: Support for highlighting prefix and postfix - added prefix and postfix to field model	2023-10-12 12:01:28 +02:00
alfresco-build	e8c9c9aef5	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-10 11:23:18 +00:00
alfresco-build	6b832aecd1	[maven-release-plugin][skip ci] prepare release 23.1.0.240	2023-10-10 11:23:16 +00:00
Marcin Strankowski	eebacd0a5f	MNT-23891: Change configuration for UpgradePasswordHashJob to one recommended, it has been tested locally and indeed runs proper code. A wrong class was called for the good parameters given, probably a copy/paste typo. (#2234 )	2023-10-10 12:35:55 +02:00
alfresco-build	6eff1e1219	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-09 11:48:26 +00:00
alfresco-build	e52aaa6b8d	[maven-release-plugin][skip ci] prepare release 23.1.0.239	2023-10-09 11:48:23 +00:00
Piotr Żurek	fb78a5fe41	ACS-6103 Upgrade PostgreSQL version (#2233 )	2023-10-09 13:01:35 +02:00
alfresco-build	7b4c420f3e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-09 09:52:01 +00:00
alfresco-build	507a617c51	[maven-release-plugin][skip ci] prepare release 23.1.0.238	2023-10-09 09:51:57 +00:00
Manish Kumar	637cdd4f3b	[ACS-4778] Added usr:user nodeType for exclusion in property file (#2232 )	2023-10-09 14:39:18 +05:30
alfresco-build	8959db9017	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-08 00:07:00 +00:00