Merge pull request 'Release v24.04.30' (#4) from release_24.04.30 int…

…o master
intranda · May 24, 2024 · 2dda17a · 2dda17a
2 parents 9bf9a0a + 68627f6
commit 2dda17a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,13 +55,20 @@ pipeline {
     }
     stage('sonarcloud') {
       when {
-        anyOf {
-          branch 'master'
-          branch 'release_*'
-          branch 'sonar_*'
-          allOf {
-            branch 'PR-*'
-            expression { env.CHANGE_BRANCH.startsWith("release_") }
+        allOf {
+          anyOf {
+            branch 'master'
+            branch 'release_*'
+            branch 'sonar_*'
+            allOf {
+              branch 'PR-*'
+              expression { env.CHANGE_BRANCH.startsWith("release_") }
+            }
+          }
+          not {
+            expression {
+              return fileExists('DO_NOT_PUBLISH')
+            }
           }
         }
       }
@@ -124,7 +131,6 @@ pipeline {
         enabledForFailure: true, aggregatingResults: false,
         tools: [checkStyle(pattern: 'target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
       )
-      dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
     }
     success {
       archiveArtifacts artifacts: '**/target/*.jar, install/*', fingerprint: true, onlyIfSuccessful: true

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-statistics-sudan-memory</artifactId>
-    <version>24.04.2</version>
+    <version>24.04.30</version>
   </parent>
   <artifactId>plugin-statistics-sudan-memory-base</artifactId>
   <packaging>jar</packaging>

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-statistics-sudan-memory</artifactId>
-    <version>24.04.2</version>
+    <version>24.04.30</version>
   </parent>
   <artifactId>plugin-statistics-sudan-memory-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.04.2</version>
+    <version>24.04.30</version>
     <relativePath />
   </parent>
   <groupId>io.goobi.workflow.plugin</groupId>