Pull merge.

[yaffs-website] / composer.json

diff --git a/composer.json b/composer.json
index 63caacd56d66bff2d2007a96f658113ee7e2fd70..f8d00ee3eef075b8e6ac810ab9f2dc90e2927d04 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -19,12 +19,12 @@
         "composer/installers": "^1.2",
         "drupal-composer/drupal-scaffold": "^2.2",
         "cweagans/composer-patches": "~1.0",
-        "drupal/core": "^8.5.0",
+        "drupal/core": "8.6.4",
         "drupal/console": "^1.0",
         "drupal/token": "^1.0",
         "drupal/ctools": "^3.0",
         "drupal/migrate_upgrade": "^3.0",
-        "drupal/migrate_tools": "^3.0",
+        "drupal/migrate_tools": "^4.0",
         "drupal/bootstrap": "^3.2",
         "drupal/admin_toolbar": "^1.18",
         "drupal/pathauto": "^1.0",
@@ -32,7 +32,6 @@
         "drupal/simple_sitemap": "^2.9",
         "drupal/eu_cookie_compliance": "^1.0@beta",
         "twbs/bootstrap-sass": "^3.3",
-        "drupal/paragraphs": "^1.1",
         "drupal/front": "^1.0@beta",
         "drupal/filefield_sources": "1.x-dev",
         "drupal/php": "1.x-dev",
@@ -52,7 +51,6 @@
         "drupal/fontyourface": "^3.0",
         "drupal/devel": "^1.0",
         "drupal/drupalmoduleupgrader": "^1.2",
-        "drupal/security_review": "1.x-dev",
         "drupal/memcache": "^2.0@alpha",
         "enyo/dropzone": "^4.3",
         "drush/config-extra": "^1.0",
@@ -64,9 +62,9 @@
         "mehrpadin/superfish": "^2.0",
         "drupal/superfish": "^1.0@RC",
         "drupal/entity_browser": "^1.0",
-        "drupal/views_bootstrap": "3.0",
+        "drupal/views_bootstrap": "^3.0",
         "drupal/views_responsive_grid": "@dev",
-        "drupal/imagemagick": "^1.0@alpha",
+        "drupal/imagemagick": "^2.0",
         "drupal/diff": "^1.0@RC",
         "drupal/permissions_by_term": "^1.19",
         "drupal/linkit": "^4.3",
@@ -80,27 +78,26 @@
         "drupal/layout_plugin": "^1.0@alpha",
         "drupal/draggableviews": "^1.0",
         "roave/security-advisories": "dev-master",
-
-     "drupal/video_embed_field": "^2.0",
+        "drupal/video_embed_field": "^2.0",
         "drupal/slick_media":"^2.0",
         "drupal/media_entity_twitter":"^2.0",
         "drupal/media_entity_slideshow":"^2.0",
         "drupal/media_entity_instagram":"^2.0",
         "drupal/image_widget_crop":"^2.1",
         "drupal/crop":"^2.0",
-        "drupal/media_entity":"^2.0",
         "drupal/media_entity_actions":"^1.0",
         "drupal/inline_entity_form": "^1.0@beta",
         "drupal/entity_embed": "^1.0@beta",
-        "drupal/dropzonejs": "^2.0@alpha"
-
+        "drupal/dropzonejs": "^2.0@alpha",
+        "drupal/entity_reference_revisions": "^1.6",
+        "drupal/entity": "^1.0-rc1"
     },
     "require-dev": {
         "behat/mink": "~1.7",
         "behat/mink-goutte-driver": "~1.2",
         "jcalderonzumba/gastonjs": "~1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-        "mikey179/vfsStream": "~1.2",
+        "mikey179/vfsstream": "~1.2",
         "symfony/css-selector": "~2.8",
         "drupal/twig_xdebug": "^1.0",
         "drupal/livereload": "1.x-dev",
@@ -176,7 +173,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.0.27"
+            "php": "7.0.30"
         }
     }
 }