Skip to content

Commit e807a12

Browse files
committed
Merge pull request 'Release v24.05' (#13) from release_24.05 into master
2 parents 04d1ce6 + 37c5394 commit e807a12

File tree

20 files changed

+116
-2025
lines changed

20 files changed

+116
-2025
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

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,16 @@
33
<parent>
44
<groupId>io.goobi.workflow.plugin</groupId>
55
<artifactId>plugin-administration-hotfolder-nli</artifactId>
6-
<version>24.04.2</version>
6+
<version>24.05</version>
77
</parent>
88
<artifactId>plugin-administration-hotfolder-nli-base</artifactId>
99
<packaging>jar</packaging>
10-
</project>
10+
<dependencies>
11+
<dependency>
12+
<groupId>io.goobi.workflow.plugin</groupId>
13+
<artifactId>plugin-administration-hotfolder-nli-lib</artifactId>
14+
<version>${project.version}</version>
15+
<scope>compile</scope>
16+
</dependency>
17+
</dependencies>
18+
</project>

module-base/src/main/java/de/intranda/goobi/plugins/hotfolder/nli/model/CSVGenerator.java

-131
This file was deleted.

module-base/src/main/java/de/intranda/goobi/plugins/hotfolder/nli/model/GUIImportResult.java

-29
This file was deleted.

module-base/src/main/java/de/intranda/goobi/plugins/hotfolder/nli/model/GroupMappingObject.java

-17
This file was deleted.

0 commit comments

Comments
 (0)