From b978f632476ea8c6c7d4e69c149fe637297dbf88 Mon Sep 17 00:00:00 2001 From: SDP service account Date: Thu, 30 May 2019 13:01:16 +1000 Subject: [PATCH 1/6] Remove not required patch to cweagans/composer-patches --- composer.dev.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index 8066d71..6f75c0f 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -248,9 +248,6 @@ "patches": { "behat/gherkin": { "Correctly filter features, now that the base path is correctly set - https://github.com/Behat/Gherkin/pull/129": "https://patch-diff.githubusercontent.com/raw/Behat/Gherkin/pull/129.patch" - }, - "cweagans/composer-patches": { - "Fix for already applied patches - specific to 1.6.5": "patches/composer-patches/fix-applied-patches.patch" } } } From 9e7c73c311c24f459127cb3c6a6d3690cd4439cf Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Fri, 31 May 2019 07:13:01 +1000 Subject: [PATCH 2/6] [SDPA-2253] Bumped version constraints. --- composer.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d14aaa9..d43944b 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,16 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "dpc-sdp/tide_core": "1.2.0" + "dpc-sdp/tide_core": "1.2.1" }, "suggest": { - "dpc-sdp/tide_media:1.2.1": "Media and related configuration for Tide Drupal 8 distribution" + "dpc-sdp/tide_media:1.2.2": "Media and related configuration for Tide Drupal 8 distribution" + }, + "extra": { + "patches": { + "dpc-sdp/tide_core": { + "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" + } + } } } From 1826468eba439b7ad7669e7225917b8d7af146f2 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Fri, 31 May 2019 09:04:25 +1000 Subject: [PATCH 3/6] [SDPA-2253] Updated patching. --- composer.dev.json | 3 +++ composer.json | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index 6f75c0f..d3e32c8 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -248,6 +248,9 @@ "patches": { "behat/gherkin": { "Correctly filter features, now that the base path is correctly set - https://github.com/Behat/Gherkin/pull/129": "https://patch-diff.githubusercontent.com/raw/Behat/Gherkin/pull/129.patch" + }, + "dpc-sdp/tide_core": { + "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" } } } diff --git a/composer.json b/composer.json index d43944b..a43399e 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,5 @@ }, "suggest": { "dpc-sdp/tide_media:1.2.2": "Media and related configuration for Tide Drupal 8 distribution" - }, - "extra": { - "patches": { - "dpc-sdp/tide_core": { - "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" - } - } } } From aa4d763d171c4c79a26e41692d5c79a185fd2b9d Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Fri, 31 May 2019 12:06:38 +1000 Subject: [PATCH 4/6] Revert "[SDPA-2253] Updated patching." This reverts commit 1826468eba439b7ad7669e7225917b8d7af146f2. --- composer.dev.json | 3 --- composer.json | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index d3e32c8..6f75c0f 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -248,9 +248,6 @@ "patches": { "behat/gherkin": { "Correctly filter features, now that the base path is correctly set - https://github.com/Behat/Gherkin/pull/129": "https://patch-diff.githubusercontent.com/raw/Behat/Gherkin/pull/129.patch" - }, - "dpc-sdp/tide_core": { - "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" } } } diff --git a/composer.json b/composer.json index a43399e..d43944b 100644 --- a/composer.json +++ b/composer.json @@ -8,5 +8,12 @@ }, "suggest": { "dpc-sdp/tide_media:1.2.2": "Media and related configuration for Tide Drupal 8 distribution" + }, + "extra": { + "patches": { + "dpc-sdp/tide_core": { + "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" + } + } } } From 189926f63031b6e440e8849d49f5e53232fd4f1b Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Fri, 31 May 2019 12:08:31 +1000 Subject: [PATCH 5/6] [SDPA-2253] Updated patching. --- composer.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/composer.json b/composer.json index d43944b..af5026d 100644 --- a/composer.json +++ b/composer.json @@ -4,16 +4,9 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "dpc-sdp/tide_core": "1.2.1" + "dpc-sdp/tide_core": "dev-feature/SDPA-2523_redo_SDPA-309 as 1.2.1" }, "suggest": { "dpc-sdp/tide_media:1.2.2": "Media and related configuration for Tide Drupal 8 distribution" - }, - "extra": { - "patches": { - "dpc-sdp/tide_core": { - "[SDPA-2523] All existing content should default to 'Copyright' licence type - https://github.com/dpc-sdp/tide_core/pull/68": "https://patch-diff.githubusercontent.com/raw/dpc-sdp/tide_core/pull/68.patch" - } - } } } From 82413fe77348a567af8dbed1a7fb930fa3193c19 Mon Sep 17 00:00:00 2001 From: Anthony Malkoun Date: Mon, 3 Jun 2019 12:20:50 +1000 Subject: [PATCH 6/6] Bump versions to release versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index af5026d..ea0d142 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "dpc-sdp/tide_core": "dev-feature/SDPA-2523_redo_SDPA-309 as 1.2.1" + "dpc-sdp/tide_core": "1.2.2" }, "suggest": { - "dpc-sdp/tide_media:1.2.2": "Media and related configuration for Tide Drupal 8 distribution" + "dpc-sdp/tide_media:1.2.3": "Media and related configuration for Tide Drupal 8 distribution" } }