Skip to content

Commit 4c2537c

Browse files
authored
Merge branch 'dev' into ms/#1112-confusing-error-message-on-deprecated-input-data
2 parents 11a484a + 4abf08b commit 4c2537c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
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
12-
id "org.sonarqube" version "5.1.0.4882" // sonarqube
12+
id "org.sonarqube" version "6.0.0.5145" // sonarqube
1313
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
1414
}
1515

@@ -18,7 +18,7 @@ ext {
1818
javaVersion = JavaVersion.VERSION_17
1919
groovyVersion = "4.0"
2020
groovyBinaryVersion = "4.0.24"
21-
testcontainersVersion = '1.20.3'
21+
testcontainersVersion = '1.20.4'
2222

2323
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
2424
}
@@ -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'
58+
implementation 'tech.units:indriya:2.2.1'
5959

6060
// JTS Topology Suite for GeoPositions, License: EPL 1.0 / EDL 1.0
6161
implementation ('org.locationtech.jts:jts-core:1.20.0'){
@@ -83,7 +83,7 @@ dependencies {
8383
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
8484

8585
// logging
86-
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.1')
86+
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.2')
8787
implementation 'org.apache.logging.log4j:log4j-api' // log4j
8888
implementation 'org.apache.logging.log4j:log4j-core' // log4j
8989
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class ConnectorValidationUtilsTest extends Specification {
9494
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeG).build() || 1 || new InvalidEntityException("LineInput connects the same node, but shouldn't", invalidLine)
9595
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().subnet(5).build()).build() || 1 || new InvalidEntityException("LineInput connects different subnets, but shouldn't", invalidLine)
9696
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().voltLvl(GermanVoltageLevelUtils.MV_10KV).build()).build() || 1 || new InvalidEntityException("LineInput connects different voltage levels, but shouldn't", invalidLine)
97-
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || 1 || new InvalidEntityException("The following quantities have to be positive: 0.0 km", invalidLine)
97+
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || 1 || new InvalidEntityException("The following quantities have to be positive: 0 km", invalidLine)
9898
}
9999

100100
def "Smoke Test: Correct line type throws no exception"() {

0 commit comments

Comments
 (0)