Skip to content

Commit d9cfd8c

Browse files
authored
Merge branch 'dev' into ms/#1007-refactor-CsvFileConnector-and-CsvDataSource
2 parents 9a062f8 + 27a9fcf commit d9cfd8c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ dependencies {
8383
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
8484

8585
// logging
86-
implementation platform('org.apache.logging.log4j:log4j-bom:2.23.0')
86+
implementation platform('org.apache.logging.log4j:log4j-bom:2.23.1')
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
9090

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

9696
implementation 'commons-io:commons-io:2.15.1' // I/O functionalities
9797
implementation 'commons-codec:commons-codec:1.16.1' // needed by commons-compress
98-
implementation 'org.apache.commons:commons-compress:1.26.0' // I/O functionalities
98+
implementation 'org.apache.commons:commons-compress:1.26.1' // I/O functionalities
9999
}
100100

101101
tasks.withType(JavaCompile) {

docs/readthedocs/models/input/grid/line.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ Representation of an AC line.
2929
3030
* - x
3131
- Ω / km
32-
- Phase resistance per length
32+
- Phase reactance per length
3333
3434
* - g
3535
- µS / km
3636
- Phase-to-ground conductance per length
3737
3838
* - b
3939
- µS / km
40-
- Phase-to-ground conductance per length
40+
- Phase-to-ground susceptance per length
4141
4242
* - iMax
4343
- A

0 commit comments

Comments
 (0)