From c94fe3f74ea628b6662824efad232ed424863f1e Mon Sep 17 00:00:00 2001 From: cagache Date: Fri, 29 Jun 2018 11:09:15 +0300 Subject: [PATCH 1/4] updated scripts because I can't use general scripts to start/stop alfresco from different subdirectories --- scripts/stopDockerContainers.sh | 7 ------- scripts/{startAlfresco.sh => waitForAlfrescoToStart.sh} | 8 -------- 2 files changed, 15 deletions(-) delete mode 100644 scripts/stopDockerContainers.sh rename scripts/{startAlfresco.sh => waitForAlfrescoToStart.sh} (72%) diff --git a/scripts/stopDockerContainers.sh b/scripts/stopDockerContainers.sh deleted file mode 100644 index bc5b56b2ff..0000000000 --- a/scripts/stopDockerContainers.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/startAlfresco.sh b/scripts/waitForAlfrescoToStart.sh similarity index 72% rename from scripts/startAlfresco.sh rename to scripts/waitForAlfrescoToStart.sh index 85dc63a9ff..59c7e40733 100644 --- a/scripts/startAlfresco.sh +++ b/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 From a909aeb7ce45506c1788fde4215810d20bf643d6 Mon Sep 17 00:00:00 2001 From: cagache Date: Fri, 29 Jun 2018 12:17:10 +0300 Subject: [PATCH 2/4] changed #!/bin/bash to #!/usr/bin/env bash --- scripts/cleanImages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh index 874723aa6f..b0607ba391 100644 --- a/scripts/cleanImages.sh +++ b/scripts/cleanImages.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x echo $imagesToBeDeleted From 754ab8ba3f8f974e416233d2f9b59de006b3c03c Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 3 Jul 2018 15:40:49 +0100 Subject: [PATCH 3/4] [maven-release-plugin] prepare release VAGSCommunity3.0.0_test --- pom.xml | 5 +++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index dee94f9c8f..7feaaf05ea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,8 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - + VAGSCommunity3.0.0_test + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1033c353a4..4158928087 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 36080c3d8e..a19304708c 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d20b147c15..c626df4749 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 304dd1b9c1..291c49b88c 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 3dad123d3c..d2460cee22 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + AGSCommunity3.0.0_test From 3caf1ace4fccf468a8f37ff503d2bc1af319c970 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 3 Jul 2018 15:40:52 +0100 Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 7feaaf05ea..98a4adb5c8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - VAGSCommunity3.0.0_test + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4158928087..260145e561 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index a19304708c..231257f1f3 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index c626df4749..ca86425698 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 291c49b88c..6f620b2920 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index d2460cee22..e8f08a7cbf 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - AGSCommunity3.0.0_test + 3.0.1_test-SNAPSHOT