Merge pull request 'Release v24.04.26' (#7) from release_24.04.26 int…

…o master
intranda · May 24, 2024 · 0f44259 · 0f44259
2 parents 020b9ed + 175a1b3
commit 0f44259
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 76 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,13 +55,20 @@ pipeline {
     }
     stage('sonarcloud') {
       when {
-        anyOf {
-          branch 'master'
-          branch 'release_*'
-          branch 'sonar_*'
-          allOf {
-            branch 'PR-*'
-            expression { env.CHANGE_BRANCH.startsWith("release_") }
+        allOf {
+          anyOf {
+            branch 'master'
+            branch 'release_*'
+            branch 'sonar_*'
+            allOf {
+              branch 'PR-*'
+              expression { env.CHANGE_BRANCH.startsWith("release_") }
+            }
+          }
+          not {
+            expression {
+              return fileExists('DO_NOT_PUBLISH')
+            }
           }
         }
       }
@@ -124,7 +131,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/*.jar, install/*', fingerprint: true, onlyIfSuccessful: true

diff --git a/module-base/pom.xml b/module-base/pom.xml
@@ -3,8 +3,15 @@
   <parent>
     <groupId>io.goobi.workflow.plugin</groupId>
     <artifactId>plugin-workflow-entity-editor</artifactId>
-    <version>24.04.2</version>
+    <version>24.04.26</version>
   </parent>
   <artifactId>plugin-workflow-entity-editor-base</artifactId>
   <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>io.goobi.workflow.plugin</groupId>
+      <artifactId>plugin-workflow-entity-editor-lib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>
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-entity-editor</artifactId>
-    <version>24.04.2</version>
+    <version>24.04.26</version>
   </parent>
   <artifactId>plugin-workflow-entity-editor-gui</artifactId>
   <packaging>jar</packaging>

diff --git a/module-lib/pom.xml b/module-lib/pom.xml
@@ -0,0 +1,10 @@
+<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-workflow-entity-editor</artifactId>
+    <version>24.04.26</version>
+  </parent>
+  <artifactId>plugin-workflow-entity-editor-lib</artifactId>
+  <packaging>jar</packaging>
+</project>
diff --git a/...a/goobi/plugins/model/BreadcrumbItem.java → ...a/goobi/plugins/model/BreadcrumbItem.java b/...a/goobi/plugins/model/BreadcrumbItem.java → ...a/goobi/plugins/model/BreadcrumbItem.java
diff --git a/.../goobi/plugins/model/ConfiguredField.java → .../goobi/plugins/model/ConfiguredField.java b/.../goobi/plugins/model/ConfiguredField.java → .../goobi/plugins/model/ConfiguredField.java
@@ -1,25 +1,24 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.goobi.vocabulary.Field;
-import org.goobi.vocabulary.VocabRecord;
-import org.goobi.vocabulary.Vocabulary;
-
 import de.sub.goobi.persistence.managers.VocabularyManager;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang.StringUtils;
+import org.goobi.vocabulary.Field;
+import org.goobi.vocabulary.VocabRecord;
+import org.goobi.vocabulary.Vocabulary;
 import ugh.dl.Metadata;
 import ugh.dl.MetadataGroup;
 import ugh.dl.MetadataType;
 import ugh.exceptions.UGHException;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 @RequiredArgsConstructor
 @Log4j2
 public class ConfiguredField {

diff --git a/.../intranda/goobi/plugins/model/Entity.java → .../intranda/goobi/plugins/model/Entity.java b/.../intranda/goobi/plugins/model/Entity.java → .../intranda/goobi/plugins/model/Entity.java
@@ -1,18 +1,5 @@
 package de.intranda.goobi.plugins.model;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.commons.lang.StringUtils;
-import org.goobi.beans.Process;
-import org.goobi.beans.Processproperty;
-
 import de.intranda.goobi.plugins.model.MetadataField.SourceField;
 import de.sub.goobi.config.ConfigurationHelper;
 import de.sub.goobi.helper.StorageProvider;
@@ -24,6 +11,9 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang.StringUtils;
+import org.goobi.beans.Process;
+import org.goobi.beans.Processproperty;
 import ugh.dl.DocStruct;
 import ugh.dl.Fileformat;
 import ugh.dl.Metadata;
@@ -37,6 +27,15 @@
 import ugh.exceptions.UGHException;
 import ugh.fileformats.mets.MetsMods;
 
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 @Getter
 @Log4j2
 public class Entity {

diff --git a/...nda/goobi/plugins/model/EntityConfig.java → ...nda/goobi/plugins/model/EntityConfig.java b/...nda/goobi/plugins/model/EntityConfig.java → ...nda/goobi/plugins/model/EntityConfig.java
@@ -1,19 +1,18 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import de.sub.goobi.persistence.managers.VocabularyManager;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.goobi.vocabulary.Field;
 import org.goobi.vocabulary.VocabRecord;
 import org.goobi.vocabulary.Vocabulary;
 
-import de.sub.goobi.persistence.managers.VocabularyManager;
-import lombok.Getter;
-import lombok.Setter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class EntityConfig {
 

diff --git a/...randa/goobi/plugins/model/EntityType.java → ...randa/goobi/plugins/model/EntityType.java b/...randa/goobi/plugins/model/EntityType.java → ...randa/goobi/plugins/model/EntityType.java
@@ -1,12 +1,12 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @RequiredArgsConstructor
 public class EntityType {

diff --git a/...a/goobi/plugins/model/GenerationRule.java → ...a/goobi/plugins/model/GenerationRule.java b/...a/goobi/plugins/model/GenerationRule.java → ...a/goobi/plugins/model/GenerationRule.java
@@ -1,5 +1,10 @@
 package de.intranda.goobi.plugins.model;
 
+import de.sub.goobi.helper.VariableReplacer;
+import lombok.Data;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -8,12 +13,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-
-import de.sub.goobi.helper.VariableReplacer;
-import lombok.Data;
-import lombok.Getter;
-
 @Data
 public class GenerationRule {
 

diff --git a/...da/goobi/plugins/model/MetadataField.java → ...da/goobi/plugins/model/MetadataField.java b/...da/goobi/plugins/model/MetadataField.java → ...da/goobi/plugins/model/MetadataField.java
@@ -1,22 +1,5 @@
 package de.intranda.goobi.plugins.model;
 
-import java.awt.image.RenderedImage;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.Part;
-
-import org.apache.commons.lang.StringUtils;
-
 import de.sub.goobi.helper.Helper;
 import de.sub.goobi.helper.NIOFileUtils;
 import de.sub.goobi.helper.StorageProvider;
@@ -32,6 +15,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang.StringUtils;
 import ugh.dl.ContentFile;
 import ugh.dl.DigitalDocument;
 import ugh.dl.DocStruct;
@@ -44,6 +28,20 @@
 import ugh.exceptions.TypeNotAllowedForParentException;
 import ugh.exceptions.UGHException;
 
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.Part;
+import java.awt.image.RenderedImage;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Log4j2
 public class MetadataField {

diff --git a/...nda/goobi/plugins/model/Relationship.java → ...nda/goobi/plugins/model/Relationship.java b/...nda/goobi/plugins/model/Relationship.java → ...nda/goobi/plugins/model/Relationship.java
@@ -1,12 +1,11 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.Locale;
-
-import org.apache.commons.lang.StringUtils;
-
 import lombok.Data;
+import org.apache.commons.lang.StringUtils;
 import ugh.dl.MetadataGroup;
 
+import java.util.Locale;
+
 @Data
 public class Relationship {
 

diff --git a/...goobi/plugins/model/RelationshipType.java → ...goobi/plugins/model/RelationshipType.java b/...goobi/plugins/model/RelationshipType.java → ...goobi/plugins/model/RelationshipType.java
@@ -1,9 +1,9 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.Locale;
-
 import lombok.Data;
 
+import java.util.Locale;
+
 @Data
 public class RelationshipType {
 

diff --git a/.../goobi/plugins/model/VocabularyEntry.java → .../goobi/plugins/model/VocabularyEntry.java b/.../goobi/plugins/model/VocabularyEntry.java → .../goobi/plugins/model/VocabularyEntry.java
@@ -1,10 +1,9 @@
 package de.intranda.goobi.plugins.model;
 
-import java.util.Locale;
-
+import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 
-import lombok.Data;
+import java.util.Locale;
 
 @Data
 public class VocabularyEntry {

diff --git a/pom.xml b/pom.xml
@@ -3,15 +3,17 @@
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>24.04.2</version>
+    <version>24.04.26</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>
   <artifactId>plugin-workflow-entity-editor</artifactId>
+  <!-- REMOVE THIS NEXT RELEASE -->
   <packaging>pom</packaging>
   <modules>
     <module>module-base</module>
     <module>module-gui</module>
+    <module>module-lib</module>
   </modules>
   <repositories>
     <repository>
@@ -23,7 +25,7 @@
     <dependency>
       <groupId>io.goobi.workflow</groupId>
       <artifactId>workflow-core</artifactId>
-      <version>${project.version}</version>
+      <version>24.04.2</version>
       <classifier>classes</classifier>
     </dependency>
   </dependencies>