3.2.2 Release (#614)

acquia · Oct 18, 2018 · 0dc7bfb · 0dc7bfb
1 parent fc65802
commit 0dc7bfb
Show file tree

Hide file tree

Showing 13 changed files with 222 additions and 175 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ php:
   - 7.0
 env:
   - VERSION=HEAD
-  - VERSION=3.2.1
+  - VERSION=3.2.2
   # The final CI slot should be used to test the update path from the oldest
   # available database fixture.
   - VERSION=3.0.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.2.2
+* Updated Lightning Core to 3.2, which security updates Drupal core
+  to 8.6.2.
+
 ## 3.2.1
 * Updated Lightning Media to 3.1.
 * Updated Lightning Workflow to 3.1.

diff --git a/UPDATE.md b/UPDATE.md
@@ -170,6 +170,9 @@ are currently running 2.2.0 and are trying to update to 2.2.6, you will need to
 follow the instructions for updating from 2.2.0 to 2.2.1, then from 2.2.1 to
 2.2.2, in that order.
 
+### 3.2.1 to 3.2.2
+There are no manual update steps for this version.
+
 ### 3.2.0 to 3.2.1
 * Install the Media Library module (in the "Core (Experimental)" group). Then,
   for each media type, create a new display, called "Media library", containing

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-3.x
-projects[lightning][download][tag] = 8.x-3.x-dev
+projects[lightning][download][tag] = 8.x-3.202
diff --git a/composer.json b/composer.json
@@ -87,11 +87,11 @@
     },
     "require": {
         "cweagans/composer-patches": "^1.6.4",
-        "drupal/lightning_api": "2.x-dev",
-        "drupal/lightning_core": "3.x-dev",
-        "drupal/lightning_layout": "1.x-dev",
-        "drupal/lightning_media": "3.x-dev",
-        "drupal/lightning_workflow": "3.x-dev",
+        "drupal/lightning_api": "^2.7",
+        "drupal/lightning_core": "^3.2",
+        "drupal/lightning_layout": "^1.4",
+        "drupal/lightning_media": "^3.1",
+        "drupal/lightning_workflow": "^3.1",
         "drupal-composer/drupal-scaffold": "^2.0.0",
         "oomphinc/composer-installers-extender": "^1.1"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/drupal-org-core.make b/drupal-org-core.make
@@ -4,9 +4,10 @@ projects[drupal][type] = core
 projects[drupal][download][type] = git
 projects[drupal][download][url] = https://git.drupal.org/project/drupal.git
 projects[drupal][download][branch] = 8.6.x
+projects[drupal][download][tag] = 8.6.2
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2885441-2.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-09-24/2815221-109.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-17/2815221-reroll-8.6.1.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-05/1356276-515.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2246725-24.patch
diff --git a/drupal-org.make b/drupal-org.make
@@ -24,7 +24,7 @@ projects[entity_block][version] = 1.0-beta1
 projects[entity_browser][type] = module
 projects[entity_browser][patch][] = https://www.drupal.org/files/issues/entity-browser-view-context-2865928-14.patch
 projects[entity_browser][patch][] = https://www.drupal.org/files/issues/2877751-27-8.x-2.x.patch
-projects[entity_browser][version] = 2.0
+projects[entity_browser][version] = 2.0-alpha2
 projects[entity_embed][type] = module
 projects[entity_embed][patch][] = https://www.drupal.org/files/issues/2832504-2.patch
 projects[entity_embed][version] = 1.0-beta2
@@ -37,30 +37,15 @@ projects[jsonapi][version] = 1.23
 projects[libraries][type] = module
 projects[libraries][version] = 3.0-alpha1
 projects[lightning_api][type] = module
-projects[lightning_api][download][type] = git
-projects[lightning_api][download][url] = https://git.drupal.org/project/lightning_api
-projects[lightning_api][download][branch] = 2.x
-projects[lightning_api][download][revision] = 953d5d4389514940cd90e36a43b4a5bf06e1e00d
+projects[lightning_api][version] = 2.7
 projects[lightning_core][type] = module
-projects[lightning_core][download][type] = git
-projects[lightning_core][download][url] = https://git.drupal.org/project/lightning_core
-projects[lightning_core][download][branch] = 3.x
-projects[lightning_core][download][revision] = ff6a153b1c946b1ab878edbbcda52be24d2d8c20
+projects[lightning_core][version] = 3.2
 projects[lightning_layout][type] = module
-projects[lightning_layout][download][type] = git
-projects[lightning_layout][download][url] = https://git.drupal.org/project/lightning_layout
-projects[lightning_layout][download][branch] = 1.x
-projects[lightning_layout][download][revision] = 3317411b5d4e1ace1a17cbd63d6b92ec46f5c66e
+projects[lightning_layout][version] = 1.4
 projects[lightning_media][type] = module
-projects[lightning_media][download][type] = git
-projects[lightning_media][download][url] = https://git.drupal.org/project/lightning_media
-projects[lightning_media][download][branch] = 3.x
-projects[lightning_media][download][revision] = 7859ab2cc8733fb8586cf757705c27a90c7765d6
+projects[lightning_media][version] = 3.1
 projects[lightning_workflow][type] = module
-projects[lightning_workflow][download][type] = git
-projects[lightning_workflow][download][url] = https://git.drupal.org/project/lightning_workflow
-projects[lightning_workflow][download][branch] = 3.x
-projects[lightning_workflow][download][revision] = ce7d3fe10c583221afec1336929bf46dbd758799
+projects[lightning_workflow][version] = 3.1
 projects[media_entity_instagram][type] = module
 projects[media_entity_instagram][patch][] = https://www.drupal.org/files/issues/2917454-2.patch
 projects[media_entity_instagram][version] = 2.0-alpha1

diff --git a/lightning.info.yml b/lightning.info.yml
@@ -2,9 +2,7 @@ name: Lightning
 core: 8.x
 type: profile
 description: 'A fast and feature-rich Drupal distribution.'
-version: '8.x-3.x-dev'
-# distribution:
-#   name: Lightning
+version: '8.x-3.202'
 install:
   - block_content
   - breakpoint
@@ -64,4 +62,4 @@ themes:
   - bartik
   - seven
 project: lightning
-datestamp: '1539112129'
+datestamp: '1539819269'
diff --git a/modules/lightning_install/lightning_install.info.yml b/modules/lightning_install/lightning_install.info.yml
@@ -3,4 +3,5 @@ core: 8.x
 type: module
 hidden: true
 package: Lightning
-description: Provides helpful under-the-hood functionality used while installing Lightning.
+description: 'Provides helpful under-the-hood functionality used while installing Lightning.'
+version: '8.x-3.202'
diff --git a/tests/fixtures/3.2.2.sql.gz b/tests/fixtures/3.2.2.sql.gz
diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
@@ -4,4 +4,4 @@ type: module
 hidden: true
 dependencies:
   - test_ced013a5
-version: '8.x-3.x-dev'
+version: '8.x-3.202'
diff --git a/tests/modules/view_mode_test/view_mode_test.info.yml b/tests/modules/view_mode_test/view_mode_test.info.yml
@@ -5,4 +5,4 @@ hidden: true
 dependencies:
   - lightning_core
   - node
-version: '8.x-3.x-dev'
+version: '8.x-3.202'