Merge pull request 'Release v25.05' (#19) from release_25.05 into master

Author: Dominick Leppich

module-base/pom.xml

@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-step-user-assignment</artifactId>
-    <version>25.04</version>
+    <version>25.05</version>
   </parent>
   <artifactId>plugin-step-user-assignment-base</artifactId>
   <packaging>jar</packaging>
-</project>
+</project>

module-base/src/main/java/de/intranda/goobi/plugins/UserAssignmentPlugin.java

@@ -4,7 +4,7 @@
 import java.util.List;
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.goobi.beans.Processproperty;
+import org.goobi.beans.GoobiProperty;
 import org.goobi.beans.Step;
 import org.goobi.beans.User;
 import org.goobi.beans.Usergroup;
@@ -23,6 +23,7 @@
 @PluginImplementation
 @Log4j
 public class UserAssignmentPlugin extends AbstractStepPlugin implements IStepPlugin, IPlugin {
+    private static final long serialVersionUID = -7718261144382577236L;
     private static final String PLUGIN_NAME = "intranda_step_user_assignment";
     private Step targetStep;
     private List<Usergroup> oldGroups;
@@ -37,16 +38,16 @@ public class UserAssignmentPlugin extends AbstractStepPlugin implements IStepPlu
     public void initialize(Step step, String returnPath) {
         // get workflow name from properties
         String workflowName = null;
-        for (Processproperty pp : step.getProzess().getEigenschaften()) {
-            if (pp.getTitel().equals("Template")) {
-                workflowName = pp.getWert();
+        for (GoobiProperty pp : step.getProzess().getProperties()) {
+            if ("Template".equals(pp.getPropertyName())) {
+                workflowName = pp.getPropertyValue();
             }
         }
         // if property Template does not exist try goobiWorkflow instead
         if (workflowName == null) {
-            for (Processproperty pp : step.getProzess().getEigenschaften()) {
-                if (pp.getTitel().equals("goobiWorkflow")) {
-                    workflowName = pp.getWert();
+            for (GoobiProperty pp : step.getProzess().getProperties()) {
+                if ("goobiWorkflow".equals(pp.getPropertyName())) {
+                    workflowName = pp.getPropertyValue();
                 }
             }
         }
@@ -58,7 +59,7 @@ public void initialize(Step step, String returnPath) {
             List<HierarchicalConfiguration> workflows = hc.configurationsAt("workflow");
             configAssignmentStepName = hc.getString("assignmentStep", "- no assignment configured -");
             for (HierarchicalConfiguration workflow : workflows) {
-                if (myconfig == null || ((workflow.getString("").equals("*") || workflow.getString("").equals(workflowName))
+                if (myconfig == null || (("*".equals(workflow.getString("")) || workflow.getString("").equals(workflowName))
                         && step.getTitel().equals(configAssignmentStepName))) {
                     myconfig = hc;
                 }
@@ -69,9 +70,9 @@ public void initialize(Step step, String returnPath) {
             configAssignmentStepName = myconfig.getString("assignmentStep", "- no assignment configured -");
             configTargetStepName = myconfig.getString("targetStep", "- no assignment configured -");
         }
-            super.returnPath = returnPath;
-            super.myStep = step;
-            loadAllCurrentUsers();
+        super.returnPath = returnPath;
+        super.myStep = step;
+        loadAllCurrentUsers();
     }
 
     /**

module-gui/pom.xml

@@ -1,9 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-step-user-assignment</artifactId>
-    <version>25.04</version>
+    <version>25.05</version>
   </parent>
   <artifactId>plugin-step-user-assignment-gui</artifactId>
   <packaging>jar</packaging>
@@ -15,4 +16,4 @@
       </resource>
     </resources>
   </build>
-</project>
+</project>

pom.xml

@@ -1,10 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>25.04</version>
-    <relativePath />
+    <version>25.05</version>
+    <relativePath/>
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>
   <artifactId>plugin-step-user-assignment</artifactId>
@@ -23,8 +24,8 @@
     <dependency>
       <groupId>io.goobi.workflow</groupId>
       <artifactId>workflow-core</artifactId>
-      <version>${project.version}</version>
+      <version>25.05</version>
       <classifier>classes</classifier>
     </dependency>
   </dependencies>
-</project>
+</project>