From bb4865a57a490570b5340d5e0d5b54cf088e3bf3 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Wed, 21 Aug 2024 11:23:17 +0200 Subject: [PATCH 1/4] Change project version to 24.08-SNAPSHOT --- module-base/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index 1b07383..df82f79 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-step-mixed-ocr - 24.07 + 24.08-SNAPSHOT plugin-step-mixed-ocr-base jar diff --git a/pom.xml b/pom.xml index c45db4d..0aaabf4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.07 + 24.08-SNAPSHOT io.goobi.workflow.plugin From f7aeb68d249d78cb267be65761cfecb49c572ee6 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Tue, 27 Aug 2024 14:54:46 +0200 Subject: [PATCH 2/4] ci: enable hotfix releases for plugins --- Jenkinsfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b2e562..6d1a6cb 100644 --- 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')]) { From 864b85bffd43d761457b205930403a69475cfb3b Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Thu, 5 Sep 2024 07:07:37 +0200 Subject: [PATCH 3/4] updated readme file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8454c71..da3d836 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Detail | Description **Plugin identifier** | intranda_step_mixedocr **Plugin type** | step **Licence** | GPL 2.0 or newer -**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-mixed-ocr -**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-mixed-ocr +**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-mixed-ocr +**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-mixed-ocr ## Goobi details From 96e341b12e284364ba591b79cb87e9aa92fd310c Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Sat, 7 Sep 2024 08:30:24 +0200 Subject: [PATCH 4/4] Change project version to 24.08.1 --- module-base/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index df82f79..4200379 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-step-mixed-ocr - 24.08-SNAPSHOT + 24.08.1 plugin-step-mixed-ocr-base jar diff --git a/pom.xml b/pom.xml index 0aaabf4..259a5fc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.08-SNAPSHOT + 24.08.1 io.goobi.workflow.plugin