Merge pull request 'Release v24.09' (#15) from release_24.09 into master

intranda · Oct 1, 2024 · ecdcbb3 · ecdcbb3
2 parents 4474d73 + 78f3f90
commit ecdcbb3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -28,6 +28,7 @@ pipeline {
             branch 'master'
             branch 'release_*'
             branch 'hotfix_release_*'
+            branch 'sonar_*'
             allOf {
               branch 'PR-*'
               expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -55,6 +56,14 @@ pipeline {
         sh 'mvn clean verify -U -P release-build'
       }
     }
+    stage('build-sonar') {
+      when {
+        branch 'sonar_*'
+      }
+      steps {
+        sh 'mvn clean verify -U -P sonar-build'
+      }
+    }
     stage('sonarcloud') {
       when {
         allOf {

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-step-pdf-extraction</artifactId>
-    <version>24.08.1</version>
+    <version>24.09</version>
   </parent>
   <artifactId>plugin-step-pdf-extraction-base</artifactId>
   <packaging>jar</packaging>

diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java b/module-base/src/main/java/de/intranda/goobi/plugins/PDFExtractionPlugin.java
@@ -290,7 +290,7 @@ private void setProperty(String propertyName, String value) {
         if (property == null) {
             property = new Processproperty();
             property.setTitel(propertyName);
-            property.setContainer(0);
+            property.setContainer("0");
             property.setCreationDate(Date.from(Instant.now()));
             property.setProzess(this.step.getProzess());
             properties.add(property);

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.goobi.workflow</groupId>
     <artifactId>workflow-base</artifactId>
-    <version>24.08.1</version>
+    <version>24.09</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>