Merge pull request 'Release v24.08' (#14) from release_24.08 into master

intranda · Sep 5, 2024 · 42c05e8 · 42c05e8
2 parents b9ca02e + 3504871
commit 42c05e8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 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_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
 

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-administration-ruleset-editor</artifactId>
-    <version>24.07</version>
+    <version>24.08</version>
   </parent>
   <artifactId>plugin-administration-ruleset-editor-base</artifactId>
   <packaging>jar</packaging>

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
@@ -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 {

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-administration-ruleset-editor</artifactId>
-    <version>24.07</version>
+    <version>24.08</version>
   </parent>
   <artifactId>plugin-administration-ruleset-editor-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</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>