From 032c9efb60201a3b2c97d317ccfc72f6eb3f1aac Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Wed, 8 May 2024 14:09:08 +0200 Subject: [PATCH 1/3] ci: update to latest CI scripts --- Jenkinsfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 13cb478..a8914fa 100644 --- 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') + } } } } From bca45cf380a29eafce19e28ae9b39872c1cdd999 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Fri, 17 May 2024 10:42:38 +0200 Subject: [PATCH 2/3] ci: update to latest CI scripts --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a8914fa..2b2e562 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,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 From 888b2e809b7e332132f1f8672a0808913c4c63b1 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Fri, 24 May 2024 12:27:38 +0200 Subject: [PATCH 3/3] Change project version to 24.04.30 --- 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 957411f..669768c 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow.plugin plugin-opac-soutron - 24.04.2 + 24.04.30 plugin-opac-soutron-base jar diff --git a/pom.xml b/pom.xml index ba54f5b..290a614 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.goobi.workflow workflow-base - 24.04.2 + 24.04.30 io.goobi.workflow.plugin