Merge pull request 'release_24.04.9' (!319) from release_24.04.9 into…

… master

Reviewed-on: https://gitea.intranda.com/goobi-workflow/goobi-workflow-core/pulls/319

Jenkinsfile

@@ -27,6 +27,7 @@ pipeline {
           anyOf {
             branch 'master'
             branch 'release_*'
+            branch 'hotfix_release_*'
             allOf {
               branch 'PR-*'
               expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -43,6 +44,7 @@ pipeline {
         anyOf {
           branch 'master'
           branch 'release_*'
+          branch 'hotfix_release_*'
           allOf {
             branch 'PR-*'
             expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -58,6 +60,7 @@ pipeline {
         anyOf {
           branch 'master'
           branch 'release_*'
+          branch 'hotfix_release_*'
           branch 'sonar_*'
           allOf {
             branch 'PR-*'
@@ -71,19 +74,25 @@ pipeline {
         }
       }
     }
-    stage('deployment to maven repository') {
+    stage('deploy') {
       when {
         anyOf {
         branch 'master'
         branch 'develop'
+        branch 'hotfix_release_*'
         }
       }
       steps {
         sh 'mvn -DskipTests=true -Dcheckstyle.skip=true -Dmdep.analyze.skip=true deploy -U'
       }
     }
     stage('tag release') {
-      when { branch 'master' }
+      when { 
+        anyOf {
+          branch 'master'
+          branch 'hotfix_release_*'
+        }
+      }
       steps {
         withCredentials([gitUsernamePassword(credentialsId: '93f7e7d3-8f74-4744-a785-518fc4d55314',
                  gitToolName: 'git-tool')]) {
@@ -118,7 +127,6 @@ pipeline {
         enabledForFailure: true, aggregatingResults: false,
         tools: [checkStyle(pattern: 'target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
       )
-      dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
     }
     success {
       archiveArtifacts artifacts: 'target/*.war, target/*.jar, install/db/goobi.sql', fingerprint: true

git-hooks/post-merge

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 path=src/main/webapp/
 cssPath="/uii/templatePG/css/"
-declare -a sources=("${path}/uii/templatePG/css/src/" "${path}/uii/templatePG/css/lib/" "${path}/uii/templatePG/js/")
+declare -a sources=("${path}uii/templatePG/css/src/" "${path}uii/templatePG/css/lib/" "${path}uii/templatePG/js/")
 
 runBuild() {
     checkModules

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.goobi.workflow</groupId>
         <artifactId>workflow-base</artifactId>
-        <version>24.04.2</version>
+        <version>24.04.9</version>
         <relativePath/>
     </parent>
     <artifactId>workflow-core</artifactId>

src/main/resources/messages_de.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=Pr\u00E4fix
 plugin_administration_archive_process=Goobi-Vorgang
 plugin_administration_archive_process_create_process=Goobi-Vorgang anlegen
 plugin_administration_archive_process_no_process=- bisher kein Goobi-Vorgang zugeordnet -
+plugin_administration_archive_recordGroupExists=Es existiert bereits ein Bestand mit diesem Namen.
 plugin_administration_archive_recordid=Record ID
 plugin_administration_archive_removeInvalidProcessIds=Verweise zu Vorg\u00E4ngen aktualisieren
 plugin_administration_archive_role=Rolle
@@ -2859,14 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Zweiw\u00F6chentlich
 plugin_newspaperRecognizer_date=Datum
 plugin_newspaperRecognizer_deleteManualResults=Manuelle Ergebnisse l\u00F6schen
 plugin_newspaperRecognizer_friday=Freitag
-plugin_newspaperRecognizer_issue-type_from_date={0} vom {1}
-plugin_newspaperRecognizer_issue-type_Ausgabe=Ausgabe
-plugin_newspaperRecognizer_issue-type_Morgenausgabe=Morgenausgabe
 plugin_newspaperRecognizer_issue-type_Abendausgabe=Abendausgabe
+plugin_newspaperRecognizer_issue-type_Ausgabe=Ausgabe
 plugin_newspaperRecognizer_issue-type_Beilage=Beilage
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=Einband und Profil
 plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=Inhaltsverzeichnis
 plugin_newspaperRecognizer_issue-type_Leading-page=Leading page
-plugin_newspaperRecognizer_issue-type_Einband-und-Profil=Einband und Profil
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=Morgenausgabe
+plugin_newspaperRecognizer_issue-type_from_date={0} vom {1}
 plugin_newspaperRecognizer_loadingImages=Bilder werden geladen
 plugin_newspaperRecognizer_monday=Montag
 plugin_newspaperRecognizer_nro=Nr.

src/main/resources/messages_en.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=Prefixzzz
 plugin_administration_archive_process=Goobi process
 plugin_administration_archive_process_create_process=Create Goobi process
 plugin_administration_archive_process_no_process=- No Goobi process assigned so far -
+plugin_administration_archive_recordGroupExists=A record group with this name already exists.zzz
 plugin_administration_archive_recordid=Record ID
 plugin_administration_archive_removeInvalidProcessIds=Update references to processeszzz
 plugin_administration_archive_role=Role
@@ -2859,14 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday
-plugin_newspaperRecognizer_issue-type_from_date={0} from {1}
-plugin_newspaperRecognizer_issue-type_Ausgabe=Issue
-plugin_newspaperRecognizer_issue-type_Morgenausgabe=Morning issue
 plugin_newspaperRecognizer_issue-type_Abendausgabe=Evening issue
+plugin_newspaperRecognizer_issue-type_Ausgabe=Issue
 plugin_newspaperRecognizer_issue-type_Beilage=Insert
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=Binding and profile
 plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=Table of Contents
 plugin_newspaperRecognizer_issue-type_Leading-page=Leading page
-plugin_newspaperRecognizer_issue-type_Einband-und-Profil=Binding and profile
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=Morning issue
+plugin_newspaperRecognizer_issue-type_from_date={0} from {1}
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday
 plugin_newspaperRecognizer_nro=No. zzz

src/main/resources/messages_es.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=zzz
 plugin_administration_archive_process=Operaci\u00F3n Goobi zzz
 plugin_administration_archive_process_create_process=Crear la operaci\u00F3n Goobi zzz
 plugin_administration_archive_process_no_process=- Ning\u00FAn proceso de Goobi asignado hasta ahora - zzz
+plugin_administration_archive_recordGroupExists=zzz
 plugin_administration_archive_recordid=ID de registro zzz
 plugin_administration_archive_removeInvalidProcessIds=zzz
 plugin_administration_archive_role=Rollo zzz
@@ -2859,6 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday zzz
+plugin_newspaperRecognizer_issue-type_Abendausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Ausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Beilage=zzz
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=zzz
+plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=zzz
+plugin_newspaperRecognizer_issue-type_Leading-page=zzz
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=zzz
+plugin_newspaperRecognizer_issue-type_from_date=zzz
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday zzz
 plugin_newspaperRecognizer_nro=No. zzz

src/main/resources/messages_fr.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=zzz
 plugin_administration_archive_process=Op\u00E9ration Goobi zzz
 plugin_administration_archive_process_create_process=Cr\u00E9er une op\u00E9ration Goobi zzz
 plugin_administration_archive_process_no_process=- Aucun processus Goobi attribu\u00E9 jusqu'\u00E0 pr\u00E9sent - zzz
+plugin_administration_archive_recordGroupExists=zzz
 plugin_administration_archive_recordid=ID de l'enregistrement zzz
 plugin_administration_archive_removeInvalidProcessIds=zzz
 plugin_administration_archive_role=Rouleau zzz
@@ -2859,6 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday zzz
+plugin_newspaperRecognizer_issue-type_Abendausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Ausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Beilage=zzz
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=zzz
+plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=zzz
+plugin_newspaperRecognizer_issue-type_Leading-page=zzz
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=zzz
+plugin_newspaperRecognizer_issue-type_from_date=zzz
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday zzz
 plugin_newspaperRecognizer_nro=No. zzz

src/main/resources/messages_it.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=zzz
 plugin_administration_archive_process=Operazione Goobi zzz
 plugin_administration_archive_process_create_process=Creare l'operazione Goobi zzz
 plugin_administration_archive_process_no_process=- Nessun processo Goobi assegnato finora - zzz
+plugin_administration_archive_recordGroupExists=zzz
 plugin_administration_archive_recordid=ID record zzz
 plugin_administration_archive_removeInvalidProcessIds=zzz
 plugin_administration_archive_role=Rotolo zzz
@@ -2859,6 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday zzz
+plugin_newspaperRecognizer_issue-type_Abendausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Ausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Beilage=zzz
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=zzz
+plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=zzz
+plugin_newspaperRecognizer_issue-type_Leading-page=zzz
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=zzz
+plugin_newspaperRecognizer_issue-type_from_date=zzz
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday zzz
 plugin_newspaperRecognizer_nro=No. zzz

src/main/resources/messages_nl.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=zzz
 plugin_administration_archive_process=Goobi-operatie zzz
 plugin_administration_archive_process_create_process=Maak Goobi operatie zzz
 plugin_administration_archive_process_no_process=- Geen Goobi proces toegewezen tot nu toe - zzz
+plugin_administration_archive_recordGroupExists=zzz
 plugin_administration_archive_recordid=Record ID zzz
 plugin_administration_archive_removeInvalidProcessIds=zzz
 plugin_administration_archive_role=Roll zzz
@@ -2859,6 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday zzz
+plugin_newspaperRecognizer_issue-type_Abendausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Ausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Beilage=zzz
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=zzz
+plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=zzz
+plugin_newspaperRecognizer_issue-type_Leading-page=zzz
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=zzz
+plugin_newspaperRecognizer_issue-type_from_date=zzz
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday zzz
 plugin_newspaperRecognizer_nro=No. zzz

src/main/resources/messages_pt.properties

@@ -2351,6 +2351,7 @@ plugin_administration_archive_prefix=zzz
 plugin_administration_archive_process=Opera\u00E7\u00E3o Goobi zzz
 plugin_administration_archive_process_create_process=Create Goobi process zzz
 plugin_administration_archive_process_no_process=- Nenhum processo Goobi atribu\u00EDdo at\u00E9 agora - zzz
+plugin_administration_archive_recordGroupExists=zzz
 plugin_administration_archive_recordid=Identifica\u00E7\u00E3o do registo zzz
 plugin_administration_archive_removeInvalidProcessIds=zzz
 plugin_administration_archive_role=Rolo zzz
@@ -2859,6 +2860,14 @@ plugin_newspaperRecognizer_biWeekly=Bi-weekly zzz
 plugin_newspaperRecognizer_date=Date zzz
 plugin_newspaperRecognizer_deleteManualResults=Delete manual results zzz
 plugin_newspaperRecognizer_friday=Friday zzz
+plugin_newspaperRecognizer_issue-type_Abendausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Ausgabe=zzz
+plugin_newspaperRecognizer_issue-type_Beilage=zzz
+plugin_newspaperRecognizer_issue-type_Einband-und-Profil=zzz
+plugin_newspaperRecognizer_issue-type_Inhaltsverzeichnis=zzz
+plugin_newspaperRecognizer_issue-type_Leading-page=zzz
+plugin_newspaperRecognizer_issue-type_Morgenausgabe=zzz
+plugin_newspaperRecognizer_issue-type_from_date=zzz
 plugin_newspaperRecognizer_loadingImages=Loading images zzz
 plugin_newspaperRecognizer_monday=Monday zzz
 plugin_newspaperRecognizer_nro=No. zzz

src/main/webapp/uii/administration.xhtml

@@ -21,6 +21,8 @@
         or AdministrationForm.administrationPlugin.title eq 'b-plugin_kb_subprojects'
         or AdministrationForm.administrationPlugin.title eq 'c-plugin_kb_metadata-upload'
         or AdministrationForm.administrationPlugin.title eq 'd-plugin_kb_import-dashboard'
+        or AdministrationForm.administrationPlugin.title eq 'intranda_administration_showconfigfiles'
+        or AdministrationForm.administrationPlugin.title eq 'intranda_administration_copymasteranchor'
         ? '/uii/templatePG/templatePG.html' : '/uii/template/template.html'}"
 	xmlns:x="http://myfaces.apache.org/tomahawk"
 	xmlns:intranda="http://xmlns.jcp.org/jsf/composite/compositesPG"

src/main/webapp/uii/workflow.xhtml

@@ -16,6 +16,7 @@
         or NavigationForm.workflowPlugin.title eq 'e-PrintDocket'
         or NavigationForm.workflowPlugin.title eq 'f-BlockRecordsPlugin'
         or NavigationForm.workflowPlugin.title eq 'g-SeachBindingsPlugin'
+        or NavigationForm.workflowPlugin.title eq 'intranda_workflow_linkedprocesscreation'
         ? '/uii/templatePG/templatePG.html' : '/uii/template/template.html'}"
 	xmlns:x="http://myfaces.apache.org/tomahawk"
 	xmlns:intranda="http://xmlns.jcp.org/jsf/composite/composites"