Merge pull request #1290 from Alfresco/feature/APPS-591_UpdatesForACS7.0.0

Feature/apps 591 updates for acs7.0.0

pom.xml

@@ -532,7 +532,7 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco.groupId>org.alfresco</alfresco.groupId>
       <alfresco.share.artifactId>share</alfresco.share.artifactId>
-      <alfresco-spring-webscripts.version>8.5</alfresco-spring-webscripts.version>
+      <alfresco-spring-webscripts.version>8.12</alfresco-spring-webscripts.version>
       <api.explorer.version>7.0.0-M1</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.min.version>0.0</alfresco.min.version>
@@ -559,7 +559,7 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.11.2</jackson.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>
@@ -596,6 +596,8 @@
       <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
       <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.344</alfresco-community-repo.version>
    </properties>
 
    <dependencyManagement>

rm-community/pom.xml

@@ -27,8 +27,8 @@
       <dependencies>
          <dependency>
             <groupId>${alfresco.groupId}</groupId>
-            <artifactId>acs-community-packaging</artifactId>
-            <version>${alfresco.version}</version>
+            <artifactId>alfresco-community-repo</artifactId>
+            <version>${alfresco-community-repo.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -73,10 +73,9 @@
    </dependencyManagement>
 
    <properties>
-      <spring.version>5.1.15.RELEASE</spring.version>
-      <alfresco.version>6.2.2-A1</alfresco.version>
-      <alfresco.min.version>6.2.1</alfresco.min.version>
-      <share.version>6.2.2</share.version>
+      <spring.version>5.2.9.RELEASE</spring.version>
+      <alfresco.min.version>7.0.0</alfresco.min.version>
+      <share.version>7.0.0-A13</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
       <app.filtering.enabled>true</app.filtering.enabled>
    </properties>

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

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.

rm-community/rm-community-repo/pom.xml

@@ -24,11 +24,9 @@
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
-      <!-- 6.2.2-A1 changes -->
-      <dependency.alfresco-core.version>7.33</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.188</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.140</dependency.alfresco-remote-api.version>
-      <alfresco.alfresco-share-services.version>6.2.2</alfresco.alfresco-share-services.version>
+      <!-- 7.0.0 dependencies -->
+      <!--  Alfresco Share version  -->
+      <alfresco.alfresco-share-services.version>7.0.0-A13</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>
@@ -203,7 +201,7 @@
                            <groupId>${alfresco.groupId}</groupId>
                            <artifactId>content-services-community</artifactId>
                            <type>war</type>
-                           <version>${alfresco.version}</version>
+                           <version>${alfresco-community-repo.version}</version>
                         </artifactItem>
                      </artifactItems>
                   </configuration>
@@ -322,36 +320,42 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-data-model</artifactId>
+         <version>${alfresco-community-repo.version}</version>
+         <scope>provided</scope>
+      </dependency>
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
-         <version>${dependency.alfresco-remote-api.version}</version>
+         <version>${alfresco-community-repo.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-repository</artifactId>
-         <version>${dependency.alfresco-repository.version}</version>
+         <version>${alfresco-community-repo.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-repository</artifactId>
-         <version>${dependency.alfresco-repository.version}</version>
+         <version>${alfresco-community-repo.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
-         <version>${dependency.alfresco-remote-api.version}</version>
+         <version>${alfresco-community-repo.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-core</artifactId>
-         <version>${dependency.alfresco-core.version}</version>
+         <version>${alfresco-community-repo.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
@@ -491,7 +495,7 @@
                                  <groupId>${alfresco.groupId}</groupId>
                                  <artifactId>content-services-community</artifactId>
                                  <type>war</type>
-                                 <version>${alfresco.version}</version>
+                                 <version>${alfresco-community-repo.version}</version>
                               </artifactItem>
                            </artifactItems>
                         </configuration>

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;
         }

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 + "'.");

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=
 

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