REPO-5712 Fix exception logging in EventGeneratorQueue

Include the exception stacktrace so that any event framework wrong configuration can be easily detected.
[maven-release-plugin][skip ci] prepare for next development iteration
2025-10-22 15:12:38 +00:00 · 2022-04-22 16:45:48 +02:00 · 2022-04-21 17:28:10 +00:00 · 2022-04-21 17:28:03 +00:00 · 2022-04-21 17:47:50 +01:00 · 2022-04-21 10:21:11 +00:00
32 changed files with 125 additions and 122 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ branches:

 env:
  global:
+    - TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
    - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
    - TAS_ENVIRONMENT=./packaging/tests/environment
    - LOG_WARN="-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
@@ -70,7 +71,7 @@ jobs:
      before_script:
        - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.6.0-A2
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext01TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

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

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

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

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

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

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

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

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

    - name: "Remote-api - AppContextExtraTestSuite"
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.0.15</version>
+      <version>23.1.0.23-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.15</version>
+      <version>23.1.0.23-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.15</version>
+      <version>23.1.0.23-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.15</version>
+      <version>23.1.0.23-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,4 +1,3 @@
-TRANSFORMERS_TAG=2.6.0-A2
 SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1
--- 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.15</version>
+      <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+      <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,4 +1,3 @@
-TRANSFORMERS_TAG=2.6.0-A2
 SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1
--- 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.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/scripts/start-compose.sh
+++ b/packaging/tests/scripts/start-compose.sh
@@ -27,8 +27,11 @@ fi

 echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}"

+TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
+TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)
+
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
-docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
+TRANSFORMERS_TAG=${TRANSFORMERS_TAG} TRANSFORM_ROUTER_TAG=${TRANSFORM_ROUTER_TAG} docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d

 if [ $? -eq 0 ]
 then
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java
@@ -60,15 +60,15 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
        ftpProtocol.authenticateUser(testUser1).usingSite(testSitePublic).createFolder(testFolder1)
            .usingResource(testFolder1).createFile(wordFile)
            .assertThat().contentIs("tasTesting");
-        
+
        STEP("2. Open document for edit using CMIS");
        cmisAPI.authenticateUser(testUser1).usingResource(wordFile).checkOut();
        FileModel wordFilePWC = cmisAPI.usingResource(wordFile).withCMISUtil().getPWCFileModel();
-        
+
        STEP("3. Try to edit document using Webdav while checked-out with CMIS - content should be updated");
        webDavProtocol.authenticateUser(testUser1).usingResource(wordFilePWC).update("update")
            .and().assertThat().contentIs("update");
-        
+
        STEP("4. Copy document to testFolder2 with ftp");
        FileModel copiedWordFile = new FileModel(wordFile);
        ftpProtocol.usingSite(testSitePublic).createFolder(testFolder2)
@@ -76,15 +76,15 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
        copiedWordFile.setCmisLocation(ftpProtocol.getLastResourceWithoutPrefix());
        ftpProtocol.usingResource(testFolder1).assertThat().hasFiles(wordFile)
            .and().usingResource(testFolder2).assertThat().hasFiles(copiedWordFile);
-        
+
        STEP("5. Update document from folder2, check its content is updated with Webdav");
        webDavProtocol.usingResource(copiedWordFile).update("Step5")
            .and().assertThat().contentIs("Step5");
-        
+
        STEP("6. Update document with WebDAV");
        webDavProtocol.authenticateUser(testUser1).usingResource(wordFile).update("WebDAVUpdate");
    }
-    
+
    /**
     * Scenario 84
     * 1. Create folder1 with webdav
@@ -150,7 +150,7 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
     * 13. Check file is deleted with WebDAV
     */
    @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL })
-    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, 
+    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION,
        description = "Update file with different user roles and protocols")
    public void updateFileWithDifferentRolesUsingDifferentProtocols() throws Exception
    {
@@ -268,55 +268,55 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
     * 9. User2 deletes document1
     * 10. User1 tries to delete tag2
     */
-//    @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL })
-//    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Check negative scenarios for tags")
-//    public void tagsNegativeScenariosTest() throws Exception
-//    {
-//        STEP("1. Create user1, user2");
-//        UserModel user1 = dataUser.createRandomTestUser();
-//        UserModel user2 = dataUser.createRandomTestUser();
-//        user2.setUserRole(UserRole.SiteManager);
-//
-//        STEP("2. User1 creates site1 and invites user2 as manager");
-//        SiteModel site = dataSite.usingUser(user1).createPublicRandomSite();
-//        restAPI.authenticateUser(user1).withCoreAPI().usingSite(site).addPerson(user2);
-//
-//        STEP("3. User1 adds document1 and tag1 to doc");
-//        dataContent.usingUser(user1).usingSite(site).createContent(testFile);
-//        RestTagModel tag = restAPI.withCoreAPI().usingResource(testFile).addTag("tag1");
-//        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
-//
-//        STEP("4. User2 gets tags and verifies tag1 appears");
-//        restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
-//
-//        STEP("5. User2 delete tag1");
-//        restAPI.withCoreAPI().usingResource(testFile).deleteTag(tag);
-//        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListDoesNotContain("tag", "tag1");
-//
-//        STEP("6. User1 tries to update tag1");
-//        restAPI.authenticateUser(user2).withCoreAPI().usingTag(tag).update("updatedTag");
-//        restAPI.assertStatusCodeIs(HttpStatus.FORBIDDEN)
-//            .assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED)
-//            .containsErrorKey(RestErrorModel.PERMISSION_DENIED_ERRORKEY);
-//
-//        STEP("7. User1 add new tag tag2");
-//        tag = restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).addTag("tag2");
-//        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag2");
-//
-//        STEP("8. User2 verifies tag2 appears and tag1 is not in the list");
-//        restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags()
-//            .assertThat().entriesListDoesNotContain("tag", "tag1")
-//            .assertThat().entriesListContains("tag", "tag2");
-//
-//        STEP("9. User2 deletes document1");
-//        dataContent.usingUser(user2).usingResource(testFile).deleteContent();
-//
-//        STEP("10. User1 tries to delete tag2");
-//        restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).deleteTag(tag);
-//        restAPI.assertStatusCodeIs(HttpStatus.NOT_FOUND)
-//            .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, testFile.getNodeRefWithoutVersion()))
-//            .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY);
-//    }
+    @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL })
+    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, description = "Check negative scenarios for tags")
+    public void tagsNegativeScenariosTest() throws Exception
+    {
+        STEP("1. Create user1, user2");
+        UserModel user1 = dataUser.createRandomTestUser();
+        UserModel user2 = dataUser.createRandomTestUser();
+        user2.setUserRole(UserRole.SiteManager);
+
+        STEP("2. User1 creates site1 and invites user2 as manager");
+        SiteModel site = dataSite.usingUser(user1).createPublicRandomSite();
+        restAPI.authenticateUser(user1).withCoreAPI().usingSite(site).addPerson(user2);
+
+        STEP("3. User1 adds document1 and tag1 to doc");
+        dataContent.usingUser(user1).usingSite(site).createContent(testFile);
+        RestTagModel tag = restAPI.withCoreAPI().usingResource(testFile).addTag("tag1");
+        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
+
+        STEP("4. User2 gets tags and verifies tag1 appears");
+        restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
+
+        STEP("5. User2 delete tag1");
+        restAPI.withCoreAPI().usingResource(testFile).deleteTag(tag);
+        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListDoesNotContain("tag", "tag1");
+
+        STEP("6. User1 tries to update tag1");
+        restAPI.authenticateUser(user2).withCoreAPI().usingTag(tag).update("updatedTag");
+        restAPI.assertStatusCodeIs(HttpStatus.FORBIDDEN)
+            .assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED)
+            .containsErrorKey(RestErrorModel.PERMISSION_DENIED_ERRORKEY);
+
+        STEP("7. User1 add new tag tag2");
+        tag = restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).addTag("tag2");
+        restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag2");
+
+        STEP("8. User2 verifies tag2 appears and tag1 is not in the list");
+        restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags()
+            .assertThat().entriesListDoesNotContain("tag", "tag1")
+            .assertThat().entriesListContains("tag", "tag2");
+
+        STEP("9. User2 deletes document1");
+        dataContent.usingUser(user2).usingResource(testFile).deleteContent();
+
+        STEP("10. User1 tries to delete tag2");
+        restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).deleteTag(tag);
+        restAPI.assertStatusCodeIs(HttpStatus.NOT_FOUND)
+            .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, testFile.getNodeRefWithoutVersion()))
+            .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY);
+    }
    
    /**
     * Scenario 83
@@ -329,9 +329,9 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
     * 7. User1 deletes the document1 with ftp
     * 8. Verify user2 cannot update document1 with cmis
     */
-        @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL }, expectedExceptions = CmisObjectNotFoundException.class, expectedExceptionsMessageRegExp = ".*Object not found:.*")
-        @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, description = "Negative scenarios for update document")
-        public void fileUpdateNegativeScenariosTest() throws Exception
+    @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL }, expectedExceptions = CmisObjectNotFoundException.class, expectedExceptionsMessageRegExp = ".*Object not found:.*")
+    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, description = "Negative scenarios for update document")
+    public void fileUpdateNegativeScenariosTest() throws Exception
        {
            STEP("1. Create user1, user2");
        UserModel user1 = dataUser.createRandomTestUser();
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
@@ -7,9 +7,7 @@ import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
-
 import org.alfresco.utility.model.UserModel;
-
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -40,17 +38,20 @@ public abstract class RenditionIntegrationTests extends RestTest
        FileModel file = new FileModel();
        file.setNodeRef(nodeId);

-        // 1. Create a rendition of the file using RESTAPI
+        // 1. Preemptively delete an existing rendition of the file using RESTAPI
+        restClient.withCoreAPI().usingNode(file).deleteNodeRendition(renditionId);
+
+        // 2. Create a rendition of the file using RESTAPI
        restClient.withCoreAPI().usingNode(file).createNodeRendition(renditionId);
        Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.ACCEPTED.value(),
                "Failed to submit a request for rendition. [" + fileName+ ", " + renditionId+"] [source file, rendition ID]. ");

-        // 2. Verify that a rendition of the file is created and has content using RESTAPI
+        // 3. Verify that a rendition of the file is created and has content using RESTAPI
        RestResponse restResponse = restClient.withCoreAPI().usingNode(file).getNodeRenditionContentUntilIsCreated(renditionId);
        Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.OK.value(),
                "Failed to produce rendition. [" + fileName+ ", " + renditionId+"] [source file, rendition ID] ");

-        // 3. Check the returned content type
+        // 4. Check the returned content type
        Assert.assertEquals(restClient.getResponseHeaders().getValue("Content-Type"), expectedMimeType+";charset=UTF-8",
                "Rendition was created but it has the wrong Content-Type. [" + fileName+ ", " + renditionId + "] [source file, rendition ID]");

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

@@ -51,7 +51,8 @@
        <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-model.version>2.6.0-A2</dependency.alfresco-transform-model.version>
+        <dependency.alfresco-transform-service.version>1.5.3</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>2.6.0</dependency.alfresco-transform-core.version>
        <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>

@@ -118,7 +119,7 @@
        <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
        <dependency.tas-utility.version>3.0.47</dependency.tas-utility.version>
        <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.79</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.80</dependency.tas-restapi.version>
        <dependency.tas-cmis.version>1.31</dependency.tas-cmis.version>
        <dependency.tas-email.version>1.8</dependency.tas-email.version>
        <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -146,7 +147,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.15</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
--- 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.15</version>
+        <version>23.1.0.23-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.15</version>
+        <version>23.1.0.23-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -713,7 +713,7 @@
        <dependency>
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-transform-model</artifactId>
-            <version>${dependency.alfresco-transform-model.version}</version>
+            <version>${dependency.alfresco-transform-core.version}</version>
        </dependency>

        <!-- Test dependencies -->
@@ -735,7 +735,7 @@
        <dependency>
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-transform-model</artifactId>
-            <version>${dependency.alfresco-transform-model.version}</version>
+            <version>${dependency.alfresco-transform-core.version}</version>
            <classifier>tests</classifier>
            <scope>test</scope>
        </dependency>
--- a/repository/src/main/java/org/alfresco/repo/event2/EventGeneratorQueue.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventGeneratorQueue.java
@@ -91,7 +91,7 @@ public class EventGeneratorQueue implements InitializingBean
            }
            catch (Exception e)
            {
-                LOGGER.error("Unexpected error while enqueuing maker function for repository event" + e);
+                LOGGER.error("Unexpected error while enqueuing maker function for repository event", e);
            }
        });
    }
@@ -122,7 +122,7 @@ public class EventGeneratorQueue implements InitializingBean
                        }
                        catch (Exception e)
                        {
-                            LOGGER.error("Unexpected error while dequeuing and sending repository event" + e);
+                            LOGGER.error("Unexpected error while dequeuing and sending repository event", e);
                        }
                    }
                }
--- a/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
+++ b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
@@ -25,27 +25,15 @@
 */
 package org.alfresco.repo.security.permissions.impl.acegi;

-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
 import net.sf.acegisecurity.AccessDeniedException;
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.ConfigAttribute;
 import net.sf.acegisecurity.ConfigAttributeDefinition;
 import net.sf.acegisecurity.afterinvocation.AfterInvocationProvider;
-
 import org.alfresco.opencmis.search.CMISResultSet;
+import org.alfresco.repo.search.SearchEngineResultSet;
 import org.alfresco.repo.search.SimpleResultSetMetaData;
 import org.alfresco.repo.search.impl.lucene.PagingLuceneResultSet;
-import org.alfresco.repo.search.impl.solr.SolrJSONResultSet;
 import org.alfresco.repo.search.impl.querymodel.QueryEngineResults;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.PermissionCheckCollection;
@@ -72,6 +60,17 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;

+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 /**
 * Enforce permission after the method call
 * 
@@ -276,8 +275,8 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
            {
                return decide(authentication, object, config, (ChildAssociationRef) returnedObject);
            }
-            else if (SolrJSONResultSet.class.isAssignableFrom(returnedObject.getClass()) &&
-                        (!anyDenyDenies || (!postProcessDenies && ((SolrJSONResultSet)returnedObject).getProcessedDenies())))
+            else if (SearchEngineResultSet.class.isAssignableFrom(returnedObject.getClass()) &&
+                        (!anyDenyDenies || (!postProcessDenies && ((SearchEngineResultSet)returnedObject).getProcessedDenies())))
            {
                return returnedObject;
            }
Author	SHA1	Message	Date
jlosornogil	02decc91d4	REPO-5712 Fix exception logging in EventGeneratorQueue Include the exception stacktrace so that any event framework wrong configuration can be easily detected.	2022-04-22 16:45:48 +02:00
Travis CI User	c9d27e55d6	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-21 17:28:10 +00:00
Travis CI User	d647c96ae4	[maven-release-plugin][skip ci] prepare release 23.1.0.22	2022-04-21 17:28:03 +00:00
Kacper Magdziarz	5a6f9a60f3	ACS-2768 Fix of Automate update of t-router and t-engine references in repositories (#1081 )	2022-04-21 17:47:50 +01:00
Travis CI User	ce2c0e2ac2	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-21 10:21:11 +00:00
Travis CI User	dfa9e754d5	[maven-release-plugin][skip ci] prepare release 23.1.0.21	2022-04-21 10:21:07 +00:00
Kacper Magdziarz	860065cf6c	ACS-2768 Automate update of t-router and t-engine references in repositories (#1067 ) * ACS-2768 reduce places need update of t-router and t-engine references in repositories replace alfresco-transform-model with alfresco-transform-core property Co-authored-by: alandavis <alan.davis@alfresco.com>	2022-04-21 11:11:43 +02:00
Travis CI User	2d7f8fba87	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-20 13:14:27 +00:00
Travis CI User	c2c4171756	[maven-release-plugin][skip ci] prepare release 23.1.0.20	2022-04-20 13:14:24 +00:00
Marcin Strankowski	af884cbb0e	Fix/acs 2851 intermittent integration full tests bulk 2 (#1074 ) * ACS-2851: Reverting commented out unstable test, as the intermittent failure seems unreproducible	2022-04-20 14:39:30 +02:00
Travis CI User	fb0be16155	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-20 09:57:27 +00:00
Travis CI User	f9d95136b2	[maven-release-plugin][skip ci] prepare release 23.1.0.19	2022-04-20 09:57:25 +00:00
Damian Ujma	26453c4112	ACS-2674 - fix/ACS-2674_delete_existing_rendition (#1073 ) * ACS-2674 Preventive delete an existing rendition of the file * ACS-2674 Correct the comment	2022-04-20 11:03:27 +02:00
Travis CI User	cb26098e8b	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-17 00:08:03 +00:00
Travis CI User	6766bfcfdf	[maven-release-plugin][skip ci] prepare release 23.1.0.18	2022-04-17 00:08:01 +00:00
Alfresco CI User	48df1e25ed	[force] Force release for 2022-04-17.	2022-04-17 00:03:05 +00:00
Travis CI User	52918e4ff5	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-13 21:45:40 +00:00
Travis CI User	40d70e797c	[maven-release-plugin][skip ci] prepare release 23.1.0.17	2022-04-13 21:45:37 +00:00
alandavis	6011868759	Pick up t-core 2.6.0-A3	2022-04-13 19:45:13 +01:00
Travis CI User	79ad480ddb	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-13 09:44:54 +00:00
Travis CI User	c12d8f98be	[maven-release-plugin][skip ci] prepare release 23.1.0.16	2022-04-13 09:44:52 +00:00
Damian Ujma	d2faadac57	ACS-2794 Use SearchEngineResultSet interface rather than concrete implementation (#1063 )	2022-04-13 11:10:22 +02:00
Travis CI User	7f1d28a417	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-12 14:14:52 +00:00