From 11d19cb6c966fcd493760b8a381e52b3141e8f99 Mon Sep 17 00:00:00 2001
From: Thomas Scheffler <github@yagee.de>
Date: Fri, 8 Nov 2024 15:14:27 +0100
Subject: [PATCH] DBT-376 further fixes

---
 .github/workflows/ci.yml                             |  2 +-
 LICENSE.txt                                          |  8 ++++----
 pom.xml                                              |  2 +-
 .../META-INF/resources/config/navigation.xml         | 12 ++++++------
 .../META-INF/resources/editor/editor-dbt.xed         |  1 +
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e82f778b..68be4353 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       ff-site-goal: ''
       ff-os: 'ubuntu-24.04'
-      ff-jdk: '21'
+      ff-jdk: '17'
       ff-goal: '-P run-its verify'
       ff-site-run: false
       failure-upload-path: |
diff --git a/LICENSE.txt b/LICENSE.txt
index 94a9ed02..f288702d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/pom.xml b/pom.xml
index 5fe6c5f1..f1272a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
   </scm>
   <properties>
     <grunt.projectBase>${project.build.directory}/grunt</grunt.projectBase>
-    <java.target.version>21</java.target.version>
+    <java.target.version>17</java.target.version>
     <lesscss.compress>true</lesscss.compress>
     <maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
     <maven.compiler.release>${java.target.version}</maven.compiler.release>
diff --git a/src/main/resources/META-INF/resources/config/navigation.xml b/src/main/resources/META-INF/resources/config/navigation.xml
index 0880863d..21075c72 100644
--- a/src/main/resources/META-INF/resources/config/navigation.xml
+++ b/src/main/resources/META-INF/resources/config/navigation.xml
@@ -106,17 +106,17 @@
     <label xml:lang="de">Publizieren</label>
     <label xml:lang="en">Publish</label>
     <icon>fas fa-upload mr-1 d-none d-sm-inline-block d-lg-none</icon>
-    <item href="/servlets/MCRActionMappingServlet/mods/create" type="intern">
-      <label xml:lang="de">Dokumente einreichen</label>
-      <label xml:lang="en">Submit Document</label>
+    <item href="/content/publish/index.xml" type="intern" replaceMenu="false" constrainPopUp="false">
+      <label xml:lang="de">Publizieren</label>
+      <label xml:lang="en">Publish</label>
     </item>
     <item href="/servlets/solr/select?q=createdby:{CurrentUser}&amp;fq=objectType:mods" type="intern" replaceMenu="false" constrainPopUp="false">
       <label xml:lang="de">Meine Einreichungen</label>
       <label xml:lang="en">My submissions</label>
     </item>
-    <item href="/content/publish/importPPN.xml" type="intern">
-      <label xml:lang="de">PPN Import</label>
-      <label xml:lang="en">PPN Import</label>
+    <item href="/editor/editor-admins.xed" type="intern" replaceMenu="false" constrainPopUp="false">
+      <label xml:lang="de">Publizieren (Admin)</label>
+      <label xml:lang="en">Publish (admin)</label>
     </item>
     <item href="/content/publish/guidelines.xml" type="intern">
       <label xml:lang="de">Leitlinien</label>
diff --git a/src/main/resources/META-INF/resources/editor/editor-dbt.xed b/src/main/resources/META-INF/resources/editor/editor-dbt.xed
index c26a5212..35ae648d 100644
--- a/src/main/resources/META-INF/resources/editor/editor-dbt.xed
+++ b/src/main/resources/META-INF/resources/editor/editor-dbt.xed
@@ -102,6 +102,7 @@
     <xed:include ref="oai" after="institutes" />
     <xed:include ref="itunes-podcast" after="genre" />
     <xed:include ref="institutes.repeat" after="institutes" />
+    <xed:remove ref="related.item.other.search.of.all.items" />
     <xed:remove ref="institutes" />
   </xed:modify>
   <xed:modify ref="genres.book.common">