2.2.2 release (#504)

acquia · Oct 31, 2017 · 208d934 · 208d934
1 parent 8cefd58
commit 208d934
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,10 @@ php:
   - 7.0.22
 env:
   - VERSION=HEAD
+  - VERSION=2.2.2
   - VERSION=2.2.1
   - VERSION=2.2.0
   - VERSION=2.1.8
-  - VERSION=2.1.7
 
 addons:
   apt:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.2.2
+* Fixed a bug where certain versions of Drush would erroneously report
+  unfulfilled requirements when running database updates. (Issue #2919204)
+* Removed a duplicate directory that caused problems when downloading via
+  Composer. (GitHub #502)
+
 ## 2.2.1
 * Lightning Media has been updated to use the new Core Media system.
 * Fixed a bug where the "Publishing status" checkbox appeared on content edit

diff --git a/README.md b/README.md
@@ -143,6 +143,8 @@ your environment, but generally you will not need to do this.
 * The Video Embed Field module, a dependency of Lightning Media, might report
   that it is unsupported. We're working with the module maintainer to remove
   this warning.
+* Using the bulk upload feature in environments with a load balancer might
+  result in some images not being saved.
 
 ### Workflow
 * Lightning Workflow is based on Workbench Moderation, which is incompatible

diff --git a/UPDATE.md b/UPDATE.md
@@ -76,6 +76,13 @@ are currently running Beta 1 and are trying to update to Beta 3, you will need
 to follow the instructions for updating from Beta 1 to Beta 2, then from Beta 2
 to Beta 3, in that order.
 
+### 2.2.1 to 2.2.2
+There are no manual update steps for this version.
+
+This release fixes some requirements problems with the 2.2.1 media migration.
+You *can* update directly from 2.2.0 to 2.2.2. When doing so, follow the
+"Special instructions for media entity migration" steps below.
+
 ### 2.2.0 to 2.2.1
 
 ##### Special instructions for media entity migration

diff --git a/build-lightning.make b/build-lightning.make
@@ -4,4 +4,4 @@ includes[] = drupal-org-core.make
 projects[lightning][type] = profile
 projects[lightning][download][type] = git
 projects[lightning][download][branch] = 8.x-2.x
-projects[lightning][download][tag] = 8.x-2.21
+projects[lightning][download][tag] = 8.x-2.22
diff --git a/build.xml b/build.xml
@@ -167,7 +167,7 @@
   <!-- Creates a legacy-built tarball with composer dependencies suitable for
   cloud. -->
   <target name="cloud-tarball">
-    <phingcall target="destroy" />
+    <exec command="${composer} nuke" />
     <phingcall target="build-legacy" />
     <phingcall target="tarball" />
   </target>

diff --git a/composer.json b/composer.json
@@ -136,10 +136,6 @@
                 "2908917 - SaveTabView blindly assumes a Revert tab exists":
                 "https://www.drupal.org/files/issues/2908917-2.patch"
             },
-            "drupal/crop": {
-                "2904514 - Crop API causes an error when adding a media bundle":
-                "https://www.drupal.org/files/issues/2904514-2.patch"
-            },
             "drupal/media_entity": {
                 "Reset D.O packaging information so subsequent patches apply":
                 "https://www.drupal.org/files/issues/media_entity-reset-packaging--add-version.patch",
@@ -192,7 +188,7 @@
         "oomphinc/composer-installers-extender": "^1.1",
         "drupal/dropzonejs": "1.0.0-alpha8",
         "bower-asset/dropzone": "^5.1",
-        "drupal/crop": "1.2.0",
+        "drupal/crop": "^1.3",
         "drupal/image_widget_crop": "^2.0",
         "bower-asset/cropper": "^2.3",
         "drupal/media_entity_document": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/drupal-org.make b/drupal-org.make
@@ -10,8 +10,7 @@ projects[consumers][version] = 1.0-beta1
 projects[contact_storage][type] = module
 projects[contact_storage][version] = 1.0-beta9
 projects[crop][type] = module
-projects[crop][patch][] = https://www.drupal.org/files/issues/2904514-2.patch
-projects[crop][version] = 1.2
+projects[crop][version] = 1.3
 projects[ctools][type] = module
 projects[ctools][version] = 3.0
 projects[diff][type] = module

diff --git a/lightning.info.yml b/lightning.info.yml
@@ -2,7 +2,7 @@ name: Lightning
 core: 8.x
 type: profile
 description: 'A fast and feature-rich Drupal distribution.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 distribution:
   name: Lightning
 dependencies:

diff --git a/modules/lightning_features/lightning_api/lightning_api.info.yml b/modules/lightning_features/lightning_api/lightning_api.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Progressive decoupling? No problem.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - jsonapi
   - openapi_redoc

diff --git a/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml b/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml
@@ -5,4 +5,4 @@ description: 'Contains configuration and support code for testing Headless Light
 hidden: true
 dependencies:
   - lightning_api
-version: '8.x-2.21'
+version: '8.x-2.22'
diff --git a/modules/lightning_features/lightning_core/lightning_core.info.yml b/modules/lightning_features/lightning_core/lightning_core.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Shared functionality for the Lightning distribution.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - node
   - path

diff --git a/...ng_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml b/...ng_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml
@@ -3,6 +3,6 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Provides a site-wide contact form with basic default configuration.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - contact_storage
diff --git a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Development tools for working on the Lightning distribution itself.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 hidden: true
 dependencies:
   - devel_generate

diff --git a/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml b/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml
@@ -3,6 +3,6 @@ package: Lightning
 core: 8.x
 type: module
 description: 'Provides a "Basic Page" content type that is, indeed, very basic.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_core
diff --git a/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml b/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml
@@ -3,4 +3,4 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Automatically manages user roles and permissions.'
-version: '8.x-2.21'
+version: '8.x-2.22'
diff --git a/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml b/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'A basic but powerful set of default configuration for searching your site.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_core
   - search_api
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml
@@ -3,5 +3,5 @@ core: 8.x
 type: module
 description: 'Contains configuration and support code for running Lightning functional tests.'
 package: Lightning
-version: '8.x-2.21'
+version: '8.x-2.22'
 hidden: true
diff --git a/modules/lightning_features/lightning_layout/lightning_layout.info.yml b/modules/lightning_features/lightning_layout/lightning_layout.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Layout'
 core: 8.x
 type: module
 description: 'Provides the tools to take control of your layout.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - lightning_core

diff --git a/..._features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml b/..._features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml
@@ -3,6 +3,6 @@ package: Lightning
 core: 8.x
 type: module
 description: 'Provides a content type which allows you to build free-form one-off landing pages.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_layout
diff --git a/modules/lightning_features/lightning_media/lightning_media.info.yml b/modules/lightning_features/lightning_media/lightning_media.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Media'
 core: 8.x
 type: module
 description: 'Slick media handling for Lightning. So cool you''ll make the A/C jealous.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - ckeditor

diff --git a/.../lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml b/.../lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml
@@ -2,7 +2,7 @@ name: 'Bulk Media Upload'
 core: 8.x
 type: module
 description: 'Provides a form to upload many media items at once.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - dropzonejs

diff --git a/...atures/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml b/...atures/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml
@@ -2,7 +2,7 @@ name: 'Media Document'
 core: 8.x
 type: module
 description: 'Locally hosted document support for Lightning Media.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - lightning_media
diff --git a/...ing_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml b/...ing_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml
@@ -3,6 +3,6 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Image support for Lightning Media.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_media
diff --git a/...ures/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml b/...ures/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml
@@ -2,7 +2,7 @@ name: 'Media Instagram'
 core: 8.x
 type: module
 description: 'Instagram support for Lightning Media.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - lightning_media

diff --git a/...features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml b/...features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Twitter support for Lightning Media.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_media
   - media_entity_twitter
diff --git a/...ing_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml b/...ing_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Video support for Lightning Media.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 dependencies:
   - lightning_media
   - video_embed_media
diff --git a/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml b/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Workflow'
 core: 8.x
 type: module
 description: 'Tools to improve your content workflow.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - lightning_core

diff --git a/...ghtning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml b/...ghtning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml
@@ -2,7 +2,7 @@ name: 'Schedule Publication'
 core: 8.x
 type: module
 description: 'Allows authors to schedule publication of content.'
-version: '8.x-2.21'
+version: '8.x-2.22'
 package: Lightning
 dependencies:
   - inline_entity_form

diff --git a/tests/config/entity_browser.browser.image_browser.yml b/tests/config/entity_browser.browser.image_browser.yml
@@ -29,13 +29,13 @@ widgets:
     weight: -9
     label: Upload
     id: file_upload
-  3e6ad6ad-dc0e-48d5-b315-8833c962dcbe:
+  19823154-665a-44b3-b6de-1936a7db9741:
     settings:
       view: media
       view_display: entity_browser_2
       submit_text: Select
       auto_select: false
-    uuid: 3e6ad6ad-dc0e-48d5-b315-8833c962dcbe
+    uuid: 19823154-665a-44b3-b6de-1936a7db9741
     weight: -10
     label: Library
     id: view
diff --git a/tests/config/entity_browser.browser.media_browser.yml b/tests/config/entity_browser.browser.media_browser.yml
@@ -37,13 +37,13 @@ widgets:
     weight: -9
     label: Upload
     id: file_upload
-  5537d437-1c08-4de8-b450-f42027f59440:
+  7bda526b-e407-46e6-8a0c-298a9dedd52e:
     settings:
       view: media
       view_display: entity_browser_1
       submit_text: Place
       auto_select: false
-    uuid: 5537d437-1c08-4de8-b450-f42027f59440
+    uuid: 7bda526b-e407-46e6-8a0c-298a9dedd52e
     weight: -10
     label: Library
     id: view
diff --git a/tests/config/system.site.yml b/tests/config/system.site.yml
@@ -1,5 +1,5 @@
-name: 'Drush Site-Install'
-mail: admin@example.com
+name: 'Drupal 8'
+mail: admin@example.org
 slogan: ''
 page:
   403: ''

diff --git a/tests/config/update.settings.yml b/tests/config/update.settings.yml
@@ -7,6 +7,6 @@ fetch:
   timeout: 30
 notification:
   emails:
-    - admin@example.com
+    - admin@example.org
   threshold: all
 _core: {  }
diff --git a/tests/fixtures/2.1.7.sql.bz2 b/tests/fixtures/2.1.7.sql.bz2
diff --git a/tests/fixtures/2.2.2.sql.bz2 b/tests/fixtures/2.2.2.sql.bz2
diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
@@ -6,4 +6,4 @@ hidden: true
 dependencies:
   - lightning_media_image
   - lightning_page
-version: '8.x-2.21'
+version: '8.x-2.22'