Added ActiveMQ to cope with Camel refactoring in 7.0.0-A24+

* Keystore Test (should fix 7 and break 6)

* Enterprise images pulled from quay.io

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

@@ -31,6 +31,8 @@
 
         <keystore.settings>@@keystore.settings@@</keystore.settings>
 
+        <activemq.version>@@activemq.version@@</activemq.version>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
@@ -81,6 +83,14 @@
             <version>${alfresco.sdk.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-all</artifactId>
+            <version>${activemq.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

docs/advanced-topics/working-with-enterprise/README.md

@@ -35,10 +35,32 @@ You'll need to update the following settings in the `pom.xml` file:
 <alfresco.bomDependencyArtifactId>acs-packaging</alfresco.bomDependencyArtifactId>
 ```
 
-* Change the Docker ACS image name:
+* Change the Docker ACS image name (by also prepending the Enterprise Docker Registry, Quay.io):
 
 ```
-<docker.acs.image>alfresco/alfresco-content-repository</docker.acs.image>
+<docker.acs.image>quay.io/alfresco/alfresco-content-repository</docker.acs.image>
+```
+
+In case the desired Platform version is 6.x, you'll also need to deal with the Keystore settings, by either:
+
+* Removing the keystore settings:
+
+```
+<keystore.settings></keystore.settings>
+```
+
+or
+
+* Adding the Keystore creation to the existing Dockerfile:
+
+```
+#Add Keystore
+ARG CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB"
+ARG CERT_VALIDITY=36525
+ARG KEYSTORE_PASSWORD=mp6yc0UD9e
+ARG KEYSTORE_METADATA_PASSWORD=oKIWzVdEdA
+RUN mkdir -p $TOMCAT_DIR/shared/classes/alfresco/extension/keystore
+RUN keytool -genseckey -dname "$CERT_DNAME" -validity ${CERT_VALIDITY} -alias metadata -keypass ${KEYSTORE_METADATA_PASSWORD} -keyalg AES -keysize 256 -keystore ${TOMCAT_DIR}/shared/classes/alfresco/extension/keystore/keystore -storetype JCEKS -storepass ${KEYSTORE_PASSWORD}
 ```
 
 Changing these parameters instructs the project to use the proper maven dependencies and Docker images.

pom.xml

@@ -56,8 +56,8 @@
         <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-        <alfresco.platform.version>7.0.0-A20</alfresco.platform.version>
-        <alfresco.share.version>7.0.0-M3</alfresco.share.version>
+        <alfresco.platform.version>7.0.0</alfresco.platform.version>
+        <alfresco.share.version>7.0.0</alfresco.share.version>
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
         <keystore.settings>
@@ -70,6 +70,9 @@
             -Dmetadata-keystore.metadata.password=oKIWzVdEdA
             -Dmetadata-keystore.metadata.algorithm=AES
         </keystore.settings>
+
+        <activemq.version>5.16.1</activemq.version>
+
         <test.acs.endpoint.path/>
 
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
@@ -246,7 +249,7 @@
                 <alfresco.share.version>6.0.b</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -258,7 +261,7 @@
                 <alfresco.share.version>6.0</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -272,7 +275,7 @@
                 <alfresco.share.version>6.1.1</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -284,7 +287,7 @@
                 <alfresco.share.version>6.1.0</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -298,7 +301,7 @@
                 <alfresco.share.version>6.2.2</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -306,11 +309,11 @@
             <id>enterprise-62-tests</id>
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.2.2.10</alfresco.platform.version>
+                <alfresco.platform.version>6.2.2.12</alfresco.platform.version>
                 <alfresco.share.version>6.2.2.2</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
-                <keystore.settings></keystore.settings>
+                <keystore.settings/>
             </properties>
         </profile>
 
@@ -320,19 +323,21 @@
             <id>community-70-tests</id>
             <properties>
                 <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>7.0.0-A20</alfresco.platform.version>
-                <alfresco.share.version>7.0.0-M3</alfresco.share.version>
+                <alfresco.platform.version>7.0.0</alfresco.platform.version>
+                <alfresco.share.version>7.0.0</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
             </properties>
         </profile>
 
+        <!-- 7.0 -->
+        <!-- This profiles requires to be executed using Java 11 -->
         <profile>
             <id>enterprise-70-tests</id>
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>repo-5439-M3v2</alfresco.platform.version>
-                <alfresco.share.version>7.0.0-M3</alfresco.share.version>
+                <alfresco.platform.version>7.0.0</alfresco.platform.version>
+                <alfresco.share.version>7.0.0</alfresco.share.version>
                 <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
             </properties>