From de65ad804ed4c1f817f34075f6d724f4557d617c Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Fri, 3 Dec 2021 09:21:39 -0800 Subject: [PATCH 1/2] Update composer.json --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f787f94a7..8321ec933 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "drupal/eva" : "^2.0", "drupal/features" : "^3.7", "drupal/migrate_plus" : "^5.1", - "drupal/migrate_tools" : "^5.0", + "drupal/migrate_tools" : "5.0", "drupal/migrate_source_csv" : "^3.4", "drupal/token" : "^1.3", "drupal/flysystem" : "^2.0@alpha", @@ -32,6 +32,9 @@ "drupal/file_replace": "^1.1" }, + "conflict": { + "drush/drush" : ">=10.4" + }, "require-dev": { "phpunit/phpunit": "^6", "squizlabs/php_codesniffer": "2.7.1", From 637be59770f82964a7c4565e37b464e1089b5c74 Mon Sep 17 00:00:00 2001 From: Seth Shaw Date: Fri, 3 Dec 2021 10:16:02 -0800 Subject: [PATCH 2/2] purge migrate_tools instead --- README.md | 3 ++- composer.json | 5 ----- islandora.info.yml | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c085764db..befd4926c 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ Installing via composer will download all required libraries and modules. Howev - [eva](http://drupal.org/project/eva) - [features](http://drupal.org/project/features) - [migrate_plus](http://drupal.org/project/migrate_plus) -- [migrate_tools](http://drupal.org/project/migrate_tools) - [migrate_source_csv](http://drupal.org/project/migrate_source_csv) - [flysystem](http://drupal.org/project/flysystem) @@ -49,6 +48,8 @@ It also requires the following PHP libraries: - [Crayfish Commons](https://packagist.org/packages/islandora/crayfish-commons) - [Stomp PHP](http://drupal.org/project/) +If you are using a Drush version less than 10.4 you will also need to install and enable [migrate_tools](http://drupal.org/project/migrate_tools) separately. + ## Installation For a full digital repository solution, see our [installation documentation](https://islandora.github.io/documentation/installation/component_overview/). diff --git a/composer.json b/composer.json index 8321ec933..46bede3f2 100644 --- a/composer.json +++ b/composer.json @@ -24,16 +24,11 @@ "drupal/eva" : "^2.0", "drupal/features" : "^3.7", "drupal/migrate_plus" : "^5.1", - "drupal/migrate_tools" : "5.0", "drupal/migrate_source_csv" : "^3.4", "drupal/token" : "^1.3", "drupal/flysystem" : "^2.0@alpha", "islandora/crayfish-commons": "^2", "drupal/file_replace": "^1.1" - - }, - "conflict": { - "drush/drush" : ">=10.4" }, "require-dev": { "phpunit/phpunit": "^6", diff --git a/islandora.info.yml b/islandora.info.yml index c66c1ba8d..9cd89cddc 100644 --- a/islandora.info.yml +++ b/islandora.info.yml @@ -27,7 +27,6 @@ dependencies: - drupal:media - drupal:prepopulate - drupal:features_ui - - drupal:migrate_tools - drupal:migrate_source_csv - drupal:content_translation - drupal:flysystem