Merge pull request 'Release v24.08.1' (#16) from release_24.08.1 into…

… master
intranda · Sep 7, 2024 · 3c50aa4 · 3c50aa4
2 parents 0f72fd6 + c96c614
commit 3c50aa4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -27,6 +27,7 @@ pipeline {
           anyOf {
             branch 'master'
             branch 'release_*'
+            branch 'hotfix_release_*'
             allOf {
               branch 'PR-*'
               expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -43,6 +44,7 @@ pipeline {
         anyOf {
           branch 'master'
           branch 'release_*'
+          branch 'hotfix_release_*'
           allOf {
             branch 'PR-*'
             expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -59,6 +61,7 @@ pipeline {
           anyOf {
             branch 'master'
             branch 'release_*'
+            branch 'hotfix_release_*'
             branch 'sonar_*'
             allOf {
               branch 'PR-*'
@@ -83,6 +86,7 @@ pipeline {
         anyOf {
           branch 'master'
           branch 'develop'
+          branch 'hotfix_release_*'
         }
       }
       steps {
@@ -95,7 +99,12 @@ pipeline {
       }
     }
     stage('tag release') {
-      when { branch 'master' }
+      when {
+        anyOf {
+          branch 'master'
+          branch 'hotfix_release_*'
+        }
+      }
       steps {
         withCredentials([gitUsernamePassword(credentialsId: '93f7e7d3-8f74-4744-a785-518fc4d55314',
                  gitToolName: 'git-tool')]) {

diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ Detail                      | Description
 **Plugin identifier**       | intranda_workflow_excelimport
 **Plugin type**             | workflow
 **Licence**                 | GPL 2.0 or newer
-**Documentation (German)**  | https://docs.goobi.io/workflow-plugins/v/eng/workflow/goobi-plugin-workflow-excel-import
-**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/workflow/goobi-plugin-workflow-excel-import
+**Documentation (German)**  | https://docs.goobi.io/workflow-plugins/v/ger/workflow/goobi-plugin-workflow-excel-import
+**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/workflow/goobi-plugin-workflow-excel-import
 
 ## Goobi details
 

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-excel-import</artifactId>
-    <version>24.07</version>
+    <version>24.08.1</version>
   </parent>
   <artifactId>plugin-workflow-excel-import-base</artifactId>
   <packaging>jar</packaging>

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-excel-import</artifactId>
-    <version>24.07</version>
+    <version>24.08.1</version>
   </parent>
   <artifactId>plugin-workflow-excel-import-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.07</version>
+    <version>24.08.1</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>