Merge branch 'master' into feature/RM-6377_PublishDockerImagesAsPartOfEnterpriseRelease

pom.xml

@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm</artifactId>
    <packaging>pom</packaging>
-   <version>3.0.0-SNAPSHOT</version>
+   <version>3.0.1_test-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <url>http://www.alfresco.org/</url>
@@ -18,7 +18,8 @@
       <connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
       <developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
       <url>https://git.alfresco.com/records-management/records-management</url>
-   </scm>
+     <tag>HEAD</tag>
+  </scm>
 
    <issueManagement>
       <system>JIRA</system>

rm-automation/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1_test-SNAPSHOT</version>
    </parent>
 
    <licenses>

rm-automation/rm-automation-community-rest-api/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-automation</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1_test-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1_test-SNAPSHOT</version>
    </parent>
 
    <licenses>

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

@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1_test-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.0.1_test-SNAPSHOT</version>
    </parent>
 
    <properties>

scripts/cleanImages.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -x
 
 echo $imagesToBeDeleted

scripts/stopDockerContainers.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e  # exit if commands fails
-set -x  # trace what gets exe
-
-docker-compose ps
-docker-compose kill
-docker-compose rm -fv

scripts/waitForAlfrescoToStart.sh

@@ -1,12 +1,4 @@
 #!/usr/bin/env bash
-set -e  # exit if commands fails
-set -x  # trace what gets exe
-
-docker info
-docker-compose --version
-echo "Starting Alfresco with AGS amps applied in Docker container"
-docker-compose ps
-docker-compose up -d
 
 WAIT_INTERVAL=1
 COUNTER=0