Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/df/#1131-psdm-update-for-tap-wat…
Browse files Browse the repository at this point in the history
…er-demand' into df/#1131-psdm-update-for-tap-water-demand
  • Loading branch information
danielfeismann committed Aug 26, 2024
2 parents 91bea33 + 0af1f9d commit 5b12f0a
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 @@ -5,7 +5,7 @@ plugins {
id 'signing'
id 'pmd' // code check, working on source code
id 'com.diffplug.spotless' version '6.25.0' //code format
id 'com.github.spotbugs' version '6.0.19' // code check, working on byte code
id 'com.github.spotbugs' version '6.0.20' // code check, working on byte code
id 'de.undercouch.download' version '5.6.0'
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
id 'jacoco' // java code coverage plugin
Expand Down Expand Up @@ -70,7 +70,7 @@ dependencies {
// testing
testImplementation "org.apache.groovy:groovy:$groovyBinaryVersion"

testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
testImplementation 'net.bytebuddy:byte-buddy:1.14.18' // Mocks of classes
Expand All @@ -90,12 +90,12 @@ dependencies {

// Databases
implementation 'org.influxdb:influxdb-java:2.24'
implementation 'com.couchbase.client:java-client:3.7.1'
implementation 'com.couchbase.client:java-client:3.7.2'
runtimeOnly 'org.postgresql:postgresql:42.7.3' // postgresql jdbc driver required during runtime

implementation 'commons-io:commons-io:2.16.1' // I/O functionalities
implementation 'commons-codec:commons-codec:1.17.1' // needed by commons-compress
implementation 'org.apache.commons:commons-compress:1.26.2' // I/O functionalities
implementation 'org.apache.commons:commons-compress:1.27.0' // I/O functionalities
}

tasks.withType(JavaCompile) {
Expand Down
2 changes: 1 addition & 1 deletion docs/readthedocs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ commonmark==0.9.1
recommonmark==0.7.1
Sphinx==7.4.7
sphinx-rtd-theme==2.0.0
myst-parser==3.0.1
myst-parser==4.0.0
markdown-it-py==3.0.0

0 comments on commit 5b12f0a

Please sign in to comment.