Skip to content

Commit 87fc1d8

Browse files
committed
Merge pull request 'Release v24.04.30' (#8) from release_24.04.30 into master
2 parents c8b17aa + 04897e8 commit 87fc1d8

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

Jenkinsfile

+14-8
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,20 @@ pipeline {
5555
}
5656
stage('sonarcloud') {
5757
when {
58-
anyOf {
59-
branch 'master'
60-
branch 'release_*'
61-
branch 'sonar_*'
62-
allOf {
63-
branch 'PR-*'
64-
expression { env.CHANGE_BRANCH.startsWith("release_") }
58+
allOf {
59+
anyOf {
60+
branch 'master'
61+
branch 'release_*'
62+
branch 'sonar_*'
63+
allOf {
64+
branch 'PR-*'
65+
expression { env.CHANGE_BRANCH.startsWith("release_") }
66+
}
67+
}
68+
not {
69+
expression {
70+
return fileExists('DO_NOT_PUBLISH')
71+
}
6572
}
6673
}
6774
}
@@ -124,7 +131,6 @@ pipeline {
124131
enabledForFailure: true, aggregatingResults: false,
125132
tools: [checkStyle(pattern: 'target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
126133
)
127-
dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
128134
}
129135
success {
130136
archiveArtifacts artifacts: '**/target/*.jar, install/*', fingerprint: true, onlyIfSuccessful: true

module-base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow.plugin</groupId>
55
<artifactId>plugin-opac-pica</artifactId>
6-
<version>24.04.2</version>
6+
<version>24.04.30</version>
77
</parent>
88
<artifactId>plugin-opac-pica-base</artifactId>
99
<packaging>jar</packaging>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow</groupId>
55
<artifactId>workflow-base</artifactId>
6-
<version>24.04.2</version>
6+
<version>24.04.30</version>
77
<relativePath />
88
</parent>
99
<groupId>io.goobi.workflow.plugin</groupId>

0 commit comments

Comments
 (0)