From e139b4c2182049617a4a9959b18cfd1ab97ede8a Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eromano@users.noreply.github.com>
Date: Wed, 6 May 2020 11:23:01 +0100
Subject: [PATCH] [AAE-2570] prepare script to change name development to
 develop (#5675)

* prepare script to change name development to develop

* travis for develop
---
 .travis.yml                              | 6 +++---
 scripts/git-util/check-branch-updated.sh | 4 ++--
 scripts/release/release.sh               | 6 +++---
 scripts/travis/build/build.sh            | 2 +-
 scripts/travis/release/release-npm.sh    | 2 +-
 scripts/travis/update/update-project.sh  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36a6dcab1b..1fa839cf08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
 branches:
   only:
   - master
-  - development
+  - develop
   - /.*old-env.*/
   - /.*next-release.*/
   - /.*beta.*/
@@ -38,7 +38,7 @@ stages:
   - name: Release beta tag
     if: type = cron OR branch = master
   - name: Trigger ADF child build
-    if: (branch = development AND type = push) OR type = api
+    if: (branch = develop AND type = push) OR type = api
 
 addons:
     chrome: stable
@@ -62,7 +62,7 @@ jobs:
             - ./scripts/travis/build/build.sh || exit 1;
             - ./scripts/lint.sh || exit 1;
 
-        # Run Only on Development and master
+        # Run Only on develop and master
         - stage: Lint & Build Dist & Release
           name:  Lint & Build Dist & Release
           script:
diff --git a/scripts/git-util/check-branch-updated.sh b/scripts/git-util/check-branch-updated.sh
index a7f11dce3d..527ec70719 100755
--- a/scripts/git-util/check-branch-updated.sh
+++ b/scripts/git-util/check-branch-updated.sh
@@ -25,8 +25,8 @@ then
     exit 0
 fi
 
-hash1=$(git show-ref --heads -s development)
-hash2=$(git merge-base development $BRANCH_NAME)
+hash1=$(git show-ref --heads -s develop)
+hash2=$(git merge-base develop $BRANCH_NAME)
 [ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; }
 
 echo "Development branch HEAD sha " $hash1
diff --git a/scripts/release/release.sh b/scripts/release/release.sh
index 2631c4999f..5f805419fb 100755
--- a/scripts/release/release.sh
+++ b/scripts/release/release.sh
@@ -30,7 +30,7 @@ release() {
     rm -rf $TEMP;
     git clone https://$TOKEN@github.com/$1.git $TEMP
     cd $TEMP
-    git checkout development
+    git checkout develop
 
     if $GNU; then
         ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION
@@ -40,9 +40,9 @@ release() {
 
     git add .
     git commit -m "Release $VERSION"
-    git push -u origin development
+    git push -u origin develop
 
-    curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Release ADF version '$VERSION'","head":"'development'","base":"master","title":"Release ADF version '$VERSION'"}' https://api.github.com/repos/$1/pulls
+    curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Release ADF version '$VERSION'","head":"'develop'","base":"master","title":"Release ADF version '$VERSION'"}' https://api.github.com/repos/$1/pulls
     rm -rf $TEMP;
 }
 
diff --git a/scripts/travis/build/build.sh b/scripts/travis/build/build.sh
index 8f30f3fbd5..c621114428 100755
--- a/scripts/travis/build/build.sh
+++ b/scripts/travis/build/build.sh
@@ -11,7 +11,7 @@ npm install @alfresco/adf-cli@alpha
 
 if [[ $TRAVIS_PULL_REQUEST == "false" ]];
 then
-    if [[ $TRAVIS_BRANCH == "development" ]];
+    if [[ $TRAVIS_BRANCH == "develop" ]];
     then
         NEXT_VERSION=-nextalpha
         if [[ $TRAVIS_EVENT_TYPE == "cron" ]];
diff --git a/scripts/travis/release/release-npm.sh b/scripts/travis/release/release-npm.sh
index d1ab77a486..717b62595a 100755
--- a/scripts/travis/release/release-npm.sh
+++ b/scripts/travis/release/release-npm.sh
@@ -7,7 +7,7 @@ cd $DIR/../../../
 if [[ $TRAVIS_PULL_REQUEST == "false" ]];
 then
     TAG_NPM=latest
-    if [[ $TRAVIS_BRANCH == "development" ]];
+    if [[ $TRAVIS_BRANCH == "develop" ]];
     then
         TAG_NPM=alpha
         if [[ $TRAVIS_EVENT_TYPE == "cron" ]];
diff --git a/scripts/travis/update/update-project.sh b/scripts/travis/update/update-project.sh
index f0500f0f9b..9c3397982e 100755
--- a/scripts/travis/update/update-project.sh
+++ b/scripts/travis/update/update-project.sh
@@ -45,7 +45,7 @@ rm -rf $TEMP_GENERATOR_DIR;
 
 git clone https://$TOKEN@github.com/$NAME_REPO.git $TEMP_GENERATOR_DIR
 cd $TEMP_GENERATOR_DIR
-git checkout development
+git checkout develop
 
 BRANCH="ADF-update-$VERSION"
 git checkout -b $BRANCH
@@ -56,6 +56,6 @@ git add .
 git commit -m "Update ADF packages version $VERSION"
 git push -u origin $BRANCH
 
-curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Update ADF packages version '$VERSION'","head":"'$BRANCH'","base":"development","title":"Update ADF packages version '$VERSION'"}' https://api.github.com/repos/$NAME_REPO/pulls
+curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Update ADF packages version '$VERSION'","head":"'$BRANCH'","base":"develop","title":"Update ADF packages version '$VERSION'"}' https://api.github.com/repos/$NAME_REPO/pulls
 
 rm -rf $TEMP_GENERATOR_DIR;