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

… master
intranda · Sep 7, 2024 · 720fb39 · 720fb39
2 parents d5a4712 + 008258e
commit 720fb39
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 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_step_generateIdentifier
 **Plugin type**             | step
 **Licence**                 | GPL 2.0 or newer
-**Documentation (German)**  | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-generate-identifier
-**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-generate-identifier
+**Documentation (German)**  | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-generate-identifier
+**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-generate-identifier
 
 ## 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-step-generate-identifier</artifactId>
-    <version>24.07</version>
+    <version>24.08.1</version>
   </parent>
   <artifactId>plugin-step-generate-identifier-base</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>