Skip to content

Commit 71be344

Browse files
committed
Merge branch 'dev' into mh/#1195-removing-dsm-attribute
2 parents 13a4d95 + ea0c4c0 commit 71be344

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '6.25.0' //code format
8-
id 'com.github.spotbugs' version '6.0.27' // code check, working on byte code
7+
id 'com.diffplug.spotless' version '7.0.1' //code format
8+
id 'com.github.spotbugs' version '6.1.0' // 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
@@ -55,7 +55,7 @@ dependencies {
5555
// ie³ power system utils
5656
implementation 'com.github.ie3-institute:PowerSystemUtils:2.2.1'
5757

58-
implementation 'tech.units:indriya:2.2.1'
58+
implementation 'tech.units:indriya:2.2.2'
5959

6060
// JTS Topology Suite for GeoPositions, License: EPL 1.0 / EDL 1.0
6161
implementation ('org.locationtech.jts:jts-core:1.20.0'){
@@ -90,11 +90,11 @@ dependencies {
9090

9191
// Databases
9292
implementation 'org.influxdb:influxdb-java:2.24'
93-
implementation 'com.couchbase.client:java-client:3.7.6'
93+
implementation 'com.couchbase.client:java-client:3.7.7'
9494
runtimeOnly 'org.postgresql:postgresql:42.7.4' // postgresql jdbc driver required during runtime
9595

9696
implementation 'commons-io:commons-io:2.18.0' // I/O functionalities
97-
implementation 'commons-codec:commons-codec:1.17.1' // needed by commons-compress
97+
implementation 'commons-codec:commons-codec:1.17.2' // needed by commons-compress
9898
implementation 'org.apache.commons:commons-compress:1.27.1' // I/O functionalities
9999
}
100100

src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ class SystemParticipantValidationUtilsTest extends Specification {
454454
where:
455455
invalidWecType || expectedException
456456
new WecTypeInput(uuid, id, capex, opex, sRated, cosPhiRated, wecCharacteristic, Quantities.getQuantity(110d, EFFICIENCY), rotorArea, hubHeight) || new InvalidEntityException("Efficiency of the converter of WecTypeInput must be between 0% and 100%", invalidWecType)
457-
new WecTypeInput(uuid, id, capex, opex, sRated, cosPhiRated, wecCharacteristic, etaConv, Quantities.getQuantity(-10, ROTOR_AREA), Quantities.getQuantity(-200, HUB_HEIGHT)) || new InvalidEntityException("The following quantities have to be zero or positive: -10 , -200 m", invalidWecType)
457+
new WecTypeInput(uuid, id, capex, opex, sRated, cosPhiRated, wecCharacteristic, etaConv, Quantities.getQuantity(-10, ROTOR_AREA), Quantities.getQuantity(-200, HUB_HEIGHT)) || new InvalidEntityException("The following quantities have to be zero or positive: -10 , -200 m", invalidWecType)
458458
}
459459

460460
def "SystemParticipantValidationUtils.checkEvcs() recognizes all potential errors for a evcs"() {

0 commit comments

Comments
 (0)