From c54ba00b684f3fc20f4fe00a5056634a06b2ecab Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Wed, 21 Aug 2024 11:14:58 +0200 Subject: [PATCH 1/5] 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 1cc6ca6..de3f368 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-administration-ruleset-editor - 24.07 + 24.08-SNAPSHOT plugin-administration-ruleset-editor-base jar diff --git a/module-gui/pom.xml b/module-gui/pom.xml index 437460b..1bc926f 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-administration-ruleset-editor - 24.07 + 24.08-SNAPSHOT plugin-administration-ruleset-editor-gui jar diff --git a/pom.xml b/pom.xml index 8e37da6..d84bbb7 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 95fa94b399b379ffe1274ffb5a1e6291b824985c Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Tue, 27 Aug 2024 14:42:56 +0200 Subject: [PATCH 2/5] 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 fe741f49471ab1d60567025d179bce9b0476a9cb Mon Sep 17 00:00:00 2001 From: Robert Sehr Date: Wed, 4 Sep 2024 13:40:52 +0200 Subject: [PATCH 3/5] removed unneeded file generation --- .../intranda/goobi/plugins/RulesetFileUtils.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/module-base/src/main/java/de/intranda/goobi/plugins/RulesetFileUtils.java b/module-base/src/main/java/de/intranda/goobi/plugins/RulesetFileUtils.java index c86dc9d..5bdd8e2 100644 --- a/module-base/src/main/java/de/intranda/goobi/plugins/RulesetFileUtils.java +++ b/module-base/src/main/java/de/intranda/goobi/plugins/RulesetFileUtils.java @@ -49,7 +49,7 @@ public static void createBackup(String fileName) throws IOException { message += " Please check the permissions in the configured backup directory."; log.error(message); String key = "plugin_administration_ruleset_editor_backup_not_writable_check_permissions"; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append(Helper.getTranslation(key)); buffer.append(" ("); buffer.append(backupPath); @@ -76,9 +76,7 @@ public static void writeFile(String fileName, String content) { if (!Paths.get(RulesetFileUtils.backupDirectory).toFile().exists()) { RulesetFileUtils.createDirectory(RulesetFileUtils.backupDirectory); } - if (!Paths.get(fileName).toFile().exists()) { - RulesetFileUtils.createFile(fileName); - } + try { Charset charset = RulesetFileUtils.standardCharset; FileUtils.write(new File(fileName), content, charset); @@ -91,16 +89,6 @@ public static void writeFile(String fileName, String content) { } } - public static void createFile(String fileName) { - Path path = Paths.get(fileName); - try { - StorageProvider.getInstance().createFile(path); - } catch (IOException ioException) { - ioException.printStackTrace(); - log.error("RulesetEditorAdministrationPlugin could not create file " + fileName); - } - } - public static void createDirectory(String directoryName) { Path path = Paths.get(directoryName); try { From c36177d8ecf17d614ef6308414dde08e6b8591a9 Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Thu, 5 Sep 2024 07:03:55 +0200 Subject: [PATCH 4/5] updated readme file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index da4a0a8..92a6de9 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Detail | Description **Plugin identifier** | intranda_administration_ruleset_editor **Plugin type** | administration **Licence** | GPL 2.0 or newer -**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/eng/administration/goobi-plugin-administration-ruleset-editor -**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/administration/goobi-plugin-administration-ruleset-editor +**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/ger/administration/goobi-plugin-administration-ruleset-editor +**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/administration/goobi-plugin-administration-ruleset-editor ## Goobi details From 35048717a6565ed2b674aca3793e87b9ee9e7707 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Thu, 5 Sep 2024 15:01:04 +0200 Subject: [PATCH 5/5] Change project version to 24.08 --- 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 de3f368..f6e87f5 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-administration-ruleset-editor - 24.08-SNAPSHOT + 24.08 plugin-administration-ruleset-editor-base jar diff --git a/module-gui/pom.xml b/module-gui/pom.xml index 1bc926f..d1bed0a 100644 --- a/module-gui/pom.xml +++ b/module-gui/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-administration-ruleset-editor - 24.08-SNAPSHOT + 24.08 plugin-administration-ruleset-editor-gui jar diff --git a/pom.xml b/pom.xml index d84bbb7..48d2132 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.08-SNAPSHOT + 24.08 io.goobi.workflow.plugin