From 6c5aef857bb9b9d3514c989dc5d55838a4d41fd2 Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Fri, 9 Sep 2016 11:15:25 -0700 Subject: [PATCH 1/3] Add search modules and library. --- template/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/composer.json b/template/composer.json index f6dd7f33e..cccb583d1 100644 --- a/template/composer.json +++ b/template/composer.json @@ -15,12 +15,15 @@ "drupal/core": "~8", "drupal/console": "~1", "drupal/memcache" : "8.*", + "drupal/search_api": "8.1.0-alpha14", + "drupal/search_api_solr": "8.1.0-alpha3", "drupal/security_review" : "8.*", "roave/security-advisories": "dev-master", "drupal-composer/drupal-security-advisories": "8.0.x-dev", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/lightning": "8.1.03", "drupal/metatag": "8.1.0-beta9" + "solarium/solarium": "3.6.*" }, "require-dev": { "behat/behat": "3.0.*", From 95d3e2e2b714ba0ac835b311b25f08e1773e2ef9 Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Fri, 9 Sep 2016 11:18:56 -0700 Subject: [PATCH 2/3] Alphabetized modules. --- template/composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/template/composer.json b/template/composer.json index cccb583d1..e22b8fb2c 100644 --- a/template/composer.json +++ b/template/composer.json @@ -12,34 +12,34 @@ "cweagans/composer-patches": "^1.5.0", "drupal/acquia_connector": "8.1.*", "drupal/acsf": "~8.1", - "drupal/core": "~8", "drupal/console": "~1", + "drupal/core": "~8", + "drupal/lightning": "8.1.03", "drupal/memcache" : "8.*", + "drupal/metatag": "8.1.0-beta9" "drupal/search_api": "8.1.0-alpha14", "drupal/search_api_solr": "8.1.0-alpha3", "drupal/security_review" : "8.*", - "roave/security-advisories": "dev-master", - "drupal-composer/drupal-security-advisories": "8.0.x-dev", "drupal-composer/drupal-scaffold": "^2.0.0", - "drupal/lightning": "8.1.03", - "drupal/metatag": "8.1.0-beta9" + "drupal-composer/drupal-security-advisories": "8.0.x-dev", + "roave/security-advisories": "dev-master", "solarium/solarium": "3.6.*" }, "require-dev": { "behat/behat": "3.0.*", "behat/mink": "1.6@stable", + "behat/mink-browserkit-driver": "*", "behat/mink-extension": "*", "behat/mink-goutte-driver": "*", "behat/mink-selenium2-driver": "*", - "behat/mink-browserkit-driver": "*", - "drush/drush": "^9.0", - "drupal/drupal-extension": "~3.0", "drupal/coder": "~8.2", - "phpunit/phpunit": "~5.4", - "squizlabs/php_codesniffer": "2.*", - "phing/phing": "dev-master#0ef30e55bb5871cb38903cc0ee9d76074118a22c", + "drupal/drupal-extension": "~3.0", + "drush/drush": "^9.0", "jakoch/phantomjs-installer": "dev-master as 1.9.8", - "jarnaiz/behat-junit-formatter": "^1.2" + "jarnaiz/behat-junit-formatter": "^1.2", + "phing/phing": "dev-master#0ef30e55bb5871cb38903cc0ee9d76074118a22c", + "phpunit/phpunit": "~5.4", + "squizlabs/php_codesniffer": "2.*" }, "autoload-dev": { "psr-4": { From 6f321d95591e771f794847a202bf80c5b14fe338 Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Fri, 9 Sep 2016 11:32:25 -0700 Subject: [PATCH 3/3] Fixed errant EOL. --- template/composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/template/composer.json b/template/composer.json index e22b8fb2c..6bdfc0616 100644 --- a/template/composer.json +++ b/template/composer.json @@ -16,14 +16,13 @@ "drupal/core": "~8", "drupal/lightning": "8.1.03", "drupal/memcache" : "8.*", - "drupal/metatag": "8.1.0-beta9" + "drupal/metatag": "8.1.0-beta9", "drupal/search_api": "8.1.0-alpha14", "drupal/search_api_solr": "8.1.0-alpha3", - "drupal/security_review" : "8.*", + "drupal/security_review": "8.*", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal-composer/drupal-security-advisories": "8.0.x-dev", - "roave/security-advisories": "dev-master", - "solarium/solarium": "3.6.*" + "roave/security-advisories": "dev-master" }, "require-dev": { "behat/behat": "3.0.*",