From c30159938fd1b1bd19cedfba19ba8ccb41ad1b8d Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 31 Mar 2016 12:25:02 +0200 Subject: [PATCH 1/2] prepare release 2.0 --- CHANGELOG.md | 3 +++ composer.json | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6218a3a6..fc235551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog ========= +2.0.0 +----- + 2.0.0-RC1 --------- diff --git a/composer.json b/composer.json index b5e68d2a..ebd9456e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require": { "php": "^5.3.9|^7.0", "symfony/framework-bundle": "^2.3", - "symfony-cmf/core-bundle": "^1.1.0-RC3", + "symfony-cmf/core-bundle": "^1.1.0", "doctrine/phpcr-bundle": "^1.1", "doctrine/phpcr-odm": "^1.1", "knplabs/knp-menu-bundle": "^2.0.0", @@ -22,9 +22,9 @@ }, "require-dev": { "symfony/monolog-bundle": "^2.3", - "symfony-cmf/routing-bundle": "^1.2.0-RC3", - "symfony-cmf/testing": "^1.3@dev", - "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", + "symfony-cmf/routing-bundle": "^1.2.0", + "symfony-cmf/testing": "^1.3", + "symfony-cmf/tree-browser-bundle": "^1.0.0", "doctrine/phpcr-odm": "^1.3", "twig/twig": "^1.18", "sonata-project/doctrine-phpcr-admin-bundle": "^1.1", From 44a282dc498dbc0b2c7242a10ca96e42f21aa586 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 31 Mar 2016 15:39:46 +0200 Subject: [PATCH 2/2] help composer solve dev dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af5f89cf..08dca3d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: matrix: include: - php: 5.6 - env: DEPS=dev + env: DEPS=dev SYMFONY_VERSION=2.8.* - php: 5.3 env: SYMFONY_VERSION="^2.3.4" COMPOSER_FLAGS="--prefer-lowest" - php: 5.6