Merge branch 'master' into Full-text-features-main

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.36|^11.5",
-    "kitodo/presentation": "^4.1|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
+        }
     }
-  }
-}
+}

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' => [
         ],