From 56c1799f8836317c04332a6f2d756a7554312243 Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Mon, 9 Dec 2019 13:52:10 +1300
Subject: [PATCH] RFC-9344 Remove branch aliases

---
 .travis.yml   | 6 +++---
 composer.json | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d52d40b3..31088542 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ addons:
 env:
   global:
     - TRAVIS_NODE_VERSION="10"
-    - COMPOSER_ROOT_VERSION="4.6.x-dev"
+    - COMPOSER_ROOT_VERSION="4.x-dev"
     - DISPLAY=":99"
     - XVFBARGS=":99 -ac -screen 0 1024x768x16"
     - SS_BASE_URL="http://localhost:8080/"
@@ -52,8 +52,8 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:4.6.x-dev
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.4.x-dev; fi
+  - composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:4.x-dev
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
   - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 # Install NPM dependencies
diff --git a/composer.json b/composer.json
index be633aba..3d997053 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,6 @@
         "phpunit/phpunit": "^5.7"
     },
     "extra": {
-        "branch-alias": {
-            "4.x-dev": "4.6.x-dev"
-        },
         "expose": [
             "client/dist",
             "client/lang"