Update parent POM / ACS 7 test setup

share/pom.xml

@@ -188,6 +188,11 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

share/src/test/docker/Repository-Dockerfile

@@ -1,12 +1,12 @@
 FROM ${docker.tests.repositoryBaseImage}
 COPY maven ${docker.tests.repositoryWebappPath}
 
+${docker.tests.repositoryImageBuilder.preRun}
+
 # merge additions to alfresco-global.properties
 RUN echo "" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && echo "#MergeGlobalProperties" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && sed -i '/#MergeGlobalProperties/r ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/alfresco-global.addition.properties' ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
-    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml \
-    && mv ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/entrypoint.sh $CATALINA_HOME/bin/ \
-    && chmod +x $CATALINA_HOME/bin/entrypoint.sh
+    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml
     
-CMD ["entrypoint.sh", "catalina.sh run -security"]
+${docker.tests.repositoryImageBuilder.postRun}

share/src/test/docker/alfresco/extension/entrypoint.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ip=`hostname -I | awk '{print $1}'`
-hostip=`echo "${ip}" | sed -E 's/([0-9]+\.[0-9]+)\.0\.[0-9]+/\1.0.1/'`
-hostname="${DOCKER_HOST_NAME}"
-echo "${hostip}   ${hostname}" >> /etc/hosts
-
-bash -c "$@"

share/src/test/docker/alfresco/web-extension/share-config-custom.xml

@@ -76,7 +76,7 @@
         </keycloak-auth-config>
         <keycloak-adapter-config>
             <directAuthHost>http://keycloak:8080</directAuthHost>
-            <auth-server-url>http://${docker.tests.host.name}:${docker.tests.keycloakPort}/auth</auth-server-url>
+            <auth-server-url>http://localhost:${docker.tests.keycloakPort}/auth</auth-server-url>
             <realm>test</realm>
             <resource>alfresco-share</resource>
             <ssl-required>none</ssl-required>

share/src/test/docker/repository-it.xml

@@ -64,6 +64,7 @@
                 <!-- this cost me half a day to track down when the following three patterns were sorted last -->
                 <include>com.cronutils:*</include>
                 <include>net.time4j:*</include>
+                <include>org.apache.activemq:activemq-broker</include>
                 <include>org.orderofthebee.support-tools:support-tools-repo:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.common:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz1:*</include>