From fcb51b0515de5898ee3329fbbe223b43faa07869 Mon Sep 17 00:00:00 2001
From: Johannes Wachter <johannes.wachter@massiveart.com>
Date: Wed, 28 Jun 2017 15:48:03 +0200
Subject: [PATCH] updated sulu dependency in composer.json

---
 .travis.yml   | 8 --------
 composer.json | 9 ++-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6e6b43c3..523b543b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,19 +17,12 @@ matrix:
   include:
     - php: 5.5
       env:
-        # - SULU_VERSION="~1.6.0"
         - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
         - ES_VERSION="2.4.4"
         - ES_DOWNLOAD_URL="https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.zip"
     - php: 7.0
       env:
         - COMPOSER_FLAGS="--prefer-dist --no-interaction"
-        # - SULU_VERSION="dev-develop"
-        - CODE_COVERAGE="--coverage-clover=coverage.clover"
-    - php: 7.0
-      env:
-        - COMPOSER_FLAGS="--prefer-dist --no-interaction"
-        # - SULU_VERSION="~1.6.0"
         - SYMFONY__PHPCR__TRANSPORT=jackrabbit
 
 addons:
@@ -58,7 +51,6 @@ before_install:
   - ./elasticsearch-*/bin/elasticsearch -d
 
 install:
-  # - travis_retry composer require sulu/sulu:$SULU_VERSION $COMPOSER_FLAGS
   - travis_retry composer update $COMPOSER_FLAGS
   - composer info -i
   - ./Tests/app/console doctrine:database:create
diff --git a/composer.json b/composer.json
index 8f551c6f4..f96d26d32 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^5.5 || ^7.0",
-        "sulu/sulu": "1.6.0-RC1 as 1.5.0",
+        "sulu/sulu": "^1.6",
         "ongr/elasticsearch-bundle": "^1.2.9 || ~5.0",
         "ongr/elasticsearch-dsl": "^2.2.2 || ~5.0",
         "jackalope/jackalope": "^1.2.8 || >=1.3.3"
@@ -17,12 +17,7 @@
         "jackalope/jackalope-doctrine-dbal": "^1.2.5",
         "jackalope/jackalope-jackrabbit": "^1.2",
         "phpunit/phpunit": "^4.8 || ^5.0",
-
-        "sulu/document-manager": "0.10-RC1 as 0.9.0",
-
-        "sulu/automation-bundle": "^1.0",
-        "php-task/task-bundle": "dev-master as 1.1.0",
-        "php-task/php-task": "dev-master as 1.1.0"
+        "sulu/automation-bundle": "^1.0"
     },
     "suggest": {
         "sulu/automation-bundle": "Allows to outsource long-running route update processes."