merge meta/master

ezecosystem · Jan 23, 2019 · a3ed388 · a3ed388
2 parents d98ae54 + 9668cc2
commit a3ed388
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -32,20 +32,20 @@
         "ezplatform-i18n/ezplatform-i18n-nb_no": "^2.3",
         "ezplatform-i18n/ezplatform-i18n-pl_pl": "^2.3",
         "ezplatform-i18n/ezplatform-i18n-ru_ru": "^2.3",
-        "ezsystems/ez-support-tools": "~0.2.1@dev",
-        "ezsystems/ezplatform-admin-ui": "~1.4.0@dev",
-        "ezsystems/ezplatform-admin-ui-assets": "~3.1.0@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "~1.4.0@dev",
+        "ezsystems/ez-support-tools": "^0.2@dev",
+        "ezsystems/ezplatform-admin-ui": "^1.5@dev",
+        "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.5@dev",
         "ezsystems/ezplatform-automated-translation": "^2.0@rc",
-        "ezsystems/ezplatform-cron": "~2.0.0@dev",
+        "ezsystems/ezplatform-cron": "^2.0@dev",
         "ezsystems/ezplatform-demo-assets": "^1.0@dev",
-        "ezsystems/ezplatform-design-engine": "~2.0.0@dev",
-        "ezsystems/ezplatform-http-cache": "~0.8.0@dev",
-        "ezsystems/ezplatform-richtext": "~1.0.0@dev",
-        "ezsystems/ezplatform-solr-search-engine": "~1.5.4@dev",
-        "ezsystems/ezplatform-standard-design": "~0.1.0@dev",
-        "ezsystems/ezpublish-kernel": "~7.4.0@dev",
-        "ezsystems/repository-forms": "~2.4.0@dev",
+        "ezsystems/ezplatform-design-engine": "^2.0@dev",
+        "ezsystems/ezplatform-http-cache": "~0.8@dev",
+        "ezsystems/ezplatform-richtext": "^1.1@dev",
+        "ezsystems/ezplatform-solr-search-engine": "^1.5.4@dev",
+        "ezsystems/ezplatform-standard-design": "^0.1@dev",
+        "ezsystems/ezpublish-kernel": "^7.5@dev",
+        "ezsystems/repository-forms": "^2.5@dev",
         "friendsofsymfony/jsrouting-bundle": "^1.6.3",
         "incenteev/composer-parameter-handler": "^2.1.3",
         "kaliop/ezmigrationbundle": "^4.0",
@@ -75,8 +75,8 @@
         "behat/mink-selenium2-driver": "^1.3.1",
         "behat/symfony2-extension": "^2.1.5",
         "bex/behat-screenshot": "^1.2.7",
-        "ezsystems/behat-screenshot-image-driver-cloudinary": "~1.0.0@dev",
-        "ezsystems/behatbundle": "~6.5.4@dev",
+        "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0.0@dev",
+        "ezsystems/behatbundle": "^6.5.4@dev",
         "phpunit/phpunit": "^6.5.13",
         "sensio/generator-bundle": "^3.1.7",
         "symfony/phpunit-bridge": "^3.4.18"
@@ -129,7 +129,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.4.x-dev"
+            "dev-master": "2.5.x-dev"
         }
     }
 }