From 244d89e2f33e8e51f39be97f698ce5833df83a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 12:48:05 +0000 Subject: [PATCH 1/3] Bump braces from 3.0.2 to 3.0.3 in /Build Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Build/package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Build/package-lock.json b/Build/package-lock.json index c185a285c..80ea6692c 100644 --- a/Build/package-lock.json +++ b/Build/package-lock.json @@ -169,12 +169,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -383,9 +383,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1849,12 +1849,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "buffer-from": { @@ -2020,9 +2020,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" From 2f0868b6c3a58caee6144a7c06def98853222847 Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Mon, 27 May 2024 15:58:43 +0200 Subject: [PATCH 2/3] Update version numbers for version 6.1 --- composer.json | 4 ++-- ext_emconf.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 1fb4282bb..91e7fa618 100644 --- a/composer.json +++ b/composer.json @@ -37,8 +37,8 @@ ], "license": "GPL-3.0-or-later", "require": { - "typo3/cms-core": "^10.4.36|^11.5", - "kitodo/presentation": "^4.1|dev-master", + "typo3/cms-core": "^10.4.37|^11.5.37", + "kitodo/presentation": "^5.0|dev-master", "slub/slub-digitalcollections": "^3.0|dev-master" }, "autoload": { diff --git a/ext_emconf.php b/ext_emconf.php index eb07be5bc..1c95484d3 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -26,7 +26,7 @@ 'title' => 'DFG Viewer', 'description' => 'Remote resources navigator for digital libraries. Reads METS/MODS and METS/TEI via OAI-PMH.', 'category' => 'distribution', - 'author' => 'Sebastian Meyer', + 'author' => 'Beatrycze Volk', 'author_email' => 'typo3@slub-dresden.de', 'author_company' => 'Saxon State and University Library Dresden (SLUB)', 'shy' => '', @@ -39,11 +39,11 @@ 'modify_tables' => '', 'clearCacheOnLoad' => false, 'lockType' => '', - 'version' => '6.0.0', + 'version' => '6.1.0', 'constraints' => [ 'depends' => [ 'typo3' => '10.4.0-11.3.99', - 'dlf' => '4.0.1-', + 'dlf' => '5.0.0-', ], 'conflicts' => [ ], From 78c23a7f2cf22ee2682ddab73d8f217e5f2e16fb Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Mon, 27 May 2024 18:01:52 +0200 Subject: [PATCH 3/3] Update and order authors in composer alphabetically Correct list of code contributors according to the Contributors tab of repository --- composer.json | 132 ++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 68 deletions(-) diff --git a/composer.json b/composer.json index 91e7fa618..01ec5ce31 100644 --- a/composer.json +++ b/composer.json @@ -1,74 +1,70 @@ { - "name": "slub/dfgviewer", - "type": "typo3-cms-extension", - "description": "Remote resources navigator for digital libraries. Reads METS/MODS and METS/TEI via OAI-PMH.", - "homepage": "https://github.com/slub/dfg-viewer", - "keywords": [ - "TYPO3", - "extension", - "dfgviewer" - ], - "authors": [ - { - "name": "Sebastian Meyer", - "email": "sebastian.meyer@slub-dresden.de", - "role": "Developer" + "name": "slub/dfgviewer", + "type": "typo3-cms-extension", + "description": "Remote resources navigator for digital libraries. Reads METS/MODS and METS/TEI via OAI-PMH.", + "homepage": "https://github.com/slub/dfg-viewer", + "keywords": [ + "TYPO3", + "extension", + "dfgviewer" + ], + "authors": [ + { + "name": "Alexander Bigga", + "email": "typo3@slub-dresden.de", + "role": "Developer" + }, + { + "name": "Christos Sidiropoulos", + "email": "typo3@slub-dresden.de", + "role": "Developer" + }, + { + "name": "Thomas Jung", + "email": "thomas.jung@slub-dresden.de", + "role": "Developer" + }, + { + "name": "Sebastian Meyer", + "email": "sebastian.meyer@slub-dresden.de", + "role": "Developer" + }, + { + "name": "Markus Weigelt", + "email": "markus.weigelt@slub-dresden.de", + "role": "Developer" + }, + { + "name": "Beatrycze Volk", + "email": "beatrycze.volk@slub-dresden.de", + "role": "Developer" + } + ], + "license": "GPL-3.0-or-later", + "require": { + "typo3/cms-core": "^10.4|^11.5", + "kitodo/presentation": "^5.0|dev-master", + "slub/slub-digitalcollections": "^3.0|dev-master" }, - { - "name": "Alexander Bigga", - "email": "typo3@slub-dresden.de", - "role": "Developer" + "autoload": { + "psr-4": { + "Slub\\Dfgviewer\\": "Classes/" + } }, - { - "name": "Thomas Jung", - "email": "thomas.jung@slub-dresden.de", - "role": "Developer" + "extra": { + "typo3/cms": { + "extension-key": "dfgviewer" + } }, - { - "name": "Beatrycze Volk", - "email": "beatrycze.volk@slub-dresden.de", - "role": "Developer" + "scripts": { + "docs:setup": "./Build/Documentation/sphinx.sh install", + "docs:serve": "./Build/Documentation/sphinx.sh serve", + "docs:t3": "docker-compose -f ./Build/Documentation/docker-compose.t3docs.yml run --rm t3docs" }, - { - "name": "Erik Konrad", - "email": "typo3@slub-dresden.de", - "role": "Developer" - } - ], - "license": "GPL-3.0-or-later", - "require": { - "typo3/cms-core": "^10.4.37|^11.5.37", - "kitodo/presentation": "^5.0|dev-master", - "slub/slub-digitalcollections": "^3.0|dev-master" - }, - "autoload": { - "psr-4": { - "Slub\\Dfgviewer\\": "Classes/" - } - }, - "extra": { - "typo3/cms": { - "extension-key": "dfgviewer" - } - }, - "scripts": { - "docs:build": [ - "rm -Rf ./Documentation-GENERATED-temp", - "docker run --user=$(id -u):$(id -g) --rm -v ./:/project -it ghcr.io/typo3-documentation/render-guides:latest --config ./Documentation", - "cp ./Build/Documentation/index.html ./Documentation-GENERATED-temp" - ], - "docs:start": "docker run -d --name dfgviewer_docs --rm -v ./Documentation-GENERATED-temp:/serve -p 8000:8000 jdkelley/simple-http-server:latest", - "docs:stop": "docker stop dfgviewer_docs", - "docs:rebuild": [ - "@composer docs:stop", - "@composer docs:build", - "@composer docs:start" - ] - }, - "config": { - "allow-plugins": { - "typo3/class-alias-loader": true, - "typo3/cms-composer-installers": true + "config": { + "allow-plugins": { + "typo3/class-alias-loader": true, + "typo3/cms-composer-installers": true + } } - } -} +} \ No newline at end of file