From 3053136fe9d5077051142d1b8bb8a961384d50c7 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 16 May 2024 11:54:00 -0300
Subject: [PATCH 1/3] Prefer drupal namespace in Composer.
---
composer.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/composer.json b/composer.json
index cb95bbc6..1cb354f2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
{
- "name": "islandora/islandora",
+ "name": "drupal/islandora",
"description": "Core Islandora module",
"type": "drupal-module",
"keywords": ["Drupal", "Islandora"],
@@ -7,6 +7,9 @@
"support": {
"issues": "https://github.com/Islandora/documentation/issues"
},
+ "replace": {
+ "islandora/islandora": "*"
+ },
"repositories": [
{
"type": "composer",
@@ -20,6 +23,7 @@
"drupal/file_replace": "^1.1",
"drupal/filehash": "^2",
"drupal/flysystem" : "^2.0@alpha",
+ "drupal/jsonld": "^2 || ^3",
"drupal/jwt": "^1.1 || ^2",
"drupal/migrate_plus" : "^5.1 || ^6",
"drupal/migrate_source_csv" : "^3.4",
@@ -28,7 +32,6 @@
"drupal/token" : "^1.3",
"islandora/chullo": "^2.0",
"islandora/fedora-entity-mapper": "^1.0",
- "islandora/jsonld": "^2 || ^3",
"stomp-php/stomp-php": "4.* || ^5"
},
"require-dev": {
From 01565d81e653bc531eb40436736f2cfeb67122be Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 16 May 2024 12:37:22 -0300
Subject: [PATCH 2/3] Update ci to use drupal namespace.
---
.github/workflows/build-2.x.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index c5d9d66b..b2adc3a0 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -106,7 +106,7 @@ jobs:
cd $DRUPAL_DIR
composer config repositories.local path "$GITHUB_WORKSPACE/build_dir"
composer config minimum-stability dev
- composer require "islandora/islandora:dev-github-testing as dev-2.x"
+ composer require "drupal/islandora:dev-github-testing as dev-2.x"
- name: Install modules
run: |
From 21ae87cab8c05ee3304858de8019179c9854026f Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 27 May 2024 10:47:54 -0300
Subject: [PATCH 3/3] Update composer.json
Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com>
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 1cb354f2..fc757ac9 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"issues": "https://github.com/Islandora/documentation/issues"
},
"replace": {
- "islandora/islandora": "*"
+ "islandora/islandora": "self.version"
},
"repositories": [
{