Merge pull request 'Release v24.04.20' (!322) from release_24.04.20 i…

…nto master
intranda · May 17, 2024 · f715bf6 · f715bf6
2 parents 1a9835c + 8bb2790
commit f715bf6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ build/
 
 # Plugins
 hotswap-agent.properties
+/Goobi/
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
         }
       }
       steps {
-        sh 'mvn -DskipTests=true -Dcheckstyle.skip=true -Dmdep.analyze.skip=true deploy -U'
+        sh 'mvn deploy -U'
       }
     }
     stage('tag release') {

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.goobi.workflow</groupId>
         <artifactId>workflow-base</artifactId>
-        <version>24.04.19</version>
+        <version>24.04.20</version>
         <relativePath/>
     </parent>
     <artifactId>workflow-core</artifactId>

diff --git a/src/main/resources/contentServerConfig.xml → src/main/resources/config_contentServer.xml b/src/main/resources/contentServerConfig.xml → src/main/resources/config_contentServer.xml
diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties
@@ -2331,6 +2331,7 @@ plugin_administration_archive_newNode=Neuen Knoten einf\u00FCgen
 plugin_administration_archive_noConnectionToDatabase=Es besteht keine Verbindung zur BaseX-Datenbank. Bitte \u00FCberpr\u00FCfen Sie die Installation und stellen Sie sicher, dass die BaseX-Datenbank gestartet wurde.
 plugin_administration_archive_noElementSelectedHeading=Es ist derzeit kein Element ausgew\u00E4hlt.
 plugin_administration_archive_noElementSelectedText=Bitte w\u00E4hlen Sie zun\u00E4chst im linken Bereich einen Knoten aus, den Sie bearbeiten m\u00F6chten.
+plugin_administration_archive_nodelink=Verkn\u00FCpfung zu anderen Knoten
 plugin_administration_archive_nodeType=Knotentyp
 plugin_administration_archive_nodeType_audio=Audiodokument
 plugin_administration_archive_nodeType_file=Akte

diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
@@ -2331,6 +2331,7 @@ plugin_administration_archive_newNode=Insert new node
 plugin_administration_archive_noConnectionToDatabase=There is no connection to the BaseX database. Please check the installation and make sure that the BaseX database has been started.
 plugin_administration_archive_noElementSelectedHeading=No element is currently selected.
 plugin_administration_archive_noElementSelectedText=Please first select a node in the left-hand area that you would like to edit.
+plugin_administration_archive_nodelink=Link to other nodeszzz
 plugin_administration_archive_nodeType=Node type
 plugin_administration_archive_nodeType_audio=Audio document
 plugin_administration_archive_nodeType_file=File