From 46f85bf0326ad4eeb89ebe078435e89f7bc0cc29 Mon Sep 17 00:00:00 2001 From: rosie Le Faive Date: Thu, 29 Aug 2024 05:45:05 -0300 Subject: [PATCH 1/2] Use drupal namespace instead of islandora. --- .github/workflows/build-2.x.yml | 2 +- README.md | 4 ++-- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index ebd2473..6143dec 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -95,7 +95,7 @@ jobs: cd $DRUPAL_DIR composer config repositories.local path "$GITHUB_WORKSPACE/build_dir" composer config minimum-stability dev - composer require "islandora/controlled_access_terms:dev-github-testing as dev-2.x" + composer require "drupal/controlled_access_terms:dev-github-testing as dev-2.x" - name: Install modules run: | diff --git a/README.md b/README.md index d29b9f3..e2aee91 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Download and install [as with other Drupal modules](https://www.drupal.org/docs/ For example, using composer from the Drupal site's web directory: ``` -$ composer require islandora/controlled_access_terms +$ composer require drupal/controlled_access_terms $ drush en -y controlled_access_terms ``` @@ -120,7 +120,7 @@ displayed. The default setting is YYYY-MM-DD (e.g. 1900-01-31) but settings can change, for example, the separator and the date order to display dates in 'mm/dd/yyyy' format (e.g. 01/31/1900). -[1]: https://github.com/islandora/controlled_access_terms/actions/workflows/build-2.x.yml/badge.svg +[1]: https://github.com/Islandora/controlled_access_terms/actions/workflows/build-2.x.yml/badge.svg [2]: http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg [3]: https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square diff --git a/composer.json b/composer.json index bdd0a6a..825ac68 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "islandora/controlled_access_terms", + "name": "drupal/controlled_access_terms", "description": "Drupal module for subjects and agents", "type": "drupal-module", "keywords": ["Drupal", "Islandora"], From 59edea69e908e57d1400d7c9aefb9833fe57520a Mon Sep 17 00:00:00 2001 From: rosie Le Faive Date: Thu, 29 Aug 2024 07:20:23 -0300 Subject: [PATCH 2/2] include composer replace for old namespace. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 825ac68..6b75078 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,9 @@ "url": "https://packages.drupal.org/8" } ], + "replace": { + "islandora/controlled_access_terms": "self.version" + }, "require": { "drupal/geolocation": "^3.2", "drupal/token": "^1.7",