From 745391f381af250ca152efeed3a8f797d3fafe73 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Wed, 21 Aug 2024 11:26:28 +0200 Subject: [PATCH 1/4] Change project version to 24.08-SNAPSHOT --- module-base/pom.xml | 2 +- module-gui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index 0ad794b..0b2f56e 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-workflow-hu-importer - 24.07 + 24.08-SNAPSHOT plugin-workflow-hu-importer-base jar diff --git a/module-gui/pom.xml b/module-gui/pom.xml index cb9cde5..f80d7f0 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-workflow-hu-importer - 24.07 + 24.08-SNAPSHOT plugin-workflow-hu-importer-gui jar diff --git a/pom.xml b/pom.xml index dd9b2ac..054594d 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 8390e46c14afbc569d0fdcde6a33a8ff20869f99 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Tue, 27 Aug 2024 14:59:06 +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 86e72aaeac7dbffe92840d8edc918d6c3b899152 Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Thu, 5 Sep 2024 07:11:15 +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 2e2539b..8ab119a 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Detail | Description **Plugin identifier** | intranda_workflow_hu_importer **Plugin type** | workflow **Licence** | GPL 2.0 or newer -**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/eng/workflow/goobi-plugin-workflow-hu-importer -**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/workflow/goobi-plugin-workflow-hu-importer +**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/ger/workflow/goobi-plugin-workflow-hu-importer +**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/workflow/goobi-plugin-workflow-hu-importer ## Goobi details From 9abf3cb4fc8f6c702b0eda4e8b8729534034b688 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Thu, 5 Sep 2024 19:30:33 +0200 Subject: [PATCH 4/4] Change project version to 24.08.1 --- module-base/pom.xml | 2 +- module-gui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module-base/pom.xml b/module-base/pom.xml index 0b2f56e..591bd90 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-workflow-hu-importer - 24.08-SNAPSHOT + 24.08.1 plugin-workflow-hu-importer-base jar diff --git a/module-gui/pom.xml b/module-gui/pom.xml index f80d7f0..de1314d 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-workflow-hu-importer - 24.08-SNAPSHOT + 24.08.1 plugin-workflow-hu-importer-gui jar diff --git a/pom.xml b/pom.xml index 054594d..704e715 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