From a26489383d8985c4f18d44ddb2f0a5180247bf03 Mon Sep 17 00:00:00 2001 From: Lukasz Serwatka Date: Fri, 26 Feb 2016 11:16:11 +0100 Subject: [PATCH] [dependencies] configured for 1.2.0 release --- composer.json | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index aab1a1db07..bd6d5b6ec6 100644 --- a/composer.json +++ b/composer.json @@ -30,19 +30,18 @@ "sensio/generator-bundle": "~2.3", "incenteev/composer-parameter-handler": "~2.0", "tedivm/stash-bundle": "~0.4.3", - "ezsystems/ezpublish-kernel": "~6.1.0@dev", - "ezsystems/repository-forms": "~1.1.0@dev", - "ezsystems/ezplatform-solr-search-engine": "~1.0.0@dev", - "ezsystems/platform-ui-bundle": "~1.2.0@dev", - "ezsystems/platform-ui-assets-bundle": "~2.0.0@alpha", - "ezsystems/comments-bundle": "~6.0.0@dev", - "ezsystems/studio-ui-bundle": "~1.2.0@dev", - "ezsystems/ezstudio-notifications": "~1.0.0@dev", - "ezsystems/landing-page-fieldtype-bundle": "~1.2.0@dev", - "ezsystems/ezstudio-demo-bundle": "~1.2.0@dev", - "ezsystems/ezstudio-demo-bundle-data": "~1.2.0@dev", - "ezsystems/share-buttons-bundle": "~1.0.0@dev", - "ezsystems/flex-workflow": "~1.2.0@dev", + "ezsystems/ezpublish-kernel": "6.2.0-rc2 as 6.2.0", + "ezsystems/repository-forms": "1.1.0-rc1 as 1.1.0", + "ezsystems/ezplatform-solr-search-engine": "^1.0", + "ezsystems/platform-ui-bundle": "1.2.0-rc1 as 1.2.0", + "ezsystems/comments-bundle": "~6.0.0", + "ezsystems/studio-ui-bundle": "1.2.0-rc1 as 1.2.0", + "ezsystems/ezstudio-notifications": "1.0.0-rc1 as 1.0.0", + "ezsystems/landing-page-fieldtype-bundle": "1.2.0-rc1 as 1.2.0", + "ezsystems/ezstudio-demo-bundle": "1.2.0-rc1 as 1.2.0", + "ezsystems/ezstudio-demo-bundle-data": "1.2.0-rc1 as 1.2.0", + "ezsystems/share-buttons-bundle": "~1.0.0", + "ezsystems/flex-workflow": "1.2.0-rc1 as 1.2.0", "egulias/listeners-debug-command-bundle": "~1.9", "white-october/pagerfanta-bundle": "1.0.*", "hautelook/templated-uri-bundle": "~1.0 | ~2.0", @@ -57,7 +56,7 @@ "behat/mink-goutte-driver": "*", "behat/mink-selenium2-driver": "*", "jarnaiz/behat-junit-formatter": "^1.3", - "ezsystems/behatbundle": "~6.1.0@dev" + "ezsystems/behatbundle": "6.2.0-rc1 as 6.2.0" }, "suggest": { "ezsystems/legacy-bridge": "Provides the full legacy backoffice and legacy features" @@ -96,9 +95,6 @@ "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml" - }, - "branch-alias": { - "dev-master": "1.2.x-dev" } }, "bin": [