Skip to content

Commit b0a9f35

Browse files
Merge branch 'dev' into ms/#981-abstract-commonly-used-functionality-from-EntitySource
2 parents c44b047 + 227ce33 commit b0a9f35

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
### Fixed
1616
- Fixed `MappingEntryies` not getting processed by adding `Getter` methods for record fields [#1084](https://github.com/ie3-institute/PowerSystemDataModel/issues/1084)
1717
- Fixed "depth of discharge" in documentation [#872](https://github.com/ie3-institute/PowerSystemDataModel/issues/872)
18+
- Fixed project beiing build twice in CI [#994](https://github.com/ie3-institute/PowerSystemDataModel/issues/994)
1819

1920
### Changed
2021
- Improvements to the search for corner points in `IdCoordinateSource` [#1016](https://github.com/ie3-institute/PowerSystemDataModel/issues/1016)

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ node {
113113
gradle('--refresh-dependencies clean spotlessCheck pmdMain pmdTest spotbugsMain ' +
114114
'spotbugsTest test jacocoTestReport jacocoTestCoverageVerification', projectName)
115115

116-
sh(script: """set +x && cd $projectName""" + ''' set +x; ./gradlew clean javadoc''', returnStdout: true)
116+
sh(script: """set +x && cd $projectName""" + ''' set +x; ./gradlew javadoc''', returnStdout: true)
117117
}
118118

119119
// sonarqube analysis
@@ -156,7 +156,7 @@ node {
156156
*/
157157
sh(
158158
script: """set +x && cd $projectName""" +
159-
''' set +x; ./gradlew clean javadoc''',
159+
''' set +x; ./gradlew javadoc''',
160160
returnStdout: true
161161
)
162162

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'signing'
66
id 'pmd' // code check, working on source code
77
id 'com.diffplug.spotless' version '6.25.0' //code format
8-
id 'com.github.spotbugs' version '6.0.17' // code check, working on byte code
8+
id 'com.github.spotbugs' version '6.0.18' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1111
id 'jacoco' // java code coverage plugin

0 commit comments

Comments
 (0)