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

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

diff --git a/.travis.yml b/.travis.yml
index d1a92dd..87c3ef2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ addons:
 env:
   global:
     - TRAVIS_NODE_VERSION="6"
-    - COMPOSER_ROOT_VERSION="4.6.x-dev"
+    - COMPOSER_ROOT_VERSION="4.x-dev"
     - SS_BASE_URL="http://localhost:8080/"
     - SS_ENVIRONMENT_TYPE="dev"
 
@@ -87,7 +87,7 @@ before_script:
 
 # Install composer dependencies
   - composer validate
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.4.x-dev; fi
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
   - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
   - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;
   - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;
diff --git a/composer.json b/composer.json
index e812eee..fa56468 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=7.1.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "4.6.x-dev",
+        "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0"
     },
     "require-dev": {
@@ -20,9 +20,6 @@
             "assets/*",
             "favicon.ico"
         ],
-        "branch-alias": {
-            "4.x-dev": "4.6.x-dev"
-        },
         "resources-dir": "_resources"
     },
     "config": {