Skip to content

Commit

Permalink
Merge branch 'dev' into ms/#1112-confusing-error-message-on-deprecate…
Browse files Browse the repository at this point in the history
…d-input-data
  • Loading branch information
staudtMarius authored Nov 25, 2024
2 parents 11a484a + 4abf08b commit 4c2537c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'de.undercouch.download' version '5.6.0'
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
id 'jacoco' // java code coverage plugin
id "org.sonarqube" version "5.1.0.4882" // sonarqube
id "org.sonarqube" version "6.0.0.5145" // sonarqube
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
}

Expand All @@ -18,7 +18,7 @@ ext {
javaVersion = JavaVersion.VERSION_17
groovyVersion = "4.0"
groovyBinaryVersion = "4.0.24"
testcontainersVersion = '1.20.3'
testcontainersVersion = '1.20.4'

scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
}
Expand Down Expand Up @@ -55,7 +55,7 @@ dependencies {
// ie³ power system utils
implementation 'com.github.ie3-institute:PowerSystemUtils:2.2.1'

implementation 'tech.units:indriya:2.2'
implementation 'tech.units:indriya:2.2.1'

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

// logging
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.1')
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.2')
implementation 'org.apache.logging.log4j:log4j-api' // log4j
implementation 'org.apache.logging.log4j:log4j-core' // log4j
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class ConnectorValidationUtilsTest extends Specification {
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeG).build() || 1 || new InvalidEntityException("LineInput connects the same node, but shouldn't", invalidLine)
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().subnet(5).build()).build() || 1 || new InvalidEntityException("LineInput connects different subnets, but shouldn't", invalidLine)
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)
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || 1 || new InvalidEntityException("The following quantities have to be positive: 0.0 km", invalidLine)
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || 1 || new InvalidEntityException("The following quantities have to be positive: 0 km", invalidLine)
}

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

0 comments on commit 4c2537c

Please sign in to comment.