From f45f6d0563c8aeae4a715ceef172e337bde1996d Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Mon, 30 Sep 2019 21:41:40 +0100
Subject: [PATCH] fix update children project

---
 scripts/travis/update/update-children.sh | 21 +++++++++++++++------
 scripts/travis/update/update-project.sh  | 12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/scripts/travis/update/update-children.sh b/scripts/travis/update/update-children.sh
index 87886c66f4..965ef84c89 100755
--- a/scripts/travis/update/update-children.sh
+++ b/scripts/travis/update/update-children.sh
@@ -2,15 +2,24 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+
+if ([ "$TRAVIS_BRANCH" = "master" ]); then
+   VERSION=$(npm view @alfresco/adf-core version)
+   JS_VERSION=$(npm view @alfresco/js-api version)
+else
+   VERSION=$(npm view @alfresco/adf-core@beta version)
+   JS_VERSION=$(npm view @alfresco/js-api@beta version)
+fi;
+
 echo "Update Generator"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/generator-ng2-alfresco-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/generator-ng2-alfresco-app' -v $VERSION -vjs $JS_VERSION
 echo "Update ACA"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-content-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-content-app' -v $VERSION -vjs $JS_VERSION
 echo "Update ADF"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-ng2-components'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-ng2-components' -v $VERSION -vjs $JS_VERSION
 echo "Update AMA"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-modeler-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-modeler-app' -v $VERSION -vjs $JS_VERSION
 echo "Update Workspace"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-process-workspace-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-process-workspace-app' -v $VERSION -vjs $JS_VERSION
 echo "Update APA Activiti"
-./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-admin-app'
+./scripts/travis/update/update-project.sh -gnu -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-admin-app' -v $VERSION -vjs $JS_VERSION
diff --git a/scripts/travis/update/update-project.sh b/scripts/travis/update/update-project.sh
index 09ee25ce9a..b4eb6aaaf6 100755
--- a/scripts/travis/update/update-project.sh
+++ b/scripts/travis/update/update-project.sh
@@ -12,6 +12,8 @@ show_help() {
     echo ""
     echo "-t or --token  Github ouath token"
     echo "-n or --name  Github name of the project"
+    echo "-v or --version  ADF version if not passed will use the beta"
+    echo "-vjs or --vjs  JS API version if not passed will use the beta"
     echo "-gnu for gnu"
 }
 
@@ -24,6 +26,14 @@ token() {
     TOKEN=$1
 }
 
+vjs() {
+    JS_VERSION=$1
+}
+
+version() {
+    VERSION=$1
+}
+
 name_repo() {
     NAME_REPO=$1
 }
@@ -34,6 +44,8 @@ while [[ $1 == -* ]]; do
       -n|--name|-\?)  name_repo $2; shift 2;;
       -gnu) gnu_mode; shift;;
       -t|--token)  token $2; shift 2;;
+      -v|--version)  version $2; shift 2;;
+      -vjs|--vjs)  vjs $2; shift 2;;
       -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
     esac
 done