Skip to content

Commit

Permalink
updated sulu dependency in composer.json
Browse files Browse the repository at this point in the history
  • Loading branch information
wachterjohannes committed Jun 28, 2017
1 parent 45290a1 commit fcb51b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down

0 comments on commit fcb51b0

Please sign in to comment.