replace flags

remove -T flag
2025-11-05 15:32:21 +00:00 · 2023-08-31 20:52:48 +02:00 · 2023-08-31 20:47:02 +02:00 · 2023-08-31 20:34:29 +02:00 · 2023-08-31 20:26:55 +02:00 · 2023-08-31 19:54:15 +02:00
59 changed files with 119 additions and 201 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,15 +14,6 @@ updates:
    timezone: Africa/Abidjan
  open-pull-requests-limit: 99
  ignore:
-  - dependency-name: com.google.code.gson:gson
-    versions:
-    - "> 2.8.6"
-  - dependency-name: io.fabric8:fabric8-maven-plugin
-    versions:
-    - "> 4.4.0"
-  - dependency-name: javax.servlet:javax.servlet-api
-    versions:
-    - "> 3.0.1"
  - dependency-name: org.acegisecurity:acegi-security
    versions:
    - "> 0.8.2_patched"
@@ -52,92 +43,7 @@ updates:
    - "> 1.0.0"
  - dependency-name: org.freemarker:freemarker
    versions:
-    - "> 2.3.20-alfresco-patched-20200421"
-  - dependency-name: org.eclipse.jetty:jetty-server
-    versions:
-    - 9.4.38.v20210224
-  - dependency-name: org.alfresco.tas:cmis
-    versions:
-    - "1.28"
-  - dependency-name: org.springframework:spring-webmvc
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-web
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-tx
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-orm
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-test
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-jms
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-jdbc
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-expression
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-core
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-context-support
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-context
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-beans
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.springframework:spring-aop
-    versions:
-    - 5.3.4
-    - 5.3.5
-  - dependency-name: org.alfresco.tas:restapi
-    versions:
-    - "1.55"
-  - dependency-name: org.eclipse.jetty:jetty-security
-    versions:
-    - 11.0.1
-  - dependency-name: org.alfresco.aos-module:alfresco-vti-bin
-    versions:
-    - 1.4.0-M1
-  - dependency-name: org.alfresco.aos-module:alfresco-aos-module-distributionzip
-    versions:
-    - 1.4.0-M1
-  - dependency-name: org.alfresco.aos-module:alfresco-aos-module
-    versions:
-    - 1.4.0-M1
-  - dependency-name: org.alfresco.surf:spring-webscripts-api
-    versions:
-    - "8.16"
-  - dependency-name: org.alfresco.surf:spring-webscripts:tests
-    versions:
-    - "8.16"
-  - dependency-name: org.alfresco.surf:spring-webscripts
-    versions:
-    - "8.16"
-  - dependency-name: org.alfresco.surf:spring-surf-core-configservice
-    versions:
-    - "8.16"
+    - "> 2.3.31-alfresco-patched"
  registries:
  - maven-repository-artifacts-alfresco-com-nexus-content-groups-int
 - package-ecosystem: "docker"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,8 +96,8 @@ jobs:
        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
+          mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl core,data-model -am -DfailIfNoTests=false
+          mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -139,7 +139,7 @@ jobs:
      - name: "Set up the environment"
        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
-        run: mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl remote-api -Dtest=${{ matrix.testSuite }} -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

@@ -169,7 +169,7 @@ jobs:
        env:
          MARIADB_VERSION: ${{ matrix.version }}
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -195,7 +195,7 @@ jobs:
        env:
          MARIADB_VERSION: 10.6
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -221,7 +221,7 @@ jobs:
        env:
          MYSQL_VERSION: 8
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -246,7 +246,7 @@ jobs:
        env:
          POSTGRES_VERSION: 13.7
      - 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
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -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

@@ -271,7 +271,7 @@ jobs:
        env:
          POSTGRES_VERSION: 14.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
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -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

@@ -292,7 +292,7 @@ jobs:
      - name: "Run ActiveMQ"
        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -359,7 +359,7 @@ jobs:
          fi
          docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }}
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -422,7 +422,7 @@ jobs:
      - name: "Run tests"
        id: tests
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn -B verify -f packaging/tests/${{ matrix.pom-dir }}/pom.xml -Pall-tas-tests,${{ matrix.test-profile }} -Denvironment=default -DrunBugs=false
+        run: mvn -B verify -Dparallel=all -DthreadCountMethods=4 -f packaging/tests/${{ matrix.pom-dir }}/pom.xml -Pall-tas-tests,${{ matrix.test-profile }} -Denvironment=default -DrunBugs=false
      - name: "Print output after success"
        if: ${{ always() && steps.tests.outcome == 'success' }}
        run: ${TAS_SCRIPTS}/output_tests_run.sh "packaging/tests/${{ matrix.pom-dir }}"
@@ -449,7 +449,7 @@ jobs:
      - name: "Run Postgres 14.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
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -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
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -480,7 +480,7 @@ jobs:
          bash ./scripts/ci/build.sh
      - name: "Verify"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }}
+        run: mvn --file amps/ags/pom.xml -B verify -Dparallel=all -DthreadCountMethods=4 -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -511,7 +511,7 @@ jobs:
          bash ./scripts/ci/build.sh
      - name: "Verify"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }}
+        run: mvn --file amps/ags/pom.xml -B verify -Dparallel=all -DthreadCountMethods=4 -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -544,7 +544,7 @@ jobs:
          mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests
      - name: "Test"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests
+        run: mvn -B test -Dparallel=all -DthreadCountMethods=4 -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests
      - name: "Configure AWS credentials"
        if: ${{ always() }}
        uses: aws-actions/configure-aws-credentials@v1
--- 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.201</version>
+      <version>23.1.0.206-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.201</version>
+      <version>23.1.0.206-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.201</version>
+      <version>23.1.0.206-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
@@ -26,8 +26,8 @@
 */
 package org.alfresco.rest.core.v0;

-import javax.json.Json;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
@@ -42,8 +42,8 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertFalse;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import java.io.File;

 import org.alfresco.dataprep.CMISUtil;
--- 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.201</version>
+      <version>23.1.0.206-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.0.201</version>
+      <version>23.1.0.206-SNAPSHOT</version>
   </parent>

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

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

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.201</version>
+        <version>23.1.0.206-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.201</version>
+        <version>23.1.0.206-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.201</version>
+        <version>23.1.0.206-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.201</version>
+        <version>23.1.0.206-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
@@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.equalTo;
 import io.restassured.RestAssured;
 import java.io.File;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import jakarta.mail.Flags;
 import jakarta.mail.MessagingException;

--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
@@ -7,7 +7,7 @@ import io.restassured.http.ContentType;
 import java.util.HashMap;
 import java.util.Map;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- 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.201</version>
+        <version>23.1.0.206-SNAPSHOT</version>
    </parent>

    <properties>
@@ -17,7 +17,6 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <rest.api.explorer.branch>master</rest.api.explorer.branch>
        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
-        <org.glassfish.version>1.1.4</org.glassfish.version>
        <commons-lang3.version>3.13.0</commons-lang3.version>
        <scribejava-apis.version>8.3.3</scribejava-apis.version>
        <java.version>17</java.version>
@@ -138,13 +137,6 @@
            <artifactId>jackson-databind</artifactId>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/org.glassfish/javax.json -->
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>${org.glassfish.version}</version>
-        </dependency>
-
        <!-- swagger parser -->
        <dependency>
            <groupId>io.swagger</groupId>
@@ -184,9 +176,8 @@
       </dependency>

        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
-            <scope>test</scope>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
        </dependency>
    </dependencies>

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
@@ -25,11 +25,11 @@
 */
 package org.alfresco.rest.core;

-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelManager.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelManager.java
@@ -31,15 +31,10 @@ import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.rest.model.RestCustomAspectModel;
 import org.alfresco.rest.model.RestCustomModel;
 import org.alfresco.rest.model.RestCustomTypeModel;
-import org.alfresco.rest.model.RestGroupsModelsCollection;
 import org.alfresco.utility.model.CustomAspectModel;
-import org.alfresco.utility.model.CustomAspectPropertiesModel;
 import org.alfresco.utility.model.CustomContentModel;
 import org.springframework.http.HttpMethod;

-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;

 /**
 * @author Bogdan Bocancea
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelProperties.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelProperties.java
@@ -33,8 +33,8 @@ import org.alfresco.utility.model.CustomContentModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
--- 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
@@ -30,7 +30,7 @@ import static org.alfresco.rest.core.JsonBodyGenerator.arrayToJson;
 import static org.alfresco.rest.requests.RuleSettings.IS_INHERITANCE_ENABLED;
 import static org.springframework.http.HttpMethod.PUT;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Processes.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Processes.java
@@ -25,7 +25,7 @@
 */
 package org.alfresco.rest.requests;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.core.JsonBodyGenerator;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/SharedLinks.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/SharedLinks.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests;

 import java.util.HashMap;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Task.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Task.java
@@ -25,8 +25,8 @@
 */
 package org.alfresco.rest.requests;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java
@@ -39,8 +39,8 @@
 */
 package org.alfresco.rest.requests.search;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;

 import io.restassured.RestAssured;

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscriptions.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscriptions.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests.syncServiceAPI;

 import java.util.HashMap;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests.syncServiceAPI;

 import java.util.List;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/workflowAPI/RestWorkflowAPI.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/workflowAPI/RestWorkflowAPI.java
@@ -25,7 +25,7 @@
 */
 package org.alfresco.rest.requests.workflowAPI;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.core.RestWrapper;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java
@@ -9,7 +9,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.JsonBodyGenerator;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/LinkToCategoriesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/LinkToCategoriesTests.java
@@ -35,7 +35,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.NO_CONTENT;
 import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;

-import javax.json.Json;
+import jakarta.json.Json;
 import java.util.Collections;
 import java.util.List;

--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/ListCategoriesForNodeTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/ListCategoriesForNodeTests.java
@@ -32,7 +32,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;

-import javax.json.Json;
+import jakarta.json.Json;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.downloads;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
@@ -2,8 +2,8 @@ package org.alfresco.rest.groups;

 import java.util.UUID;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.RestTest;
 import org.alfresco.utility.RetryOperation;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
@@ -10,8 +10,8 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
@@ -2,8 +2,8 @@ package org.alfresco.rest.nodes;

 import static org.junit.Assert.assertEquals;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
@@ -58,8 +58,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
 import org.alfresco.rest.model.RestActionConstraintModel;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
@@ -1,7 +1,7 @@
 package org.alfresco.rest.sharedLinks;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.sharedLinks;

-import javax.json.Json;
+import jakarta.json.Json;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.workflow.processes;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
@@ -19,7 +19,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.util.HashMap;

 public class UpdateTaskTests extends RestTest
--- 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.201</version>
+        <version>23.1.0.206-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.201</version>
+        <version>23.1.0.206-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.201</version>
+    <version>23.1.0.206-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -111,7 +111,8 @@
        <dependency.jakarta-ee-activation.version>2.0.1</dependency.jakarta-ee-activation.version>
        <dependency.jakarta-ee-jms.version>3.0.0</dependency.jakarta-ee-jms.version>
        <dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
-        <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
+        <dependency.jakarta-ee-json-api.version>2.1.2</dependency.jakarta-ee-json-api.version>
+        <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>
@@ -155,7 +156,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.201</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -266,12 +267,13 @@
            <dependency>
                <groupId>jakarta.json</groupId>
                <artifactId>jakarta.json-api</artifactId>
-                <version>${dependency.jakarta-json-api.version}</version>
+                <version>${dependency.jakarta-ee-json-api.version}</version>
            </dependency>
+
            <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>jakarta.json</artifactId>
-                <version>${dependency.jakarta-json-api.version}</version>
+                <groupId>org.eclipse.parsson</groupId>
+                <artifactId>parsson</artifactId>
+                <version>${dependency.jakarta-ee-json-impl.version}</version>
            </dependency>

            <dependency>
@@ -1115,6 +1117,8 @@
                                            <exclude>javax.xml.ws:jaxws-api</exclude>
                                            <exclude>javax.mail</exclude>
                                            <exclude>javax.transaction</exclude>
+                                            <exclude>*:javax.json</exclude>
+                                            <exclude>org.glassfish:jakarta.json</exclude>

 <!--                                            Enforce minimal versions of jakarta dependencies-->
                                            <exclude>jakarta.servlet:jakarta.servlet-api:(, 5.0.0)</exclude>
--- 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.201</version>
+        <version>23.1.0.206-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -137,7 +137,7 @@
        <dependency>
            <groupId>org.eclipse.jetty</groupId>
            <artifactId>jetty-webapp</artifactId>
-            <version>11.0.15</version>
+            <version>11.0.16</version>
            <scope>test</scope>
        </dependency>
        <dependency>
--- 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.201</version>
+        <version>23.1.0.206-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -39,6 +39,10 @@
        <property name="configuration" ref="jmsConfig"/>
    </bean>

+    <bean id="activemq" class="org.apache.camel.component.activemq.ActiveMQComponent">
+        <property name="configuration" ref="jmsConfig"/>
+    </bean>
+
    <bean id="amqp" class="org.apache.camel.component.amqp.AMQPComponent">
        <property name="configuration" ref="jmsConfig"/>
    </bean>
--- a/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java
+++ b/repository/src/test/java/org/alfresco/messaging/camel/CamelComponentsTest.java
@@ -48,12 +48,29 @@ public class CamelComponentsTest {
    @Autowired
    protected CamelContext camelContext;

+    @Produce("activemq:queue:alfresco.test")
+    protected ProducerTemplate activemqTemplate;
+
    @Produce("amqp:queue:alfresco.test")
    protected ProducerTemplate amqpTemplate;

    @Produce("jms:queue:alfresco.test")
    protected ProducerTemplate jmsTemplate;

+    @Test
+    public void testActivemqComponent()
+    {
+        final String msg = "ping <activemq>";
+
+        activemqTemplate.sendBody(msg);
+
+        final Object reply = camelContext
+                .createConsumerTemplate()
+                .receiveBody("activemq:queue:alfresco.test", 2000);
+
+        assertEquals(msg, reply);
+    }
+
    @Test
    public void testAmqpComponent()
    {
--- a/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java
@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextHierarchy;

@@ -42,6 +43,7 @@ import org.springframework.test.context.ContextHierarchy;
    // Context hierarchy inherits context config from parent classes and extends it with TestConfig from this class
    @ContextConfiguration(classes = DirectEventGeneratorTest.TestConfig.class)
 })
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class DirectEventGeneratorTest extends EventGeneratorTest
 {
    @Autowired
--- a/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java
@@ -27,7 +27,9 @@ package org.alfresco.repo.event2;

 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;

+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class EnqueuingEventGeneratorTest extends EventGeneratorTest
 {
    @Autowired
--- a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java
@@ -37,7 +37,6 @@ import jakarta.jms.Message;
 import jakarta.jms.MessageConsumer;
 import jakarta.jms.MessageListener;
 import jakarta.jms.Session;
-
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -52,9 +51,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.test.annotation.DirtiesContext;

-@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public abstract class EventGeneratorTest extends AbstractContextAwareRepoEvent
 {
    private static final String EVENT2_TOPIC_NAME = "alfresco.repo.event2";
--- a/repository/src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java
@@ -35,8 +35,8 @@ import org.junit.runners.Suite.SuiteClasses;
                DeleteRepoEventIT.class,
                ChildAssociationRepoEventIT.class,
                PeerAssociationRepoEventIT.class,
-                EnqueuingEventGeneratorTest.class,
                DirectEventGeneratorTest.class,
+                EnqueuingEventGeneratorTest.class,
                EventGeneratorDisabledTest.class
 })
 public class RepoEvent2ITSuite
Author	SHA1	Message	Date
kcichonczyk	e36b009a51	replace flags	2023-08-31 20:52:48 +02:00
kcichonczyk	b5621bae57	replace flags	2023-08-31 20:47:02 +02:00
kcichonczyk	adcadfde8f	remove -T flag	2023-08-31 20:34:29 +02:00
kcichonczyk	572874ea33	add dependency on content-services-community in docker module	2023-08-31 20:26:55 +02:00
kcichonczyk	6a3ef356c2	add flags to improve build/test time	2023-08-31 19:54:15 +02:00
kcichonczyk	e14d8111c7	add flags to improve build/test time	2023-08-31 19:50:48 +02:00
kcichonczyk	3bb713847c	add flags to improve build/test time	2023-08-31 19:46:28 +02:00
kcichonczyk	d42aeb309a	add flags to improve build/test time	2023-08-31 19:37:46 +02:00
alfresco-build	6470baeeb2	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-31 12:04:15 +00:00
alfresco-build	8bfe25ef51	[maven-release-plugin][skip ci] prepare release 23.1.0.205	2023-08-31 12:04:12 +00:00
Krystian Dabrowski	9207fde808	ACS-5451: Toggle for direct Event sending (#2156 ) * ACS-5451: Toggle for direct Event sending - fixing failing tests in enterprise-repo	2023-08-31 12:27:33 +02:00
Sara	2f77cdd94f	Feature/acs 5905 remove dependabot spring overrides (#2165 ) * ACS-5905 Remove spring related dependabot overrides * ACS-5905 Remove or update outdated dependabot overrides * ACS-5905 Remove outdated tas dependabot overrides	2023-08-31 10:22:27 +01:00
kcichonczyk	c18144643d	[ACS-5903] replace javax.json with jakarta/parsson	2023-08-31 11:00:59 +02:00
alfresco-build	746846982c	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-31 07:49:16 +00:00
alfresco-build	63bc31acd1	[maven-release-plugin][skip ci] prepare release 23.1.0.204	2023-08-31 07:49:13 +00:00
dependabot[bot]	332ff9791e	Bump org.eclipse.jetty:jetty-webapp from 11.0.15 to 11.0.16 (#2168 ) Bumps [org.eclipse.jetty:jetty-webapp](https://github.com/eclipse/jetty.project) from 11.0.15 to 11.0.16. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-11.0.15...jetty-11.0.16) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-08-31 06:16:30 +02:00
alfresco-build	8d6a6aa69d	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-27 00:07:37 +00:00
alfresco-build	293e6b2874	[maven-release-plugin][skip ci] prepare release 23.1.0.203	2023-08-27 00:07:35 +00:00
Alfresco CI User	b0218f93cf	[force] Force release for 2023-08-27.	2023-08-27 00:03:15 +00:00
alfresco-build	b45441bd5c	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-25 11:06:57 +00:00
alfresco-build	b17edae40e	[maven-release-plugin][skip ci] prepare release 23.1.0.202	2023-08-25 11:06:54 +00:00
Piotr Żurek	b884580688	ACS-5770 Restore activmq Camel support (#2159 )	2023-08-25 12:19:18 +02:00
alfresco-build	a7d49cb4c0	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-25 09:12:34 +00:00