diff --git a/pom.xml b/pom.xml index f05ecceab3..2f571e587d 100644 --- a/pom.xml +++ b/pom.xml @@ -532,7 +532,7 @@ alfresco org.alfresco share - 8.5 + 8.12 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 @@ -596,6 +596,8 @@ 3.0.0-M4 4.0.1 1.19 + + 8.344 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index ebce8bf216..7841ad20af 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -27,8 +27,8 @@ ${alfresco.groupId} - acs-community-packaging - ${alfresco.version} + alfresco-community-repo + ${alfresco-community-repo.version} pom import @@ -73,10 +73,9 @@ - 5.1.15.RELEASE - 6.2.2-A1 - 6.2.1 - 6.2.2 + 5.2.9.RELEASE + 7.0.0 + 7.0.0-A13 true 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 diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile index b96aa758a8..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 alfresco/alfresco-content-repository-community:6.2.2-A1 +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. diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index cca3898591..42b52989c9 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -24,11 +24,9 @@ alfresco-platform 9.1-901.jdbc4 alfresco-governance-services-community-repo - - 7.33 - 7.188 - 7.140 - 6.2.2 + + + 7.0.0-A13 alfresco/alfresco-governance-repository-community false @@ -203,7 +201,7 @@ ${alfresco.groupId} content-services-community war - ${alfresco.version} + ${alfresco-community-repo.version} @@ -322,36 +320,42 @@ + + org.alfresco + alfresco-data-model + ${alfresco-community-repo.version} + provided + ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-remote-api.version} + ${alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-repository.version} + ${alfresco-community-repo.version} provided ${alfresco.groupId} alfresco-repository - ${dependency.alfresco-repository.version} + ${alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-remote-api - ${dependency.alfresco-remote-api.version} + ${alfresco-community-repo.version} tests test ${alfresco.groupId} alfresco-core - ${dependency.alfresco-core.version} + ${alfresco-community-repo.version} tests test @@ -491,7 +495,7 @@ ${alfresco.groupId} content-services-community war - ${alfresco.version} + ${alfresco-community-repo.version} 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; } 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 + "'."); 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= diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index b33840846a..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,8 +32,13 @@ 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: + 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