Merge pull request 'Release v25.02' (#20) from release_25.02 into master

Dominick Leppich · Dominick Leppich · commit 6dc248aa60d8 · 2025-03-02T16:33:44.000+01:00
diff --git a/.github/workflows/develop-build.yml b/.github/workflows/develop-build.yml
@@ -14,12 +14,13 @@ jobs:
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
       - name: Set up Maven cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -14,12 +14,13 @@ jobs:
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
       - name: Set up Maven cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,10 +3,7 @@ pipeline {
 
   agent {
     docker {
-      /* using a custom build image with a defined home directory for UID 1000 among other things */
-      image 'nexus.intranda.com:4443/maven:3.9.3-eclipse-temurin-17'
-      registryUrl 'https://nexus.intranda.com:4443'
-      registryCredentialsId 'jenkins-docker'
+      image 'maven:3-eclipse-temurin-21'
       args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
     }
   }
diff --git a/build.xml b/build.xml
@@ -3,7 +3,7 @@
 		<exec executable="mvn">
 			<arg value="package"/>
 		</exec>
-		<copy file="module-main/target/plugin_intranda_workflow_projectexport.jar" todir="/opt/digiverso/goobi/plugins/workflow/"/>
-		<copy file="module-gui/target/plugin_intranda_workflow_projectexport-GUI.jar" todir="/opt/digiverso/goobi/plugins/GUI/"/>
+        <copy file="module-base/target/plugin-workflow-project-export-base.jar" todir="/opt/digiverso/goobi/plugins/workflow/" overwrite="true"/>
+        <copy file="module-gui/target/plugin-workflow-project-export-gui.jar" todir="/opt/digiverso/goobi/plugins/GUI/" overwrite="true"/>
 	</target>
 </project>
diff --git a/module-base/pom.xml b/module-base/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-workflow-project-export</artifactId>
-    <version>24.12</version>
+    <version>25.02</version>
   </parent>
   <artifactId>plugin-workflow-project-export-base</artifactId>
   <packaging>jar</packaging>
diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/ProjectExportPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/ProjectExportPlugin.java
@@ -15,16 +15,6 @@
 import java.util.stream.Stream;
 import java.util.zip.ZipOutputStream;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
-import io.goobi.vocabulary.exchange.FieldDefinition;
-import io.goobi.vocabulary.exchange.VocabularySchema;
-import io.goobi.workflow.api.vocabulary.APIException;
-import io.goobi.workflow.api.vocabulary.VocabularyAPIManager;
-import io.goobi.workflow.api.vocabulary.VocabularyRecordAPI;
-import io.goobi.workflow.api.vocabulary.helper.ExtendedVocabulary;
-import io.goobi.workflow.api.vocabulary.helper.ExtendedVocabularyRecord;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
@@ -54,6 +44,15 @@
 import de.sub.goobi.persistence.managers.MySQLHelper;
 import de.sub.goobi.persistence.managers.ProcessManager;
 import de.sub.goobi.persistence.managers.ProjectManager;
+import io.goobi.vocabulary.exchange.FieldDefinition;
+import io.goobi.vocabulary.exchange.VocabularySchema;
+import io.goobi.workflow.api.vocabulary.APIException;
+import io.goobi.workflow.api.vocabulary.VocabularyAPIManager;
+import io.goobi.workflow.api.vocabulary.VocabularyRecordAPI;
+import io.goobi.workflow.api.vocabulary.helper.ExtendedVocabulary;
+import io.goobi.workflow.api.vocabulary.helper.ExtendedVocabularyRecord;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
@@ -480,18 +479,22 @@ public void prepareExport() {
                                         }
 
                                         if (searchAgain) {
-                                            ExtendedVocabulary publishersVocabulary = VocabularyAPIManager.getInstance().vocabularies().findByName("Publishers");
-                                            VocabularySchema schema = VocabularyAPIManager.getInstance().vocabularySchemas().get(publishersVocabulary.getSchemaId());
-                                            Optional<Long> correctedValueDefinitionId = schema.getDefinitions().stream()
-                                                    .filter(d -> d.getName().equals("Corrected value"))
+                                            ExtendedVocabulary publishersVocabulary =
+                                                    VocabularyAPIManager.getInstance().vocabularies().findByName("Publishers");
+                                            VocabularySchema schema =
+                                                    VocabularyAPIManager.getInstance().vocabularySchemas().get(publishersVocabulary.getSchemaId());
+                                            Optional<Long> correctedValueDefinitionId = schema.getDefinitions()
+                                                    .stream()
+                                                    .filter(d -> "Corrected value".equals(d.getName()))
                                                     .map(FieldDefinition::getId)
                                                     .findFirst();
 
                                             if (correctedValueDefinitionId.isEmpty()) {
                                                 log.error("Unable to find definition id for field \"Corrected value\"");
                                                 continue;
                                             } else {
-                                                List<ExtendedVocabularyRecord> hits = VocabularyAPIManager.getInstance().vocabularyRecords()
+                                                List<ExtendedVocabularyRecord> hits = VocabularyAPIManager.getInstance()
+                                                        .vocabularyRecords()
                                                         .list(publishersVocabulary.getId())
                                                         .search(correctedValueDefinitionId.get() + ":" + publisherLat)
                                                         .all()
@@ -501,7 +504,8 @@ public void prepareExport() {
                                                 if (hits.size() == 1) {
                                                     rec = hits.get(0);
                                                 } else {
-                                                    log.error("Search result for publisher \"{}\" not existing or not unique, skipping", publisherLat);
+                                                    log.error("Search result for publisher \"{}\" not existing or not unique, skipping",
+                                                            publisherLat);
                                                     continue;
                                                 }
                                             }
diff --git a/module-gui/pom.xml b/module-gui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-workflow-project-export</artifactId>
-    <version>24.12</version>
+    <version>25.02</version>
   </parent>
   <artifactId>plugin-workflow-project-export-gui</artifactId>
   <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>24.12</version>
+    <version>25.02</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,7 @@ pipeline {`
`3`	`3`
`4`	`4`	`agent {`
`5`	`5`	`docker {`
`6`		`- /* using a custom build image with a defined home directory for UID 1000 among other things */`
`7`		`- image 'nexus.intranda.com:4443/maven:3.9.3-eclipse-temurin-17'`
`8`		`- registryUrl 'https://nexus.intranda.com:4443'`
`9`		`- registryCredentialsId 'jenkins-docker'`
	`6`	`+ image 'maven:3-eclipse-temurin-21'`
`10`	`7`	`args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'`
`11`	`8`	`}`
`12`	`9`	`}`