[maven-release-plugin][skip ci] prepare for next development iteration

* [MNT-22437] Remove ACS version from landing page

* [MNT-22437] Bump surf-webscripts to 8.33

(cherry picked from commit ace4691540)

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <modules>

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>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMAuditAPI.java

@@ -26,7 +26,6 @@
  */
 package org.alfresco.rest.v0;
 
-import static org.apache.http.HttpStatus.SC_OK;
 import static org.testng.Assert.assertTrue;
 
 import java.io.UnsupportedEncodingException;
@@ -37,7 +36,6 @@ import java.util.List;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
 import org.alfresco.rest.rm.community.util.PojoUtility;
-import org.apache.http.HttpResponse;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -60,8 +58,6 @@ public class RMAuditAPI extends BaseAPI
     private static final String RM_AUDIT_API = "{0}rma/admin/rmauditlog";
     private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}";
 
-    private static final String RM_AUDIT_LOG_AS_RECORD = "{0}node/{1}/rmauditlog";
-
     /**
      * Returns a list of rm audit entries .
      *
@@ -88,21 +84,6 @@ public class RMAuditAPI extends BaseAPI
         return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
     }
 
-    /**
-     * Returns a list of rm audit entries .
-     *
-     * @param user     The username of the user to use.
-     * @param password The password of the user.
-     * @param size     Maximum number of log entries to return
-     * @return return All return log entries
-     */
-    public List<AuditEntry> getRMAuditLogAll(String user, String password, final int size) {
-        String parameters = "size=" + size;
-        JSONArray auditEntries =  doGetRequest(user, password,
-            MessageFormat.format(RM_AUDIT_LOG_API,"{0}", parameters)).getJSONObject("data").getJSONArray("entries");
-        return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
-    }
-
     /**
      * Clear the list of audit entries.
      *
@@ -119,19 +100,5 @@ public class RMAuditAPI extends BaseAPI
                 && getRMAuditLog(username, password, 100, null).size() == 2);
     }
 
-    /**
-     * Logs the Audit Log as Record.
-     *
-     * @param username The username of the user to use.
-     * @param password The password of the user.
-     * @param recNodeRef The Record Node reference for which Audit log should be created as record
-     * @param destinationNodeRef The Folder id Node reference where the html file should be placed
-     * @throws AssertionError If the API call didn't create the Audit Log as Record.
-     */
-    public HttpResponse logsAuditLogAsRecord(String username, String password, String recNodeRef, String destinationNodeRef) {
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("destination", destinationNodeRef);
-        return doPostJsonRequest(username, password, SC_OK, requestParams, RM_AUDIT_LOG_AS_RECORD,recNodeRef);
-    }
 
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java

@@ -97,16 +97,4 @@ public class RecordFoldersAPI extends BaseAPI
         return null;
     }
 
-
-    public HttpResponse reOpenRecordFolder(String user, String password, String recordFolder)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordFolder);
-
-            JSONObject requestParams = new JSONObject();
-            requestParams.put("name", "openRecordFolder");
-            requestParams.put("nodeRef", recNodeRef);
-
-            return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-        }
-
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java

@@ -360,25 +360,4 @@ public class RecordsAPI extends BaseAPI
     {
         return getNodeRefSpacesStore() + getItemNodeRef(username, password, recordPath + "/" + recordName);
     }
-
-    /**
-     * Reopens the record given as parameter
-     *
-     * @param user       the user declaring the document as record
-     * @param password   the user's password
-     * @param recordName the record name
-     * @return The HTTP Response.
-     */
-
-    public HttpResponse reOpenRecord(String user, String password, String recordName)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordName);
-
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", "undeclareRecord");
-        requestParams.put("nodeRef", recNodeRef);
-
-        return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-    }
-
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditHoldsTest.java

@@ -1,146 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.rm.community.base.TestData.*;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.ADD_TO_HOLD;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.REMOVE_FROM_HOLD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.core.IsNot.not;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.testng.AssertJUnit.*;
-
-import java.util.Collections;
-import java.util.List;
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.audit.AuditEvents;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolder;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.v0.HoldsAPI;
-import org.alfresco.rest.v0.service.RMAuditService;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-public class AuditHoldsTest extends BaseRMRestTest {
-    private final String PREFIX = generateTestPrefix(AuditAddToHoldTests.class);
-    private final String HOLD1 = PREFIX + "hold1";
-    private SiteModel publicSite;
-    private FileModel testFile;
-    @Autowired
-    private RMAuditService rmAuditService;
-    @Autowired
-    private HoldsAPI holdsAPI;
-    @Autowired
-    private RoleService roleService;
-    private UserModel rmAdmin;
-    private RecordCategory recordCategory;
-    private RecordCategoryChild recordFolder1,recordFolder2;
-    private List<AuditEntry> auditEntries;
-    private String hold1NodeRef;
-    public static final String RECORD_FOLDER_THREE = "record-folder-three";
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForAuditAddToHoldTests()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
-
-        STEP("Create a hold");
-        hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD1, HOLD_REASON,
-            HOLD_DESCRIPTION);
-
-        STEP("Create a collaboration site with a test file.");
-        publicSite = dataSite.usingAdmin().createPublicRandomSite();
-        testFile = dataContent.usingAdmin().usingSite(publicSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Create a record category with 2 folders and 1 record");
-        recordCategory = createRootCategory(getRandomName("recordCategory"));
-        recordFolder1 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder1");
-        recordFolder2 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder2");
-        Record recordToBeAdded = createElectronicRecord(recordFolder1.getId(), PREFIX + "record");
-        assertStatusCode(CREATED);
-
-        STEP("Add some items to the hold, then remove them from the hold");
-        final List<String> itemsList = asList(testFile.getNodeRefWithoutVersion(), recordToBeAdded.getId(), recordFolder2.getId());
-        final List<String> holdsList = Collections.singletonList(HOLD1);
-        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), recordToBeAdded.getId(), HOLD1);
-        holdsAPI.removeItemsFromHolds(rmAdmin.getUsername(), rmAdmin.getPassword(), itemsList, holdsList);
-
-        STEP("Delete the record folder that was held");
-        getRestAPIFactory().getRecordFolderAPI().deleteRecordFolder(recordFolder2.getId());
-
-        STEP("Rename the parent of the record that was held");
-        RecordFolder recordFolder = RecordFolder.builder().name(RECORD_FOLDER_THREE).build();
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(recordFolder, recordFolder1.getId());
-    }
-    /**
-     * Data provider with hold events that have links to held items
-     *
-     * @return the hold events
-     */
-    @DataProvider (name = "holdsEvents")
-    public Object[][] getHoldEvents()
-    {
-        return new AuditEvents[][]
-            {
-                { ADD_TO_HOLD },
-                { REMOVE_FROM_HOLD }
-            };
-    }
-    @Test (dataProvider = "holdsEvents")
-    public void checkItemPathLink(AuditEvents event) {
-        auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), event);
-        assertFalse("Audit results should not be empty",auditEntries.size()==0);
-        final String auditedEvent = event + " - " + testFile.getName();
-        assertTrue("Audit results should contain one " + auditedEvent + " event",auditEntries.stream().anyMatch(e -> e.getEvent().startsWith(event.eventDisplayName)));
-        STEP("Check the audit log contains only an entry for add to hold.");
-        assertThat(auditEntries, is(not(empty())));
-    }
-    @AfterClass(alwaysRun = true)
-    private void cleanup() {
-        dataSite.usingAdmin().deleteSite(publicSite);
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordFolder(recordFolder2.getId());
-        deleteRecordCategory(recordCategory.getId());
-        rmAuditService.clearAuditLog();
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/ElectronicRecordAuditLogTest.java

@@ -1,244 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.AssertJUnit;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class ElectronicRecordAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    /* electronic record details */
-    private static final String AUDIT_ELECTRONIC_RECORD = generateTestPrefix(ElectronicRecordAuditLogTest.class) + "electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD = "Complete Reopen Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record electronicRecord, electronicRecord2;
-
-    @BeforeClass(alwaysRun = true)
-    public void electronicRecordsAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rmAdmin.get().getUsername(),
-            "Administrator");
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-
-        electronicRecord = createElectronicRecord(recordFolder1.getId(),AUDIT_ELECTRONIC_RECORD,rmAdmin.get());
-    }
-
-    @Test(description = "Audit log for newly filed electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newElectronicRecordAudit() {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 2 events: "file to" and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "newElectronicRecordAudit",
-            description = "Viewing electronic record audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void electronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "electronicRecordAuditIsEvent",
-            description = "Rename electronic record is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameElectronicRecord() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameElectronicRecord = createRecordModel("edited " + electronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameElectronicRecord, electronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test (
-        dependsOnMethods = "newElectronicRecordAudit",
-        description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenElectronicRecord() {
-        electronicRecord2 = createElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "completeAndReopenElectronicRecord",
-            description = "File electronic record's audit log as record"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-        getRecordNodeRef(electronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-            .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        HttpEntity entity = httpResponse.getEntity();
-        String responseString = null;
-        try {
-            responseString = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        JSONObject result = new JSONObject(responseString);
-        return result;
-    }
-
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecord(electronicRecord.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/NonElectronicRecordAuditLogTest.java

@@ -1,246 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.AssertJUnit;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-
-public class NonElectronicRecordAuditLogTest extends BaseRMRestTest {
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record nonElectronicRecord , nonElectronicRecord2;
-    private static final String AUDIT_NON_ELECTRONIC_RECORD = generateTestPrefix(NonElectronicRecordAuditLogTest.class) + "non electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD = "Complete Reopen Non-Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void nonElectronicRecordAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-        nonElectronicRecord = createNonElectronicRecord(recordFolder1.getId(),AUDIT_NON_ELECTRONIC_RECORD,rmAdmin.get());
-
-    }
-
-    @Test(description = "Audit log for newly filed non-electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newNonElectronicRecordAudit()
-    {
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 3 events: "created object", "file to" and metadata update
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-        assertTrue("Created Object Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "newNonElectronicRecordAudit",
-                    description = "Viewing Non electronic record audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void nonElectronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "nonElectronicRecordAuditIsEvent",
-                    description = "Rename electronic record is an edit metadata event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameNonElectronicRecord()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameNonElectronicRecord = createRecordModel("edited " + nonElectronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameNonElectronicRecord, nonElectronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test (dependsOnMethods = "newNonElectronicRecordAudit",description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenNonElectronicRecord()
-    {
-        nonElectronicRecord2 = createNonElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-
-    }
-    @Test
-            (
-                    dependsOnMethods = "completeAndReopenNonElectronicRecord",
-                    description = "File electronic record's audit log as record"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileNonElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                getRecordNodeRef(nonElectronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-                .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        HttpEntity entity = httpResponse.getEntity();
-        String responseString = null;
-        try {
-            responseString = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        JSONObject result = new JSONObject(responseString);
-        return result;
-    }
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void nonElectronicRecordAuditLogCleanup() {
-        deleteRecord(nonElectronicRecord.getId());
-        deleteRecord(nonElectronicRecord2.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordCategoryAuditLogTest.java

@@ -1,120 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
-public class RecordCategoryAuditLogTest extends BaseRMRestTest {
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    private final String TEST_PREFIX = generateTestPrefix(RecordCategoryAuditLogTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private static final String AUDIT_CATEGORY = generateTestPrefix(RecordCategoryAuditLogTest.class) + "category";
-    private RecordCategory recordCategoryAudit;
-
-    @BeforeClass(alwaysRun = true)
-    public void recordCategoryAuditLogSetup() {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-    }
-
-    @Test
-    @AlfrescoTest(jira = "RM-2768")
-    public void recordCategoryAudit() throws Exception {
-        STEP("Create root level category");
-        recordCategoryAudit = createRootCategory(AUDIT_CATEGORY);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        // newly created record category contains 3 events: object creation, inherited permissions set to false and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAudit",
-            description = "Viewing audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void recordCategoryAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAuditIsEvent",
-            description = "Record category rename is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameRecordCategory() {
-        String categoryName = "Category name " + getRandomAlphanumeric();
-        RecordCategory rootRecordCategory = createRootCategory(categoryName);
-        String newCategoryName = "Rename " + categoryName;
-        RecordCategory recordCategoryUpdated = RecordCategory.builder().name(newCategoryName).build();
-        RecordCategory renamedRecordCategory = getRestAPIFactory().getRecordCategoryAPI().updateRecordCategory(recordCategoryUpdated, rootRecordCategory.getId());
-
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecordCategory(recordCategoryAudit.getId());
-        dataUser.deleteUser(new UserModel(RM_ADMIN,
-            getAdminUser().getPassword()));
-        auditLog.clearAuditLog(getAdminUser().getUsername(), getAdminUser().getPassword());
-    }
-}
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordFolderAuditLogTest.java

@@ -1,175 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolder;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordFolderModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class RecordFolderAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void recordFolderAuditLogSetup() {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-    }
-
-    @Test(description = "Audit log for empty record folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAudit() {
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(), TITLE);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAudit",
-                    description = "Viewing record folder audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAuditIsEvent",
-                    description = "Record folder rename is an edit metadata event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void renameRecordFolder() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(), rmAdmin.get().getPassword());
-        RecordFolder renameRecordFolder = createRecordFolderModel(category1.getId(), "edited");
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(renameRecordFolder, recordFolder1.getId());
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-//        assertTrue("Move To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Move to")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test(dependsOnMethods = "recordFolderAudit",
-        description = "Close and reopen folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void closeReopenFolder() {
-        //close folder
-        recordFoldersAPI.closeRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Folder Close Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Close Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        //reopen folder
-        recordFoldersAPI.reOpenRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-
-                List<AuditEntry> auditEntries  = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Reopen Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Open Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-    @AfterMethod
-    private void closeAuditLog()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass (alwaysRun = true)
-    public void recordFolderAuditLogCleanup()
-    {
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-
-}

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <modules>

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>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java

@@ -30,10 +30,8 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 import static org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase.PARAM_NO_ERROR_CHECK;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
 import org.alfresco.error.AlfrescoRuntimeException;
@@ -49,6 +47,7 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 
 /**
@@ -65,6 +64,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     /** batching properties */
     private int batchSize;
     public static final int DEFAULT_BATCH_SIZE = 500;
+    private static final String MSG_NODE_FROZEN = "rm.action.node.frozen.error-message";
 
     /** list of disposition actions to automatically execute */
     private List<String> dispositionActions;
@@ -194,7 +194,6 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
             boolean hasMore = true;
             int skipCount = 0;
-            List<NodeRef> resultNodes = new ArrayList<>();
 
             if (batchSize < 1)
             {
@@ -215,14 +214,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
                 // execute search
                 ResultSet results = searchService.query(params);
-                if(results != null)
+                List<NodeRef> resultNodes = results.getNodeRefs();
-                {
-                    // filtering out the hold/freezed cases from the result set
-                    resultNodes =
-                            results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ?
-                                    !freezeService.isFrozenOrHasFrozenChildren(node) :
-                                    !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList());
-                }
                 hasMore = results.hasMore();
                 skipCount += resultNodes.size(); // increase by page size
                 results.close();
@@ -273,6 +265,12 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
                 }
                 Map<String, Serializable> props = Map.of(PARAM_NO_ERROR_CHECK, false);
 
+                if (freezeService.isFrozenOrHasFrozenChildren(parent.getParentRef()))
+                {
+                    log.debug(I18NUtil.getMessage(MSG_NODE_FROZEN, dispAction));
+                    continue;
+                }
+
                 try
                 {
                     // execute disposition action

amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties

@@ -4,8 +4,8 @@
 
 # Version label
 version.major=7
-version.minor=4
+version.minor=3
-version.revision=0
+version.revision=1
 version.label=
 
 # Edition label

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java

@@ -170,7 +170,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         executer.executeImpl();
 
         // then
-        verify(mockedNodeService, times(2)).getPrimaryParent(any(NodeRef.class));
+
         // ensure the query is executed and closed
         verifyQueryTimes(2);
 
@@ -206,7 +206,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         executer.executeImpl();
 
         // then
-        verify(mockedNodeService, times(1)).getPrimaryParent(any(NodeRef.class));
+
         // ensure the query is executed and closed
         verifyQueryTimes(1);
 
@@ -262,11 +262,11 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // ensure each node is process correctly
         // node1
         verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-        verify(mockedNodeService, times(3)).getPrimaryParent(node1);
+        verify(mockedNodeService, times(1)).getPrimaryParent(node1);
         verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(CUTOFF), anyMap());
         // node2
         verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-        verify(mockedNodeService, times(3)).getPrimaryParent(node2);
+        verify(mockedNodeService, times(1)).getPrimaryParent(node2);
         verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(RETAIN), anyMap());
 
         // ensure no more interactions
@@ -329,7 +329,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // call the service
         executer.executeImpl();
 
-        // check the loop iterated through all the elements
+        // check the loop iterated trough all the elements
         verify(mockedNodeService).exists(node1);
         verify(mockedNodeService).exists(node2);
         verify(mockedNodeService).exists(node3);

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>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <properties>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>20.17</version>
+      <version>18.8-SNAPSHOT</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.4.0</version>
+            <version>6.3.1</version>
         </dependency>
 
         <!-- the cxf libs were updated, see dependencyManagement section -->

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/scripts/start-compose.sh

@@ -1,21 +1,9 @@
 #!/usr/bin/env bash
-set -x
 
 export DOCKER_COMPOSE_PATH=$1
-export DOCKER_COMPOSES=""
+export CLEAN_UP="$2"
-export CLEAN_UP=""
 
-for var in "$@"
+if [ -z "$DOCKER_COMPOSE_PATH" ]
-do
-  if [ "$var" == "no-clean-up" ]
-  then
-    export CLEAN_UP="$var"
-  else
-    export DOCKER_COMPOSES+="--file $var "
-  fi
-done
-
-if [ -z "$DOCKER_COMPOSES" ]
 then
   echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\""
   exit 1
@@ -27,8 +15,8 @@ fi
 # The second parameter can be used to avoid doing a clean up if we are doing a restart test.
 if [ "$CLEAN_UP" != "no-clean-up" ]
 then
-  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill
+  docker-compose --file "${DOCKER_COMPOSE_PATH}" kill
-  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f
+  docker-compose --file "${DOCKER_COMPOSE_PATH}" rm -f
 
   export GENERATED_IMAGES=$(docker images | grep '^environment_' | awk '{ print $3 }')
   if [ -n "$GENERATED_IMAGES" ]
@@ -43,7 +31,7 @@ export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-tra
 export 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 ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
+docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
 
 if [ $? -eq 0 ]
 then

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <organization>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoritesTests.java

@@ -14,7 +14,6 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 public class AddFavoritesTests extends RestTest
@@ -355,7 +354,6 @@ public class AddFavoritesTests extends RestTest
     @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
             description = "Verify add file favorite with tag id returns status code 404")
     @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    @Ignore
     public void addFileFavoriteUsingTagId() throws Exception
     {
         FileModel file = dataContent.usingSite(siteModel).usingUser(adminUserModel).createContent(CMISUtil.DocumentType.TEXT_PLAIN);

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java

@@ -951,28 +951,6 @@ public class CreateRulesTests extends RestTest
         restClient.assertLastError().containsSummary("Category in condition is invalid");
     }
 
-    /**
-     * Check we get 400 error when condition comparator is invalid
-     */
-    @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
-    public void createRuleWithConditions_invalidComparator()
-    {
-        STEP("Try to create a rule with invalid comparator in conditions.");
-        final String comparator = "greaterthan";
-        RestCompositeConditionDefinitionModel conditions = rulesUtils.createCompositeCondition(List.of(
-                rulesUtils.createCompositeCondition(!INVERTED, List.of(
-                        rulesUtils.createSimpleCondition("size", comparator, "500")
-                ))
-        ));
-        RestRuleModel ruleModel = rulesUtils.createRuleModelWithDefaultValues();
-        ruleModel.setConditions(conditions);
-
-        restClient.authenticateUser(user).withPrivateAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        restClient.assertStatusCodeIs(BAD_REQUEST);
-        restClient.assertLastError().containsSummary("Comparator value for condition is invalid: " + comparator);
-    }
-
     private String getAddPermissionsBody(String username, String role)
     {
         JsonObject userPermission = Json.createObjectBuilder().add("permissions",

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/ExecuteRulesTests.java

@@ -30,10 +30,7 @@ import static org.alfresco.rest.rules.RulesTestsUtils.LOCKABLE_ASPECT;
 import static org.alfresco.rest.rules.RulesTestsUtils.RULE_NAME_DEFAULT;
 import static org.alfresco.utility.report.log.Step.STEP;
 
-import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.RestTest;
@@ -297,28 +294,5 @@ public class ExecuteRulesTests extends RestTest
         rulesUtils.assertThat(fileNode).containsAspects(AUDIO_ASPECT);
     }
 
-    /**
+    //TODO: add test(s) that would cover handling executing broken rule and/or broken rule execution (ACS-3699)
-     * Try to execute rule with broken action and receive 404 error.
-     */
-    @Test(groups = { TestGroup.REST_API, TestGroup.RULES, TestGroup.ACTIONS })
-    public void executeRules_copyActionWithDeletedDestinationFolder()
-    {
-        FolderModel owningFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-        FileModel owningFolderFile = dataContent.usingUser(user).usingResource(owningFolder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        FolderModel destinationFolder = dataContent.usingUser(user).usingSite(site).createFolder();
-
-        STEP("Create copy action and rule");
-        final Map<String, Serializable> copyParams =
-                Map.of("destination-folder", destinationFolder.getNodeRef(), "deep-copy", true);
-        final RestActionBodyExecTemplateModel copyAction = rulesUtils.createCustomActionModel("copy", copyParams);
-        final RestRuleModel ruleModel = rulesUtils.createRuleModelWithDefaultValues();
-        ruleModel.setActions(Arrays.asList(copyAction));
-
-        restClient.authenticateUser(user).withPrivateAPI().usingNode(owningFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
-
-        STEP("Delete destination folder and execute rule");
-        restClient.authenticateUser(user).withCoreAPI().usingNode(destinationFolder).deleteNode(destinationFolder.getNodeRef());
-        restClient.authenticateUser(user).withPrivateAPI().usingNode(owningFolder).executeRules(rulesUtils.createRuleExecutionRequest());
-        restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND);
-    }
 }

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/war/src/main/webapp/index.jsp

@@ -71,7 +71,7 @@ ModuleDetails shareServicesModule = moduleService.getModule("alfresco-share-serv
          </div>
 
          <div class="index-list">
-            <h4><%=descriptorService.getServerDescriptor().getEdition()%>&nbsp;-&nbsp;<%=descriptorService.getServerDescriptor().getVersion()%></h4>
+            <h4><%=descriptorService.getServerDescriptor().getEdition()%></h4>
             <p></p>
             <p><a href="http://docs.alfresco.com/">Online Documentation</a></p>
             <p></p>

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>20.17</version>
+    <version>18.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -24,8 +24,8 @@
 
     <properties>
         <acs.version.major>7</acs.version.major>
-        <acs.version.minor>4</acs.version.minor>
+        <acs.version.minor>3</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
@@ -53,17 +53,17 @@
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <dependency.alfresco-transform-service.version>2.0.0</dependency.alfresco-transform-service.version>
         <dependency.alfresco-transform-core.version>3.0.0</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-greenmail.version>6.5</dependency.alfresco-greenmail.version>
+        <dependency.alfresco-greenmail.version>6.4</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.16</dependency.acs-event-model.version>
 
         <dependency.spring.version>5.3.23</dependency.spring.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
-        <dependency.jackson.version>2.14.0</dependency.jackson.version>
+        <dependency.jackson.version>2.14.0-rc1</dependency.jackson.version>
-        <dependency.cxf.version>3.5.4</dependency.cxf.version>
+        <dependency.cxf.version>3.5.3</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.32</dependency.webscripts.version>
+        <dependency.webscripts.version>8.33</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>4.6.1</dependency.mockito-core.version>
         <dependency.assertj.version>3.23.1</dependency.assertj.version>
         <dependency.org-json.version>20220320</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
@@ -77,7 +77,7 @@
         <dependency.gytheio.version>0.17</dependency.gytheio.version>
         <dependency.groovy.version>3.0.12</dependency.groovy.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
-        <dependency.spring-security.version>5.7.5</dependency.spring-security.version>
+        <dependency.spring-security.version>5.7.3</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.2.2</dependency.poi.version>
         <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
@@ -88,11 +88,11 @@
         <dependency.netty.qpid.version>4.1.72.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
         <dependency.netty-tcnative.version>2.0.53.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
         <dependency.activemq.version>5.17.1</dependency.activemq.version>
-        <dependency.apache-compress.version>1.22</dependency.apache-compress.version>
+        <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.63</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.61</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
@@ -109,7 +109,7 @@
         <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.3.1-A2</alfresco.googledrive.version>
+        <alfresco.googledrive.version>3.3.0</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.5.0</alfresco.aos-module.version>
         <alfresco.api-explorer.version>7.3.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
@@ -123,7 +123,7 @@
         <dependency.tas-utility.version>3.0.56</dependency.tas-utility.version>
         <dependency.rest-assured.version>5.2.0</dependency.rest-assured.version>
         <dependency.tas-restapi.version>1.135</dependency.tas-restapi.version>
-        <dependency.tas-email.version>1.11</dependency.tas-email.version>
+        <dependency.tas-email.version>1.9</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.7</dependency.tas-webdav.version>
         <dependency.tas-ftp.version>1.7</dependency.tas-ftp.version>
         <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>
@@ -149,7 +149,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>20.17</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -651,7 +651,7 @@
             <dependency>
                 <groupId>com.github.junrar</groupId>
                 <artifactId>junrar</artifactId>
-                <version>7.5.4</version>
+                <version>7.5.3</version>
             </dependency>
             <dependency>
                 <groupId>com.github.fge</groupId>
@@ -736,7 +736,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.12.1</version>
+                <version>2.11.1</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -936,7 +936,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-war-plugin</artifactId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleSimpleConditionModelMapper.java

@@ -64,7 +64,6 @@ public class RestRuleSimpleConditionModelMapper implements RestModelMapper<Simpl
     static final String FIELD_NOT_NULL = "Field in condition must not be blank";
     static final String PARAMETER_NOT_NULL = "Parameter in condition must not be blank";
     static final String COMPARATOR_NOT_NULL = "Comparator in condition must not be blank";
-    static final String INVALID_COMPARATOR_VALUE = "Comparator value for condition is invalid: %s";
     private final NamespaceService namespaceService;
     private final Nodes nodes;
 
@@ -158,23 +157,13 @@ public class RestRuleSimpleConditionModelMapper implements RestModelMapper<Simpl
                     parameterValues.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, QName.createQName(field, namespaceService));
                 }
                 checkStringNotBlank(restModel.getComparator(), COMPARATOR_NOT_NULL);
-                parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, getComparatorValue(restModel.getComparator()));
+                parameterValues.put(ComparePropertyValueEvaluator.PARAM_OPERATION, restModel.getComparator().toUpperCase());
                 parameterValues.put(ComparePropertyValueEvaluator.PARAM_VALUE, parameter);
                 break;
         }
         return new ActionConditionImpl(UUID.randomUUID().toString(), conditionDefinitionId, parameterValues);
     }
 
-    private String getComparatorValue(String comparator)
-    {
-        try
-        {
-            return ComparePropertyValueOperation.valueOf(comparator.toUpperCase()).toString();
-        } catch (IllegalArgumentException e) {
-            throw new InvalidArgumentException(String.format(INVALID_COMPARATOR_VALUE, comparator));
-        }
-    }
-
     private void checkStringNotBlank(final String string, final String message) {
         if (Strings.isBlank(string))
         {

remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js

@@ -3,12 +3,13 @@ function main()
    // Get the args
    var siteShortName = url.templateArgs.shortname,
       site = siteService.getSite(siteShortName),
-      filter = ((args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "" )+ " [hint:useCQ]",
       maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10),
       authorityType = args.authorityType,
       zone = args.zone,
       sortBy = args.sortBy,
       sortAsc = args.dir != "desc";
+   
+  var filter;
 
 
    if (authorityType != null)
@@ -28,6 +29,7 @@ function main()
 
    if (authorityType == null || authorityType == "USER")
    {
+      filter = ((args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "" )+ " [hint:useCQ]";
       // Get the collection of people
       peopleFound = sortBy != null ? people.getPeople(filter, maxResults, sortBy, sortAsc) : people.getPeople(filter, maxResults);
 
@@ -67,6 +69,7 @@ function main()
 
    if (authorityType == null || authorityType == "GROUP")
    {
+      filter = (args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "";
       // Get the collection of groups
       paging = utils.createPaging(maxResults, -1);
       groupsFound = groups.getGroupsInZone(filter, zone, paging, "displayName");
@@ -96,4 +99,4 @@ function contains(arr, value) {
     return false;
 }
 
-main();
+main();

remote-api/src/test/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleSimpleConditionModelMapperTest.java

@@ -28,7 +28,6 @@ package org.alfresco.rest.api.impl.mapper.rules;
 
 import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.COMPARATOR_NOT_NULL;
 import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.FIELD_NOT_NULL;
-import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.INVALID_COMPARATOR_VALUE;
 import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAMETER_NOT_NULL;
 import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAM_CATEGORY;
 import static org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper.PARAM_MIMETYPE;
@@ -367,22 +366,6 @@ public class RestRuleSimpleConditionModelMapperTest
                 .hasMessageContaining(COMPARATOR_NOT_NULL);
     }
 
-    @Test
-    public void testToServiceModel_invalidComparator()
-    {
-        final String comparator = "greaterthan";
-        final SimpleCondition simpleConditionNullComparator = SimpleCondition.builder()
-                .field("size")
-                .comparator(comparator)
-                .parameter("65000")
-                .create();
-
-        // when
-        assertThatThrownBy(() -> objectUnderTest.toServiceModel(simpleConditionNullComparator))
-                .isInstanceOf(InvalidArgumentException.class)
-                .hasMessageContaining(String.format(INVALID_COMPARATOR_VALUE, comparator));
-    }
-
     private static ActionCondition createActionCondition(final String actionDefinitionName)
     {
         return new ActionConditionImpl("fake-id", actionDefinitionName, createParameterValues());

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.17</version>
+        <version>18.8-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
-            <version>72.1</version>
+            <version>71.1</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -374,7 +374,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.4.0</version>
+            <version>6.3.1</version>
         </dependency>
 
         <!-- GData -->

repository/src/main/java/org/alfresco/repo/content/transform/RemoteTransformerClient.java

@@ -25,6 +25,10 @@
  */
 package org.alfresco.repo.content.transform;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.StringJoiner;
+
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -44,9 +48,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
-import java.io.IOException;
-import java.util.StringJoiner;
-
 /**
  * Client class that transfers content (from a ContentReader) to a remote transformation agent together with
  * request parameters that will be used to transform the content. The transformed content is then returned and
@@ -86,44 +87,33 @@ public class RemoteTransformerClient
     }
 
     public void request(ContentReader reader, ContentWriter writer, String sourceMimetype, String sourceExtension,
-                        String targetExtension, long timeoutMs, Log logger, String... args)
+            String targetExtension, long timeoutMs, Log logger, String... args)
     {
+
         if (args.length % 2 != 0)
         {
             throw new IllegalArgumentException("There should be a value for each request property");
         }
 
         StringJoiner sj = new StringJoiner(" ");
-        HttpEntity reqEntity = getRequestEntity(reader, sourceMimetype, sourceExtension, targetExtension, timeoutMs, args, sj);
 
-        request(logger, sourceExtension, targetExtension, reqEntity, writer, sj.toString());
+        try (InputStream contentStream = reader.getContentInputStream())
+        {
+            HttpEntity reqEntity = getRequestEntity(contentStream, sourceMimetype, sourceExtension, targetExtension, timeoutMs,
+                    args, sj);
+
+            request(logger, sourceExtension, targetExtension, reqEntity, writer, sj.toString());
+        }
+        catch (IOException e)
+        {
+            throw new AlfrescoRuntimeException("Failed to read content from reader", e);
+        }
     }
 
-    HttpEntity getRequestEntity(ContentReader reader, String sourceMimetype, String sourceExtension,
+    HttpEntity getRequestEntity(ContentReader reader, String sourceMimetype, String sourceExtension, String targetExtension,
-                                        String targetExtension, long timeoutMs, String[] args, StringJoiner sj)
+            long timeoutMs, String[] args, StringJoiner sj)
     {
-        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        return getRequestEntity(reader.getContentInputStream(), sourceMimetype, sourceExtension, targetExtension, timeoutMs, args, sj);
-        ContentType contentType = ContentType.create(sourceMimetype);
-        builder.addBinaryBody("file", reader.getContentInputStream(), contentType, "tmp."+sourceExtension);
-        builder.addTextBody("targetExtension", targetExtension);
-        sj.add("targetExtension" + '=' + targetExtension);
-        for (int i=0; i< args.length; i+=2)
-        {
-            if (args[i+1] != null)
-            {
-                builder.addTextBody(args[i], args[i + 1]);
-
-                sj.add(args[i] + '=' + args[i + 1]);
-            }
-        }
-
-        if (timeoutMs > 0)
-        {
-            String timeoutMsString = Long.toString(timeoutMs);
-            builder.addTextBody("timeout", timeoutMsString);
-            sj.add("timeout=" + timeoutMsString);
-        }
-        return builder.build();
     }
 
     void request(Log logger, String sourceExtension, String targetExtension, HttpEntity reqEntity, ContentWriter writer, String args)
@@ -331,6 +321,33 @@ public class RemoteTransformerClient
         return httpclient.execute(httpGet);
     }
 
+    private HttpEntity getRequestEntity(InputStream contentStream, String sourceMimetype, String sourceExtension,
+            String targetExtension, long timeoutMs, String[] args, StringJoiner sj)
+    {
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        ContentType contentType = ContentType.create(sourceMimetype);
+        builder.addBinaryBody("file", contentStream, contentType, "tmp." + sourceExtension);
+        builder.addTextBody("targetExtension", targetExtension);
+        sj.add("targetExtension" + '=' + targetExtension);
+        for (int i = 0; i < args.length; i += 2)
+        {
+            if (args[i + 1] != null)
+            {
+                builder.addTextBody(args[i], args[i + 1]);
+
+                sj.add(args[i] + '=' + args[i + 1]);
+            }
+        }
+
+        if (timeoutMs > 0)
+        {
+            String timeoutMsString = Long.toString(timeoutMs);
+            builder.addTextBody("timeout", timeoutMsString);
+            sj.add("timeout=" + timeoutMsString);
+        }
+        return builder.build();
+    }
+
     // Strip out just the error message in the response
     private String getErrorMessage(HttpEntity resEntity) throws IOException
     {

repository/src/main/java/org/alfresco/repo/download/CreateDownloadArchiveAction.java

@@ -1,28 +1,28 @@
-/*
+/*
- * #%L
+ * #%L
- * Alfresco Repository
+ * Alfresco Repository
- * %%
+ * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
+ * %%
- * This file is part of the Alfresco software. 
+ * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
+ * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
+ * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
+ * provided under the following open source license terms:
- * 
+ * 
- * Alfresco is free software: you can redistribute it and/or modify
+ * 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
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- * 
+ * 
- * Alfresco is distributed in the hope that it will be useful,
+ * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU Lesser General Public License for more details.
- * 
+ * 
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
+ * #L%
- */
+ */
 package org.alfresco.repo.download;
 
 import java.io.File;
@@ -36,7 +36,6 @@ import org.alfresco.model.ForumModel;
 import org.alfresco.model.RenditionModel;
 import org.alfresco.repo.action.executer.ActionExecuter;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
-import org.alfresco.repo.rule.RuleModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -204,7 +203,7 @@ public class CreateDownloadArchiveAction extends ActionExecuterAbstractBase
                 crawlerParameters.setExportFrom(exportFrom);
                 
                 crawlerParameters.setCrawlSelf(true);
-                crawlerParameters.setExcludeChildAssocs(new QName[] {RenditionModel.ASSOC_RENDITION, ForumModel.ASSOC_DISCUSSION, RuleModel.ASSOC_RULE_FOLDER });
+                crawlerParameters.setExcludeChildAssocs(new QName[] {RenditionModel.ASSOC_RENDITION, ForumModel.ASSOC_DISCUSSION});
                 crawlerParameters.setExcludeAspects(new QName[] {ContentModel.ASPECT_WORKING_COPY});
         
                 // Get an estimate of the size for statuses

repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java

@@ -272,7 +272,7 @@ public class SolrJSONResultSet implements SearchEngineResultSet {
                             {
                                 facetEntryName = facets.getString(i);
                             }
-                            Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
+                            Integer facetEntryCount = Integer.valueOf(facets.getInt(i+1));
                             Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
                             facetValues.add(pair);
                         }

repository/src/main/resources/alfresco/repository.properties

@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=18000
+version.schema=17100
 
 # Directory configuration
 

repository/src/test/java/org/alfresco/AllUnitTestsSuite.java

@@ -77,7 +77,6 @@ import org.junit.runners.Suite;
     org.alfresco.repo.rule.RuleServiceImplUnitTest.class,
     org.alfresco.repo.service.StoreRedirectorProxyFactoryTest.class,
     org.alfresco.repo.site.RoleComparatorImplTest.class,
-    org.alfresco.repo.template.UnsafeMethodsTest.class,
     org.alfresco.repo.tenant.MultiTAdminServiceImplTest.class,
     org.alfresco.repo.thumbnail.ThumbnailServiceImplParameterTest.class,
     org.alfresco.repo.transfer.ContentChunkerImplTest.class,

repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java

@@ -27,7 +27,6 @@ package org.alfresco.repo.download;
 
 import net.sf.acegisecurity.Authentication;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.action.executer.AddFeaturesActionExecuter;
 import org.alfresco.repo.model.Repository;
 import org.alfresco.repo.node.SystemNodeUtils;
 import org.alfresco.repo.node.integrity.IntegrityChecker;
@@ -35,8 +34,6 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.cmr.action.Action;
-import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.admin.RepoAdminService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.download.DownloadService;
@@ -50,8 +47,6 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.rule.RuleService;
-import org.alfresco.service.cmr.rule.RuleType;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
@@ -80,7 +75,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -88,7 +82,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
@@ -135,8 +128,6 @@ public class DownloadServiceIntegrationTest
     private static RetryingTransactionHelper TRANSACTION_HELPER;
     private static IntegrityChecker          INTEGRITY_CHECKER;
     private static RepoAdminService          REPO_ADMIN_SERVICE;
-    private static RuleService               RULE_SERVICE;
-    private static ActionService ACTION_SERVICE;
     
     // Test Content 
     private NodeRef rootFolder;
@@ -201,8 +192,6 @@ public class DownloadServiceIntegrationTest
         INTEGRITY_CHECKER.setFailOnViolation(true);
         INTEGRITY_CHECKER.setTraceOn(true);
         REPO_ADMIN_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("RepoAdminService", RepoAdminService.class);
-        RULE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("ruleService", RuleService.class);
-        ACTION_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("actionService", ActionService.class);
     }
  
     /**
@@ -218,49 +207,28 @@ public class DownloadServiceIntegrationTest
         NodeRef COMPANY_HOME = repositoryHelper.getCompanyHome();
         
         // Create some static test content
-        rootFolder = testNodes.createNode(COMPANY_HOME, "rootFolder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
+       rootFolder = testNodes.createNode(COMPANY_HOME, "rootFolder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
-        allEntries.add("rootFolder/");
+       allEntries.add("rootFolder/");
-
-        TRANSACTION_HELPER.doInTransaction(() -> {
-            org.alfresco.service.cmr.rule.Rule parentRule = new org.alfresco.service.cmr.rule.Rule();
-            parentRule.setRuleTypes(Collections.singletonList(RuleType.INBOUND));
-            parentRule.setTitle("DownloadServiceIntegrationTest" + GUID.generate());
-            parentRule.setDescription("Add Classifiable");
-            Action action = ACTION_SERVICE.createAction(AddFeaturesActionExecuter.NAME);
-            action.setParameterValue(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_CLASSIFIABLE);
-            parentRule.setAction(action);
-            parentRule.applyToChildren(true);
-
-            RULE_SERVICE.saveRule(rootFolder, parentRule);
-
-            return null;
-        }, false, true);
 
        rootFile = testNodes.createNodeWithTextContent(COMPANY_HOME, "rootFile.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Root file content");
        allEntries.add("rootFile.txt");
-
+       
-       NodeRef createdNode = testNodes.createNodeWithTextContent(rootFolder, "level1File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 1 file content");
+       testNodes.createNodeWithTextContent(rootFolder, "level1File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 1 file content");
-       assertTrue(NODE_SERVICE.hasAspect(createdNode, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1File.txt");
        
        level1Folder1 = testNodes.createNode(rootFolder, "level1Folder1", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
-       assertTrue(NODE_SERVICE.hasAspect(level1Folder1, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1Folder1/");
        
        level1Folder2 = testNodes.createNode(rootFolder, "level1Folder2", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
-       assertTrue(NODE_SERVICE.hasAspect(level1Folder2, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1Folder2/");
        
-       createdNode = testNodes.createNode(rootFolder, "level1EmptyFolder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
+       testNodes.createNode(rootFolder, "level1EmptyFolder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
-       assertTrue(NODE_SERVICE.hasAspect(createdNode, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1EmptyFolder/");
        
-       createdNode = testNodes.createNodeWithTextContent(level1Folder1, "level2File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 2 file content");
+       testNodes.createNodeWithTextContent(level1Folder1, "level2File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 2 file content");
-       assertTrue(NODE_SERVICE.hasAspect(createdNode, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1Folder1/level2File.txt");
 
-       createdNode = testNodes.createNodeWithTextContent(level1Folder2, "level2File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 2 file content");
+       testNodes.createNodeWithTextContent(level1Folder2, "level2File.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 2 file content");
-       assertTrue(NODE_SERVICE.hasAspect(createdNode, ContentModel.ASPECT_CLASSIFIABLE));
        allEntries.add("rootFolder/level1Folder2/level2File.txt");
        
        secondaryNode = testNodes.createNodeWithTextContent(COMPANY_HOME, "secondaryNodeFile.txt", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Secondary node");
@@ -272,7 +240,6 @@ public class DownloadServiceIntegrationTest
        // Add the lock and version aspects to the created node
        NODE_SERVICE.addAspect(fileToCheckout, ContentModel.ASPECT_VERSIONABLE, null);
        NODE_SERVICE.addAspect(fileToCheckout, ContentModel.ASPECT_LOCKABLE, null);
-       assertTrue(NODE_SERVICE.hasAspect(fileToCheckout, ContentModel.ASPECT_CLASSIFIABLE));
        
        allEntries.add("rootFolder/level1Folder2/fileToCheckout.txt");
        PERMISSION_SERVICE.setPermission(level1Folder2, TEST_USER.getUsername(), PermissionService.ALL_PERMISSIONS, true);

repository/src/test/java/org/alfresco/repo/template/UnsafeMethodsTest.java

@@ -1,78 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.template;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Map;
-
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateExceptionHandler;
-import junit.framework.TestCase;
-
-public class UnsafeMethodsTest extends TestCase
-{
-    private static final String TEST_TEMPLATES_PACKAGE = "/org/alfresco/repo/template/templates/";
-    private static final String ALLOWED_TEXT = ": ALLOWED";
-    private static final String BLOCKED_TEXT = ": BLOCKED";
-    private static final String EXPECTED_RESULT = "Freemarker Unsafe Methods Testing\n" +
-            "=================================\n" +
-            "java.lang.Thread.getId(): ALLOWED\n" +
-            "java.lang.Thread.interrupt(): BLOCKED\n" +
-            "java.lang.Thread.currentThread(): BLOCKED\n";
-
-    private final Configuration configuration = new Configuration(Configuration.VERSION_2_3_31);
-
-    public void testUnsafeMethods() throws Exception
-    {
-        configuration.setClassForTemplateLoading(getClass(), TEST_TEMPLATES_PACKAGE);
-        configuration.setDefaultEncoding("UTF-8");
-        configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        Template template = configuration.getTemplate("unsafemethods.ftl");
-
-        Thread currentThread = Thread.currentThread();
-        Map<String, Object> model = Map.of(
-                "allowedText", ALLOWED_TEXT,
-                "blockedText", BLOCKED_TEXT,
-                "thread", currentThread);
-
-        String result = applyTemplate(template, model);
-
-        assertFalse(currentThread.isInterrupted());
-        assertEquals(EXPECTED_RESULT, result);
-    }
-
-    private String applyTemplate(Template template, Map<String, Object> inputModel ) throws TemplateException, IOException
-    {
-        try (StringWriter stringWriter = new StringWriter())
-        {
-            template.process(inputModel, stringWriter);
-            return stringWriter.toString();
-        }
-    }
-}

repository/src/test/resources/org/alfresco/repo/template/templates/unsafemethods.ftl

@@ -1,5 +0,0 @@
-Freemarker Unsafe Methods Testing
-=================================
-java.lang.Thread.getId()<#if (thread.getId())??>${allowedText}<#else>${blockedText}</#if>
-java.lang.Thread.interrupt()<#if (thread.interrupt())??>${allowedText}<#else>${blockedText}</#if>
-java.lang.Thread.currentThread()<#if (thread.currentThread())??>${allowedText}<#else>${blockedText}</#if>