From a3dbb60e5fbc3b2806265cda355aeaf4b3f96289 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 1 Dec 2020 00:30:44 +0000 Subject: [PATCH 01/16] Changes to pick up alfresco-community-repo and alfresco-enterprise-repo versions for 7.0.0 --- rm-community/rm-community-repo/pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index cca3898591..264927cf25 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -24,11 +24,11 @@ alfresco-platform 9.1-901.jdbc4 alfresco-governance-services-community-repo - - 7.33 - 7.188 - 7.140 - 6.2.2 + + 8.339 + 8.356 + + 7.0.0-A12 alfresco/alfresco-governance-repository-community false @@ -325,33 +325,33 @@ ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-remote-api.version} + ${dependency.alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-repository.version} + ${dependency.alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-repository.version} + ${dependency.alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-remote-api.version} + ${dependency.alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-core - ${dependency.alfresco-core.version} + ${dependency.alfresco-community-repo.version} tests test From 57735ef4ff27250397be921c62df2b2675626b09 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 10:56:32 +0200 Subject: [PATCH 02/16] changes for ACS 7.0.0-A13 --- pom.xml | 4 ++-- rm-community/pom.xml | 9 +++++---- rm-community/rm-community-repo/Dockerfile | 2 +- rm-community/rm-community-repo/pom.xml | 6 ++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f05ecceab3..0e5f83fc1f 100644 --- a/pom.xml +++ b/pom.xml @@ -532,7 +532,7 @@ alfresco org.alfresco share - 8.5 + 8.14 7.0.0-M1 0.0 @@ -559,7 +559,7 @@ 3.1.0 8080 - 2.11.2 + 2.11.3 2.11.2 0.31.0 1.10.19 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index ebce8bf216..d359196bf7 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -28,7 +28,7 @@ ${alfresco.groupId} acs-community-packaging - ${alfresco.version} + ${acs-community-packaging.version} pom import @@ -73,10 +73,11 @@ - 5.1.15.RELEASE - 6.2.2-A1 + 5.2.9.RELEASE + 8.339 + 6.2.2-RC1 6.2.1 - 6.2.2 + 7.0.0-A12 true diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile index b96aa758a8..d622cfe510 100644 --- a/rm-community/rm-community-repo/Dockerfile +++ b/rm-community/rm-community-repo/Dockerfile @@ -1,5 +1,5 @@ ### Apply AGS community repo AMP to ACS image -FROM alfresco/alfresco-content-repository-community:6.2.2-A1 +FROM quay.io/alfresco/alfresco-content-repository-community:7.0.0-A13 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root. # The access will be fixed after all operations are done. diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 264927cf25..fbe23df62b 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -322,6 +322,12 @@ + + org.alfresco + alfresco-data-model + ${dependency.alfresco-community-repo.version} + provided + ${alfresco.groupId} alfresco-remote-api From bd0e835b5eb23e328dd202e435eb2c0595d9aa79 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 12:09:22 +0200 Subject: [PATCH 03/16] update the pom dependency --- rm-community/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d359196bf7..460608cc42 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -27,8 +27,8 @@ ${alfresco.groupId} - acs-community-packaging - ${acs-community-packaging.version} + alfresco-community-repo + ${alfresco.version} pom import From fa42b703d79035097bb3f430a031798901878336 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 13:05:12 +0200 Subject: [PATCH 04/16] updates to ACS 7.0.0-A13 --- rm-community/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 460608cc42..3bd137f862 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -75,7 +75,6 @@ 5.2.9.RELEASE 8.339 - 6.2.2-RC1 6.2.1 7.0.0-A12 From 8601a0092dc2335a2d442ea251e36b02617e3abd Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 14:02:01 +0200 Subject: [PATCH 05/16] get the object for key "success" which throws JsonObject exception --- .../source/java/org/alfresco/util/WebScriptUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java index 329d34fc13..cb2cda7981 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java @@ -238,7 +238,7 @@ public final class WebScriptUtils try { - value = jsonObject.getString(key); + value = jsonObject.get(key).toString(); if (checkValue && isBlank(value)) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The value is missing for the key '" + key + "'."); From 66aa81f1b9a6ae6c7629aaa7bc2dc887cb1707c2 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 17:07:20 +0200 Subject: [PATCH 06/16] minor improvements --- pom.xml | 2 ++ rm-community/pom.xml | 5 ++--- rm-community/rm-community-repo/pom.xml | 20 +++++++++----------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 0e5f83fc1f..767a554eed 100644 --- a/pom.xml +++ b/pom.xml @@ -596,6 +596,8 @@ 3.0.0-M4 4.0.1 1.19 + + 8.339 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 3bd137f862..5f91c6bde1 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -28,7 +28,7 @@ ${alfresco.groupId} alfresco-community-repo - ${alfresco.version} + ${alfresco-community-repo.version} pom import @@ -74,8 +74,7 @@ 5.2.9.RELEASE - 8.339 - 6.2.1 + 7.0.0 7.0.0-A12 true diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index fbe23df62b..5fde765243 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -25,9 +25,7 @@ 9.1-901.jdbc4 alfresco-governance-services-community-repo - 8.339 - 8.356 - + 7.0.0-A12 alfresco/alfresco-governance-repository-community @@ -203,7 +201,7 @@ ${alfresco.groupId} content-services-community war - ${alfresco.version} + ${alfresco-community-repo.version} @@ -325,39 +323,39 @@ org.alfresco alfresco-data-model - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-core - ${dependency.alfresco-community-repo.version} + ${alfresco-community-repo.version} tests test @@ -497,7 +495,7 @@ ${alfresco.groupId} content-services-community war - ${alfresco.version} + ${alfresco-community-repo.version} From d452b2586832d8304bb83827847fae452c9e42a6 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 2 Dec 2020 17:52:29 +0200 Subject: [PATCH 07/16] fix minor repo version --- .../test/resources/alfresco/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/test/resources/alfresco/version.properties b/rm-community/rm-community-repo/test/resources/alfresco/version.properties index 2046c8d69a..c9f05c7210 100644 --- a/rm-community/rm-community-repo/test/resources/alfresco/version.properties +++ b/rm-community/rm-community-repo/test/resources/alfresco/version.properties @@ -3,8 +3,8 @@ # # Version label -version.major=6 -version.minor=2 +version.major=7 +version.minor=0 version.revision=0 version.label= From a87b00c0156eff1f41c35c17eefd1f0065ac4fd6 Mon Sep 17 00:00:00 2001 From: ehardon Date: Thu, 3 Dec 2020 17:49:52 +0200 Subject: [PATCH 08/16] APPS-581: Fix Classification UnitTests that were failing due to org.json library version upgrade --- .../source/java/org/alfresco/util/WebScriptUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java index cb2cda7981..56914f300e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java @@ -238,7 +238,7 @@ public final class WebScriptUtils try { - value = jsonObject.get(key).toString(); + value = jsonObject.getString(key); if (checkValue && isBlank(value)) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The value is missing for the key '" + key + "'."); @@ -413,7 +413,7 @@ public final class WebScriptUtils mandatory("jsonObject", jsonObject); mandatoryString("key", key); - JSONObject value = null; + JSONObject value; try { From 51df55ff56d9aaba195483ca3b68490f6ed851b6 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 3 Dec 2020 21:19:00 +0200 Subject: [PATCH 09/16] replace solr-sql language with index-sql as per (fix for APPS-686) --- .../capability/RMAfterInvocationProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 d26c1a6e22..ba4e4a2031 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 @@ -27,6 +27,8 @@ package org.alfresco.module.org_alfresco_module_rm.capability; +import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_INDEX_SQL; + import java.util.ArrayList; import java.util.BitSet; import java.util.Collection; @@ -433,7 +435,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon } // FIXME see: RM-6895 - if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql")) + if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase(LANGUAGE_INDEX_SQL)) { return returnedObject; } From c3d913060e87c206f9b45af1b00f8f9cc81fd21d Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 3 Dec 2020 21:34:14 +0200 Subject: [PATCH 10/16] update alfresco repository versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 767a554eed..20d1917c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -597,7 +597,7 @@ 4.0.1 1.19 - 8.339 + 8.341 From 0044284403a3ca5fe47023ad9f1e9f2830098ea5 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 3 Dec 2020 21:45:49 +0200 Subject: [PATCH 11/16] Revert "APPS-581: Fix Classification UnitTests that were failing due to org.json library version upgrade" This reverts commit a87b00c0156eff1f41c35c17eefd1f0065ac4fd6. --- .../source/java/org/alfresco/util/WebScriptUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java index 56914f300e..cb2cda7981 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java @@ -238,7 +238,7 @@ public final class WebScriptUtils try { - value = jsonObject.getString(key); + value = jsonObject.get(key).toString(); if (checkValue && isBlank(value)) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The value is missing for the key '" + key + "'."); @@ -413,7 +413,7 @@ public final class WebScriptUtils mandatory("jsonObject", jsonObject); mandatoryString("key", key); - JSONObject value; + JSONObject value = null; try { From 20f3521f5b584b593bb468b8fde82a31adae2bc1 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 4 Dec 2020 20:34:25 +0200 Subject: [PATCH 12/16] attempt to fix rest api tests --- rm-automation/pom.xml | 2 +- travis/.travis.tests-stage.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 5eee570158..158f45dd44 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -49,7 +49,7 @@ maven-surefire-plugin - false + true ${project.build.testOutputDirectory}/${suiteXmlFile} diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index b33840846a..d61566b289 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -34,6 +34,11 @@ jobs: script: - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + addons: + artifacts: + paths: + - ./rm-automation/rm-automation-enterprise-rest-api/target/reports/rm-automation-enterprise-rest-api.log + - ./rm-automation/rm-automation-enterprise-rest-api/target/surefire-reports - name: "Enterprise Rest API WORM Tests" stage: Tests From ec65428e6f42333e43961eff9495f7e5926566ce Mon Sep 17 00:00:00 2001 From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com> Date: Thu, 3 Dec 2020 21:31:28 +0200 Subject: [PATCH 13/16] upgrade of repo and share to test the revert --- rm-community/rm-community-repo/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile index d622cfe510..fd8a63f1fa 100644 --- a/rm-community/rm-community-repo/Dockerfile +++ b/rm-community/rm-community-repo/Dockerfile @@ -1,5 +1,5 @@ ### Apply AGS community repo AMP to ACS image -FROM quay.io/alfresco/alfresco-content-repository-community:7.0.0-A13 +FROM quay.io/alfresco/alfresco-content-repository-community:latest # Alfresco user does not have permissions to modify webapps or configuration. Switch to root. # The access will be fixed after all operations are done. From c9ea0f658018fded5380402dc3f62d84ef0515a7 Mon Sep 17 00:00:00 2001 From: Piero Cittadino <63122825+pieCit87@users.noreply.github.com> Date: Fri, 4 Dec 2020 01:08:41 +0200 Subject: [PATCH 14/16] upgrades of share # Conflicts: # rm-community/rm-community-share/Dockerfile --- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 5f91c6bde1..7841ad20af 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -75,7 +75,7 @@ 5.2.9.RELEASE 7.0.0 - 7.0.0-A12 + 7.0.0-A13 true diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 5fde765243..42b52989c9 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -26,7 +26,7 @@ alfresco-governance-services-community-repo - 7.0.0-A12 + 7.0.0-A13 alfresco/alfresco-governance-repository-community false From 99a53c0ab18d3c9b85debd75e78aab51cdc345f0 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 4 Dec 2020 22:00:00 +0200 Subject: [PATCH 15/16] attempt to fix no output receive in the last 10ms --- rm-automation/pom.xml | 2 +- travis/.travis.tests-stage.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 158f45dd44..5eee570158 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -49,7 +49,7 @@ maven-surefire-plugin - true + false ${project.build.testOutputDirectory}/${suiteXmlFile} diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index d61566b289..af9ff3931f 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -18,7 +18,7 @@ jobs: bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH false fi - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false + script: travis_wait 40 mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" @@ -32,7 +32,7 @@ jobs: - bash scripts/dockerLimitMemory.sh - sudo free -m -t script: - - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false + - travis_wait 90 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 addons: artifacts: From 5a6097aa83bf112aef78e7440729c0ad3c0f994c Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Sun, 6 Dec 2020 19:13:15 +0200 Subject: [PATCH 16/16] latest changes for ACS 7.0.0-A14 --- pom.xml | 4 ++-- rm-community/rm-community-repo/.env | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 20d1917c5a..2f571e587d 100644 --- a/pom.xml +++ b/pom.xml @@ -532,7 +532,7 @@ alfresco org.alfresco share - 8.14 + 8.12 7.0.0-M1 0.0 @@ -597,7 +597,7 @@ 4.0.1 1.19 - 8.341 + 8.344 diff --git a/rm-community/rm-community-repo/.env b/rm-community/rm-community-repo/.env index fdab945084..2e26c660b5 100644 --- a/rm-community/rm-community-repo/.env +++ b/rm-community/rm-community-repo/.env @@ -1,6 +1,6 @@ -TRANSFORMERS_TAG=2.2.1 -SOLR6_TAG=1.4.2 -POSTGRES_TAG=11.4 +TRANSFORMERS_TAG=2.3.6 +SOLR6_TAG=2.0.1-A1 +POSTGRES_TAG=11.7 ACTIVEMQ_TAG=5.15.8 LEGACY_TRANSFORM_SERVICE_ENABLED=true LOCAL_TRANSFORM_SERVICE_ENABLED=true \ No newline at end of file