From 820b8b0fc65a4822de72100231eb57936c29fe3b Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 14 Jan 2021 14:12:28 +0200
Subject: [PATCH 01/23] APPS-737: Update headers and replace deprecated methods

---
 .../java/org/alfresco/rm/rest/api/fileplans/package-info.java   | 2 +-
 .../alfresco/rm/rest/api/transfercontainers/package-info.java   | 2 +-
 .../java/org/alfresco/rm/rest/api/transfers/package-info.java   | 2 +-
 .../alfresco/rm/rest/api/unfiledcontainers/package-info.java    | 2 +-
 .../alfresco/rm/rest/api/unfiledrecordfolders/package-info.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/package-info.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/package-info.java
index 782f3226a5..98ec778e47 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/package-info.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/package-info.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/package-info.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/package-info.java
index 22d77fe8f8..905059ffb7 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/package-info.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfercontainers/package-info.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfers/package-info.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfers/package-info.java
index fbf7cb1c71..9b844907e5 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfers/package-info.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/transfers/package-info.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/package-info.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/package-info.java
index b6a3db0131..36767dec2f 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/package-info.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledcontainers/package-info.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/package-info.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/package-info.java
index c3a85cb149..5328252283 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/package-info.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/package-info.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

From a7ac5cbf57b41a751e2684f014c2f50d039737b8 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:47:04 +0200
Subject: [PATCH 02/23] jackson upgrade

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 89a54d7959..effcd0b349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,7 +538,7 @@
       <alfresco.min.version>0.0</alfresco.min.version>
 
       <skip.integrationtests>true</skip.integrationtests>
-      <postgres.version>9.4.12</postgres.version>
+      <postgres.version>11.7</postgres.version>
       <activemq.version>5.15.8</activemq.version>
       <activemq.port1>61616</activemq.port1>
       <activemq.port2>5672</activemq.port2>
@@ -559,8 +559,8 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.11.3</jackson.version>
-      <jackson-databind.version>2.11.2</jackson-databind.version>
+      <jackson.version>2.12.1</jackson.version>
+      <jackson-databind.version>2.12.1</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.16</postgresql.version>

From 5390b3221a925000e6dd32aa5119e8eb585d607e Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Fri, 29 Jan 2021 17:57:21 +0200
Subject: [PATCH 03/23] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index effcd0b349..0927a7664e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,7 +538,7 @@
       <alfresco.min.version>0.0</alfresco.min.version>
 
       <skip.integrationtests>true</skip.integrationtests>
-      <postgres.version>11.7</postgres.version>
+     <postgres.version>9.4.12</postgres.version>
       <activemq.version>5.15.8</activemq.version>
       <activemq.port1>61616</activemq.port1>
       <activemq.port2>5672</activemq.port2>

From beb840b2c3f6c1f44b496170c26a4a49ba21246d Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Mon, 1 Feb 2021 10:08:48 +0200
Subject: [PATCH 04/23] excluded testRM386

---
 .../test/legacy/service/DispositionServiceImplTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
index 96922c1352..e2f88a668e 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
@@ -917,7 +917,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
      * Test to make sure all the search rollups are correct after schedule is updated
      * @throws Exception
      */
-    public void testRM386() throws Exception
+    /*public void testRM386() throws Exception
     {
         doTestInTransaction(new Test<Void>()
         {
@@ -1028,5 +1028,5 @@ public class DispositionServiceImplTest extends BaseRMTestCase
         });
 
     }
-
+    */
 }

From 82ec8680d7f4aad40088787fa84cf84156a1d75d Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Mon, 1 Feb 2021 12:15:09 +0200
Subject: [PATCH 05/23] change notificationFrequency to Transaction_Commit
 (TRANSACTION_COMMIT: The event handler is queued and invoked at the end of
 the transaction after it has been committed. A proxy around the event handler
 manages the queuing.)

---
 .../audit/event/UpdateObjectAuditEvent.java               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
index 2f6457dabe..569818e58a 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -37,6 +37,9 @@ import org.alfresco.repo.policy.annotation.BehaviourKind;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 
+import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT;
+
+
 /**
  * Audits file plan component property updates
  *
@@ -53,7 +56,8 @@ public class UpdateObjectAuditEvent extends AuditEvent implements OnUpdateProper
     @Behaviour
     (
             kind = BehaviourKind.CLASS,
-            type = "rma:filePlanComponent"
+            type = "rma:filePlanComponent",
+            notificationFrequency = TRANSACTION_COMMIT
     )
     public void onUpdateProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
     {

From c3b78923576d9125281394776d2e3dc167836443 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Mon, 1 Feb 2021 12:46:50 +0200
Subject: [PATCH 06/23] Update pom.xml

---
 rm-automation/rm-automation-community-rest-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 202a565fe6..6d05cc7038 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -15,10 +15,10 @@
       <maven.javadoc.skip>false</maven.javadoc.skip>
       <ags.share>alfresco-governance-services-community-share</ags.share>
       <ags.repo>alfresco-governance-services-community-repo</ags.repo>
-      <tas.restapi.version>1.50</tas.restapi.version>
+      <tas.restapi.version>1.51</tas.restapi.version>
       <tas.utility.version>3.0.41</tas.utility.version>
       <fluent.json.version>2.0.0</fluent.json.version>
-      <jackson.databind.version>2.7.9.1</jackson.databind.version>
+      <jackson.databind.version>2.12.1</jackson.databind.version>
    </properties>
 
    <build>

From a48a5bb8cd3c6f8c949323f4bb4a74540b8d2cb6 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <andreea.nechifor@ness.com>
Date: Mon, 1 Feb 2021 13:39:34 +0200
Subject: [PATCH 07/23] Fix copyright

---
 .../audit/event/UpdateObjectAuditEvent.java                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
index 569818e58a..f6eb0d5ef0 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

From bb1e7547f99687a1b034a24a7e306eda292b5014 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:38:13 +0200
Subject: [PATCH 08/23] downgrade jackson databind

---
 pom.xml                                                | 4 ++--
 rm-automation/rm-automation-community-rest-api/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0927a7664e..02cf4fccca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,8 +559,8 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.12.1</jackson.version>
-      <jackson-databind.version>2.12.1</jackson-databind.version>
+      <jackson.version>2.11.3</jackson.version>
+      <jackson-databind.version>2.11.2</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.16</postgresql.version>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 6d05cc7038..b559c7682d 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -18,7 +18,7 @@
       <tas.restapi.version>1.51</tas.restapi.version>
       <tas.utility.version>3.0.41</tas.utility.version>
       <fluent.json.version>2.0.0</fluent.json.version>
-      <jackson.databind.version>2.12.1</jackson.databind.version>
+      <jackson.databind.version>2.7.9.1</jackson.databind.version>
    </properties>
 
    <build>

From b28678bd757911d813a4ebd486a00c20100c358b Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:59:33 +0200
Subject: [PATCH 09/23] Update pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 02cf4fccca..0927a7664e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,8 +559,8 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.11.3</jackson.version>
-      <jackson-databind.version>2.11.2</jackson-databind.version>
+      <jackson.version>2.12.1</jackson.version>
+      <jackson-databind.version>2.12.1</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.16</postgresql.version>

From 23bd35122d60e8db2d6881cba3c756c3b81b2afd Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:18:17 +0200
Subject: [PATCH 10/23] upgrades

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0927a7664e..f5c7976782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -597,7 +597,7 @@
       <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
       <apache-compress.version>1.19</apache-compress.version>
       <!-- 7.0.0 dependencies -->
-      <alfresco-community-repo.version>8.378</alfresco-community-repo.version>
+      <alfresco-community-repo.version>8.380</alfresco-community-repo.version>
    </properties>
 
    <dependencyManagement>
@@ -650,7 +650,6 @@
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-mock</artifactId>
          <version>${camel.mock.version}</version>
-         <scope>provided</scope>
       </dependency>
 
       <dependency>

From ec4ce2b513d8a390ddf650e202e6394b3238f609 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 2 Feb 2021 12:12:09 +0200
Subject: [PATCH 11/23] added install phase

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 887038834c..712efe379a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ before_install:
   - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
   - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
   - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-install: skip
+install: mvn -B -q clean ${MAVEN_PHASE}
 
 stages:
   - name: Build AGS

From 4e694ef4f4b8d9f74ae77125963ae75e10e6b8d0 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 2 Feb 2021 12:17:42 +0200
Subject: [PATCH 12/23] travis: remove cache

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 712efe379a..b7619b9fea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,13 +24,6 @@ branches:
     - /merge\/.*/
     - /hotfix\/.*/
 
-cache:
-  directories:
-    - ${HOME}/.m2/repository
-
-# the cache can grow constantly
-before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services*
-
 before_install:
   - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
   - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf

From 2be18ccfaf681085b737f62e2de6408fa3e87850 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 2 Feb 2021 12:34:40 +0200
Subject: [PATCH 13/23] added retry

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b7619b9fea..a942e8b7f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
   - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
   - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
   - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-install: mvn -B -q clean ${MAVEN_PHASE}
+install: travis_retry travis_wait 40 mvn -B -q clean ${MAVEN_PHASE}
 
 stages:
   - name: Build AGS

From b5e79894be736c5ff0d73098d356512d03b1f629 Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Tue, 2 Feb 2021 12:46:25 +0200
Subject: [PATCH 14/23] Added install Phase.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a942e8b7f1..90c481259f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ before_install:
   - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
   - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
   - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-install: travis_retry travis_wait 40 mvn -B -q clean ${MAVEN_PHASE}
 
 stages:
   - name: Build AGS
@@ -45,6 +44,8 @@ jobs:
   include:
     - name: "Build AGS Community"
       stage: Build AGS
+      install:
+         - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
       before_script: source scripts/setUpMavenPhase.sh
       script:
         - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

From be559bea68decbc4f6b52ad337a8c16a2104c5a9 Mon Sep 17 00:00:00 2001
From: estan <eliza.stan08@gmail.com>
Date: Tue, 2 Feb 2021 14:48:07 +0200
Subject: [PATCH 15/23] APPS-765 : GS-API-Explorer not working with
 api-explorer 7.0.0-A3

---
 rm-community/rm-community-repo/pom.xml        |   4 +-
 .../src/main/webapp/index.html                | 208 ++++++------------
 2 files changed, 69 insertions(+), 143 deletions(-)

diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 428224f86a..48b100bb2b 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -394,14 +394,14 @@
       <dependency>
           <groupId>org.reflections</groupId>
           <artifactId>reflections</artifactId>
-          <version>0.9.10</version>
+          <version>0.9.12</version>
           <scope>test</scope>
       </dependency>
       <!-- swagger parser -->
       <dependency>
          <groupId>io.swagger</groupId>
          <artifactId>swagger-parser</artifactId>
-         <version>1.0.35</version>
+         <version>1.0.52</version>
          <scope>test</scope>
       </dependency>
       <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
diff --git a/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html b/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html
index 0162e8338f..dd62f3770e 100644
--- a/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html
+++ b/rm-community/rm-community-rest-api-explorer/src/main/webapp/index.html
@@ -1,155 +1,81 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
    <meta charset="UTF-8">
-   <meta http-equiv="cache-control" content="max-age=0"/>
-   <meta http-equiv="cache-control" content="no-cache"/>
-   <meta http-equiv="expires" content="0"/>
-   <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
-   <meta http-equiv="pragma" content="no-cache"/>
    <title>Alfresco Governance Services REST API Explorer</title>
-   <link rel="shortcut icon"
-         href="https://cdn-www.alfresco.com/sites/www.alfresco.com/themes/alfrescodotcom/favicon.ico"/>
-   <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-   <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-   <link href='css/alfresco.css' media='screen' rel='stylesheet' type='text/css'/>
-   <!-- Google Tag Manager -->
-   <script>
-      (function (w, d, s, l, i) {
-         w[l] = w[l] || [];
-         w[l].push({
-            'gtm.start': new Date().getTime(),
-            event: 'gtm.js'
-         });
-         var f = d.getElementsByTagName(s)[0],
-            j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
-         j.async = true;
-         j.src =
-            'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-         f.parentNode.insertBefore(j, f);
-      })(window, document, 'script', 'dataLayer', 'GTM-W4HV22');
-   </script>
-   <!-- End Google Tag Manager -->
-   <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-   <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-   <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-   <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-   <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
-   <script src='lib/object-assign-pollyfill.js' type='text/javascript'></script>
-   <script src='lib/es5-shim.js' type='text/javascript'></script>
-   <script src='lib/js-yaml.min.js' type='text/javascript'></script>
-   <script src='lib/sanitize-html.min.js' type='text/javascript'></script>
-   <script src='lib/lodash.min.js' type='text/javascript'></script>
-   <script src='lib/backbone-min.js' type='text/javascript'></script>
-   <script src='swagger-ui.js' type='text/javascript'></script>
-   <script src='lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
-   <script src='lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
-   <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
-   <script src='lib/marked.js' type='text/javascript'></script>
-   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+   <link rel="stylesheet" type="text/css" href="./swagger-ui.css">
+   <link href='./css/alfresco.css' media='screen' rel='stylesheet' type='text/css'/>
 
-   <!-- Some basic translations -->
-   <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
-   <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
-   <!-- <script src='lang/en.js' type='text/javascript'></script> -->
+   <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32"/>
+   <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"/>
+   <style>
+    html
+    {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
+    *, *:before, *:after
+    {
+      box-sizing: inherit;
+    }
+    body
+    {
+      margin:0;
+      background: #fafafa;
+      padding:0;
+    }
 
-   <script type="text/javascript">
-      $(function () {
-         window.swaggerUi = new SwaggerUi({
-            url: "definitions/gs-core-api.yaml",
-            dom_id: "swagger-ui-container",
-            supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
-            onComplete: function (swaggerApi, swaggerUi) {
+    .swagger-ui .topbar {
+      background-color: #e6e6ec;
+    }
+    .swagger-ui .topbar .download-url-wrapper .select-label {
+      color: #333;
+    }
+    .topbar-wrapper img[alt="Swagger UI"] {
+      visibility: collapse;
+    }
+    .topbar-wrapper .link:before {
+      content:url('images/logo.svg');
+    }
 
-               $('pre code').each(function (i, e) {
-                  hljs.highlightBlock(e)
-               });
-
-               addAuthorization();
-            },
-            onFailure: function (data) {
-               log("Unable to Load SwaggerUI");
-            },
-            docExpansion: "none",
-            jsonEditor: false,
-            apisSorter: "alpha",
-            operationsSorter: "alpha",
-            defaultModelRendering: 'schema',
-            showRequestHeaders: false,
-            validatorUrl: null
-         });
-
-         function addAuthorization() {
-
-            var cacheA = new SwaggerClient.ApiKeyAuthorization("If-Modified-Since", "Mon, 26 Jul 1997 05:00:00 GMT", "header"),
-               cacheB = new SwaggerClient.ApiKeyAuthorization("Cache-Control", "no-cache", "header"),
-               cacheC = new SwaggerClient.ApiKeyAuthorization("Pragma", "no-cache", "header"),
-               username = $('#input_username').val(),
-               password = $('#input_password').val();
-
-            if (username.trim() != "" && password.trim() != "")
-            {
-               var basicAuth = new SwaggerClient.PasswordAuthorization(username, password);
-               window.swaggerUi.api.clientAuthorizations.remove("basicAuth");
-               window.swaggerUi.api.clientAuthorizations.add("basicAuth", basicAuth);
-               log("authorization added: username = " + username + ", auth = " + basicAuth);
-            }
-
-            window.swaggerUi.api.clientAuthorizations.add("cacheA", cacheA);
-            window.swaggerUi.api.clientAuthorizations.add("cacheB", cacheB);
-            window.swaggerUi.api.clientAuthorizations.add("cacheC", cacheC);
-         }
+    /* https://stackoverflow.com/a/65782841/1654265 */
+    .errors-wrapper {
+      display: none !important;
+    }
 
 
-         $('#input_username').change(addAuthorization);
-         $('#input_password').change(addAuthorization);
-
-         window.swaggerUi.load();
-
-         $('#select_baseUrl').change(function () {
-            window.swaggerUi.headerView.trigger('update-swagger-ui', {
-               url: $('#select_baseUrl').val()
-            });
-         });
-
-         function log() {
-            if ('console' in window)
-            {
-               console.log.apply(console, arguments);
-            }
-         }
-      });
-   </script>
+   </style>
 </head>
 
-<body class="swagger-section">
-<!-- Google Tag Manager (noscript) -->
-<noscript>
-   <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-W4HV22" height="0" width="0"
-           style="display:none;visibility:hidden"></iframe>
-</noscript>
-<!-- End Google Tag Manager (noscript) -->
-<div id='header'>
-   <div class="swagger-ui-wrap">
-      <a id="alflogo" href="#"><img src="images/logo.png" height="44px" width="160px"/></a>
-      <form id="api_selector">
-         <div class="input" id="select-wrapper">
-            <select id="select_baseUrl" name="select_baseUrl">
-               <option value="definitions/gs-core-api.yaml">GS Core API</option>
-            </select>
-         </div>
-         <div class="input"><input alt="Username" type="text" name="username" id="input_username" placeholder="username"
-                                   size="10" value="admin"></div>
-         <div class="input"><input alt="Password" type="password" name="password" id="input_password"
-                                   placeholder="password" size="10" value="admin"></div>
-      </form>
-   </div>
-</div>
+<body>
+<div id="swagger-ui"></div>
 
-<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+<script src="./swagger-ui-bundle.js" charset="UTF-8"></script>
+<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"></script>
+<script>
+  window.onload = function() {
+
+    const ui = SwaggerUIBundle({
+      urls: [
+        {url: "definitions/gs-core-api.yaml",            name: "GS Core API"}
+      ],
+      dom_id: '#swagger-ui',
+      deepLinking: true,
+      displayRequestDuration: true,
+      presets: [
+        SwaggerUIBundle.presets.apis,
+        SwaggerUIStandalonePreset
+      ],
+      plugins: [
+        SwaggerUIBundle.plugins.DownloadUrl
+      ],
+      layout: "StandaloneLayout"
+    })
+
+    window.ui = ui
+  }
+
+</script>
 </body>
 </html>
\ No newline at end of file

From bb1fa9e811aa1a7594cc0079a866df062b030c2c Mon Sep 17 00:00:00 2001
From: Andreea Nechifor <Andreea.Nechifor@ness.com>
Date: Wed, 3 Feb 2021 09:10:28 +0200
Subject: [PATCH 16/23] revert cache-remove

---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90c481259f..887038834c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,11 +24,19 @@ branches:
     - /merge\/.*/
     - /hotfix\/.*/
 
+cache:
+  directories:
+    - ${HOME}/.m2/repository
+
+# the cache can grow constantly
+before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services*
+
 before_install:
   - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
   - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
   - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
   - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
+install: skip
 
 stages:
   - name: Build AGS
@@ -44,8 +52,6 @@ jobs:
   include:
     - name: "Build AGS Community"
       stage: Build AGS
-      install:
-         - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
       before_script: source scripts/setUpMavenPhase.sh
       script:
         - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

From 871a5bcfe7a0dfbedc1992bae6d8b6454c4214e8 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Wed, 3 Feb 2021 23:34:52 +0200
Subject: [PATCH 17/23] fix for community rest api

---
 .../capability/RMAfterInvocationProvider.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index ad0c1618db..cf5c8d36b0 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -205,14 +205,14 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
             {
                 return decide(authentication, object, config, (AssociationRef) returnedObject);
             }
-            else if (ResultSet.class.isAssignableFrom(returnedObject.getClass()))
-            {
-                return decide(authentication, object, config, (ResultSet) returnedObject);
-            }
             else if (PagingLuceneResultSet.class.isAssignableFrom(returnedObject.getClass()))
             {
                 return decide(authentication, object, config, (PagingLuceneResultSet) returnedObject);
             }
+            else if (ResultSet.class.isAssignableFrom(returnedObject.getClass()))
+            {
+                return decide(authentication, object, config, (ResultSet) returnedObject);
+            }
             else if (QueryEngineResults.class.isAssignableFrom(returnedObject.getClass()))
             {
                 return decide(authentication, object, config, (QueryEngineResults) returnedObject);
@@ -422,9 +422,11 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
 
     private ResultSet decide(Authentication authentication, Object object, ConfigAttributeDefinition config, PagingLuceneResultSet returnedObject)
     {
-        ResultSet raw = returnedObject.getWrapped();
+        ResultSet raw = ((FilteringResultSet) returnedObject.getWrapped()).getUnFilteredResultSet();
         ResultSet filteredForPermissions = decide(authentication, object, config, raw);
-        return new PagingLuceneResultSet(filteredForPermissions, returnedObject.getResultSetMetaData().getSearchParameters(), nodeService);
+        PagingLuceneResultSet plrs = new PagingLuceneResultSet(filteredForPermissions, returnedObject.getResultSetMetaData().getSearchParameters(), nodeService);
+        plrs.setTrimmedResultSet(true);
+        return plrs;
     }
 
     private ResultSet decide(Authentication authentication, Object object, ConfigAttributeDefinition config, ResultSet returnedObject)

From 8e71b04c35a4b77a23a47e12f6aa4c46176393d9 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Thu, 4 Feb 2021 21:29:43 +0200
Subject: [PATCH 18/23] fix from APPS-766 and 764

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f5c7976782..e1deb665f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -597,7 +597,7 @@
       <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
       <apache-compress.version>1.19</apache-compress.version>
       <!-- 7.0.0 dependencies -->
-      <alfresco-community-repo.version>8.380</alfresco-community-repo.version>
+      <alfresco-community-repo.version>8.382</alfresco-community-repo.version>
    </properties>
 
    <dependencyManagement>

From fc1119ed5864d8aea17828c3e78f70c126317167 Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Thu, 4 Feb 2021 21:29:55 +0200
Subject: [PATCH 19/23] Revert "excluded testRM386"

This reverts commit beb840b2c3f6c1f44b496170c26a4a49ba21246d.
---
 .../test/legacy/service/DispositionServiceImplTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
index e2f88a668e..96922c1352 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java
@@ -917,7 +917,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase
      * Test to make sure all the search rollups are correct after schedule is updated
      * @throws Exception
      */
-    /*public void testRM386() throws Exception
+    public void testRM386() throws Exception
     {
         doTestInTransaction(new Test<Void>()
         {
@@ -1028,5 +1028,5 @@ public class DispositionServiceImplTest extends BaseRMTestCase
         });
 
     }
-    */
+
 }

From bf291da24caeecbb4f7d0854f2d92cfdd928963a Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Fri, 5 Feb 2021 10:50:45 +0200
Subject: [PATCH 20/23] attempt to fix loading the resourceBundles

---
 .../org_alfresco_module_rm/action-context.xml | 10 +++++
 .../org_alfresco_module_rm/module-context.xml | 39 +++++++++----------
 .../rm-action-context.xml                     |  2 +-
 .../rm-service-context.xml                    |  3 +-
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
index e7358d2770..2889deadb0 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
@@ -5,6 +5,16 @@
          http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 
+
+   <!-- I18N -->
+   <bean id="extendedActionResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
+         </list>
+      </property>
+   </bean>
    <!--  Declare as Record action -->
    <!--  TODO rename -->
    <bean id="create-record" parent="action-executer"
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 4ccba8a2a0..5d1e57e615 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -7,7 +7,25 @@
        http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop.xsd ">
-       
+
+   <!--  Bootstrap the message property files -->
+   <bean id="org_alfresco_module_rm_resourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.module.org_alfresco_module_rm.messages.notification-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.admin-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.records-management-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.rm-events</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.rm-system</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.template</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.hold-service</value>
+         </list>
+      </property>
+   </bean>
+
    <!-- Module compatibility component -->
    <bean name="rm.moduleCompatibilityComponent" class="org.alfresco.module.org_alfresco_module_rm.bootstrap.ModuleCompatibilityComponent">
       <property name="descriptorService" ref="descriptorComponent"/>
@@ -56,25 +74,6 @@
       <property name="authenticationUtil" ref="rm.authenticationUtil"/>
    </bean>
 
-   <!--  Bootstrap the message property files -->
-   <bean id="org_alfresco_module_rm_resourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.module.org_alfresco_module_rm.messages.notification-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.admin-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.records-management-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.rm-events</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.rm-system</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.template</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.hold-service</value>
-         </list>
-      </property>
-   </bean>
 
    <!-- Records management permission post processor -->
    <bean id="recordsManagementPermissionPostProcessor" class="org.alfresco.module.org_alfresco_module_rm.permission.RecordsManagementPermissionPostProcessor" parent="parentPermissionPostProcessor">
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index d719d76697..d546a0e954 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -121,7 +121,7 @@
 
    <!-- Actions -->
 
-   <bean id="rmAction" parent="action-executer" abstract="true">
+   <bean id="rmAction" parent="action-executer" abstract="true" depends-on="org_alfresco_module_rm_resourceBundles">
       <property name="namespaceService" ref="namespaceService"/>
       <property name="transactionService" ref="transactionService"/>
       <property name="nodeService" ref="nodeService"/>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 6b93536f4b..f87dbc6803 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -265,7 +265,8 @@
 
     <!--  Records Management Search Service -->
 
-    <bean id="recordsManagementSearchService" class="org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl">
+    <bean id="recordsManagementSearchService"
+          class="org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl" depends-on="org_alfresco_module_rm_resourceBundles">
         <property name="fileFolderService" ref="FileFolderService"/>
         <property name="siteService" ref="SiteService"/>
         <property name="namespaceService" ref="NamespaceService" />

From c60b1f8d17a2e2c3e9c2fd8e5d84a6cd4c323b4b Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Fri, 5 Feb 2021 12:38:22 +0200
Subject: [PATCH 21/23] Revert "attempt to fix loading the resourceBundles"

This reverts commit bf291da24caeecbb4f7d0854f2d92cfdd928963a.
 remove the changes not needed for  saved search resource bundle
---
 .../org_alfresco_module_rm/action-context.xml | 10 -----
 .../org_alfresco_module_rm/module-context.xml | 39 ++++++++++---------
 .../rm-action-context.xml                     |  2 +-
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
index 2889deadb0..e7358d2770 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
@@ -5,16 +5,6 @@
          http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 
-
-   <!-- I18N -->
-   <bean id="extendedActionResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
-         </list>
-      </property>
-   </bean>
    <!--  Declare as Record action -->
    <!--  TODO rename -->
    <bean id="create-record" parent="action-executer"
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 5d1e57e615..4ccba8a2a0 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -7,25 +7,7 @@
        http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/aop
        http://www.springframework.org/schema/aop/spring-aop.xsd ">
-
-   <!--  Bootstrap the message property files -->
-   <bean id="org_alfresco_module_rm_resourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.module.org_alfresco_module_rm.messages.notification-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.admin-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.records-management-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.rm-events</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.rm-system</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.template</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.hold-service</value>
-         </list>
-      </property>
-   </bean>
-
+       
    <!-- Module compatibility component -->
    <bean name="rm.moduleCompatibilityComponent" class="org.alfresco.module.org_alfresco_module_rm.bootstrap.ModuleCompatibilityComponent">
       <property name="descriptorService" ref="descriptorComponent"/>
@@ -74,6 +56,25 @@
       <property name="authenticationUtil" ref="rm.authenticationUtil"/>
    </bean>
 
+   <!--  Bootstrap the message property files -->
+   <bean id="org_alfresco_module_rm_resourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.module.org_alfresco_module_rm.messages.notification-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.admin-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.records-management-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.rm-events</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.rm-system</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.template</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.hold-service</value>
+         </list>
+      </property>
+   </bean>
 
    <!-- Records management permission post processor -->
    <bean id="recordsManagementPermissionPostProcessor" class="org.alfresco.module.org_alfresco_module_rm.permission.RecordsManagementPermissionPostProcessor" parent="parentPermissionPostProcessor">
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index d546a0e954..d719d76697 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -121,7 +121,7 @@
 
    <!-- Actions -->
 
-   <bean id="rmAction" parent="action-executer" abstract="true" depends-on="org_alfresco_module_rm_resourceBundles">
+   <bean id="rmAction" parent="action-executer" abstract="true">
       <property name="namespaceService" ref="namespaceService"/>
       <property name="transactionService" ref="transactionService"/>
       <property name="nodeService" ref="nodeService"/>

From 0cdb25ebd75b23118cf78c80e4c5b51e9c6143dd Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Fri, 5 Feb 2021 14:15:41 +0200
Subject: [PATCH 22/23] fix resource bundles for  actions from audit log 
 APPS-767

---
 .../module/org_alfresco_module_rm/rm-service-context.xml      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index f87dbc6803..e3c6db1578 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -679,7 +679,9 @@
 
     <!-- Records Management Action Service -->
 
-    <bean id="recordsManagementActionService" class="org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionServiceImpl" init-method="init">
+    <bean id="recordsManagementActionService"
+          class="org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionServiceImpl"
+          init-method="init" depends-on="org_alfresco_module_rm_resourceBundles">
         <property name="policyComponent" ref="policyComponent"/>
         <property name="nodeService" ref="nodeService"/>
     </bean>

From 5f1ed626426deec672df5a9597dc23da8150dc2d Mon Sep 17 00:00:00 2001
From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:56:29 +0200
Subject: [PATCH 23/23] Resolved comments on PR 1324

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1deb665f5..2503f84b4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,12 +538,12 @@
       <alfresco.min.version>0.0</alfresco.min.version>
 
       <skip.integrationtests>true</skip.integrationtests>
-     <postgres.version>9.4.12</postgres.version>
+      <postgres.version>9.4.12</postgres.version>
       <activemq.version>5.15.8</activemq.version>
       <activemq.port1>61616</activemq.port1>
       <activemq.port2>5672</activemq.port2>
       <camel.mock.version>3.7.0</camel.mock.version>
-       <share.client.contextPath>/share</share.client.contextPath>
+      <share.client.contextPath>/share</share.client.contextPath>
 
       <maven.javadoc.version>3.1.0</maven.javadoc.version>
       <maven.javadoc.skip>true</maven.javadoc.skip>