Skip to content

Commit

Permalink
Merge pull request #315 from NOAA-OWP/github_313
Browse files Browse the repository at this point in the history
GitHub 313
  • Loading branch information
HankHerr-NOAA authored Sep 13, 2024
2 parents ff04fd5 + 8c6f714 commit 80977b3
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
118 changes: 59 additions & 59 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ plugins {
id 'org.kordamp.gradle.markdown' version '2.2.0'

// To generate API documentation from JAX-RS annotations and javadocs
id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.22"
id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.23"

// To generate JPMS images more easily with 3rd-party "automatic" modules
id 'org.beryx.jlink' version '2.26.0'
Expand Down Expand Up @@ -238,10 +238,10 @@ project(':wres-system') {
dependencies {
implementation 'org.slf4j:slf4j-api:2.0.13'

implementation 'org.apache.commons:commons-lang3:3.16.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'

// to use native postgres copy, need this on compile, otherwise runtime
implementation('org.postgresql:postgresql:42.7.3') {
implementation('org.postgresql:postgresql:42.7.4') {
// Not used at runtime, bloat
exclude group: 'org.checkerframework', module: 'checker-qual'
}
Expand Down Expand Up @@ -292,11 +292,11 @@ project(':wres-datamodel') {
implementation project(':wres-config')
api project(':wres-statistics')

api 'org.apache.commons:commons-lang3:3.16.0'
api 'org.apache.commons:commons-lang3:3.17.0'

implementation 'org.slf4j:slf4j-api:2.0.13'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand All @@ -315,13 +315,13 @@ project(':wres-datamodel') {
implementation 'systems.uom:systems-quantity:2.1'

// For geometries
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0'
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.20.0'

// JCIP annotations
compileOnly group: 'net.jcip', name: 'jcip-annotations', version: '1.0'

// Mocking help
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'

// JUnit 5 API and runtime
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
Expand Down Expand Up @@ -362,7 +362,7 @@ project(':wres-io') {
implementation 'com.google.guava:guava:33.3.0-jre'

// to use native postgres copy, need this on compile, otherwise runtime
implementation('org.postgresql:postgresql:42.7.3') {
implementation('org.postgresql:postgresql:42.7.4') {
// Not used at runtime, bloat
exclude group: 'org.checkerframework', module: 'checker-qual'
}
Expand All @@ -386,10 +386,10 @@ project(':wres-io') {
}

// For geometries
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.19.0', ext: 'pom'
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.20.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.20.0', ext: 'pom'

implementation 'org.liquibase:liquibase-core:4.29.1'
implementation 'org.liquibase:liquibase-core:4.29.2'

// Use instead of the bridge between JUL and SLF4J. #60801-283
runtimeOnly 'com.mattbertolini:liquibase-slf4j:5.0.0'
Expand Down Expand Up @@ -546,8 +546,8 @@ project(':wres-writing') {
implementation 'org.apache.tika:tika-core:2.9.2'

// For geometries
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.19.0', ext: 'pom'
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.20.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.20.0', ext: 'pom'

compileOnly 'net.jcip:jcip-annotations:1.0'

Expand Down Expand Up @@ -603,15 +603,15 @@ project(':wres-reading') {


// For geometries
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.19.0', ext: 'pom'
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.20.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.20.0', ext: 'pom'

// Fast-Infoset encoded XML
implementation group: 'com.sun.xml.fastinfoset', name: 'FastInfoset', version: '2.1.1'

implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'

implementation 'org.liquibase:liquibase-core:4.29.1'
implementation 'org.liquibase:liquibase-core:4.29.2'

// Use instead of the bridge between JUL and SLF4J. #60801-283
runtimeOnly 'com.mattbertolini:liquibase-slf4j:5.0.0'
Expand Down Expand Up @@ -666,12 +666,12 @@ project(':wres-metrics') {

compileOnly 'net.jcip:jcip-annotations:1.0'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}

testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'

// JUnit 5 API and runtime
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
Expand Down Expand Up @@ -790,7 +790,7 @@ project(':wres-statistics') {

implementation 'org.slf4j:slf4j-api:2.0.13'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand Down Expand Up @@ -894,17 +894,17 @@ project(':wres-vis') {
implementation project(':wres-eventsbroker')
implementation project(':wres-events')

implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
implementation group: 'com.sun.xml.fastinfoset', name: 'FastInfoset', version: '2.1.1'

implementation 'org.slf4j:slf4j-api:2.0.13'

implementation group: 'org.jfree', name: 'jfreechart', version: '1.5.4'
implementation group: 'org.jfree', name: 'jfreechart', version: '1.5.5'

// SVG graphics from JFreeChart instances
implementation group: 'org.jfree', name: 'org.jfree.svg', version: '4.1'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand All @@ -921,7 +921,7 @@ project(':wres-vis') {
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.11.0'

// Mocking help
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'

testRuntimeOnly files('dist/lib/conf')

Expand All @@ -943,7 +943,7 @@ project(':wres-config') {
implementation project(':wres-statistics')
implementation 'org.slf4j:slf4j-api:2.0.13'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand Down Expand Up @@ -980,13 +980,13 @@ project(':wres-config') {
implementation 'com.google.guava:guava:33.3.0-jre'

// To validate WKT strings as geometries
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.19.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.19.0', ext: 'pom'
implementation group: 'org.locationtech.jts', name: 'jts-core', version: '1.20.0'
implementation group: 'org.locationtech.jts', name: 'jts-io', version: '1.20.0', ext: 'pom'

// Protobuf utilities
implementation 'com.google.protobuf:protobuf-java-util:3.21.12'

implementation 'org.apache.commons:commons-lang3:3.16.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'

// For reading CSV thresholds
implementation group: 'com.opencsv', name: 'opencsv', version: '5.9'
Expand Down Expand Up @@ -1025,7 +1025,7 @@ project(':wres-config') {
implementation group: 'org.jvnet.jaxb2_commons', name: 'jaxb2-basics-annotate', version: '1.1.0'

// Mocking help
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
Expand Down Expand Up @@ -1192,7 +1192,7 @@ project(':wres-worker') {
implementation 'org.slf4j:slf4j-api:2.0.13'
implementation 'com.rabbitmq:amqp-client:5.21.0'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand Down Expand Up @@ -1347,23 +1347,23 @@ project(':wres-tasker') {
implementation 'commons-codec:commons-codec:1.17.1'

// Server library to run a web server:
implementation 'org.eclipse.jetty:jetty-server:11.0.20'
implementation 'org.eclipse.jetty:jetty-server:11.0.24'

// Support HTTP/2
implementation 'org.eclipse.jetty.http2:http2-server:11.0.22'
implementation 'org.eclipse.jetty.http2:http2-server:11.0.24'

// Support ALPN
implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.21'
implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.24'

// Servlet container library to run a web application with:
implementation 'org.eclipse.jetty:jetty-webapp:11.0.22'
implementation 'org.eclipse.jetty:jetty-webapp:11.0.24'

// Needed at compile-time to reference ServletContainer.class and
// DefaultServlet.class
implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.6'
implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.8'

// To handle multipart post
implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.6'
implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.8'

// To temporarily cache/store-in-RAM job metadata when redis unavailable
implementation('com.github.ben-manes.caffeine:caffeine:3.1.8') {
Expand Down Expand Up @@ -1398,21 +1398,21 @@ project(':wres-tasker') {
implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'

// For ToStringBuilder
implementation 'org.apache.commons:commons-lang3:3.16.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'

// To send/receive messages
implementation 'com.google.protobuf:protobuf-java:3.21.12'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}

runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.6'
runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.8'

// Needed to prevent "java.lang.IllegalStateException: InjectionManagerFactory not found."
// Thanks, https://luohuahuang.org/2017/11/13/jersey-illegalstateexception-injectionmanagerfactory/
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.6'
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.8'

testImplementation 'junit:junit:4.13.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.11.0'
Expand All @@ -1431,7 +1431,7 @@ project(':wres-tasker') {
testImplementation group: 'com.google.jimfs', name: 'jimfs', version: '1.3.0'

// To generate swagger's openapi.json at build time.
docGen 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22'
docGen 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.23'
}

apply plugin: 'application'
Expand Down Expand Up @@ -1503,13 +1503,13 @@ project(':wres-eventsbroker') {
dependencies {
implementation 'org.slf4j:slf4j-api:2.0.13'

implementation 'org.apache.commons:commons-lang3:3.16.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'

// Jakarta Messaging API
implementation group: 'jakarta.jms', name: 'jakarta.jms-api', version: '3.1.0'

// Apache ActiveMQ Artemis server
implementation('org.apache.activemq:artemis-server:2.36.0') {
implementation('org.apache.activemq:artemis-server:2.37.0') {
// TODO: remove when Artemis catches up

// Because we use slf4j, not jcl:
Expand Down Expand Up @@ -1538,7 +1538,7 @@ project(':wres-eventsbroker') {
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78.1'

// AMQP 1.0 protocol support for the ActiveMQ Artemis server
implementation('org.apache.activemq:artemis-amqp-protocol:2.36.0') {
implementation('org.apache.activemq:artemis-amqp-protocol:2.37.0') {
// Because we use slf4j, not jcl:
exclude group: 'commons-logging', module: 'commons-logging'

Expand All @@ -1549,7 +1549,7 @@ project(':wres-eventsbroker') {
// JCIP annotations
compileOnly group: 'net.jcip', name: 'jcip-annotations', version: '1.0'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand Down Expand Up @@ -1602,9 +1602,9 @@ project(':wres-events') {
implementation group: 'io.netty', name: 'netty-all', version: '4.1.111.Final'

// For various utilities
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand All @@ -1614,7 +1614,7 @@ project(':wres-events') {
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0'

// Mocking help
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'
// Mocking final classes
testImplementation 'org.mockito:mockito-inline:5.2.0'

Expand All @@ -1635,7 +1635,7 @@ project(':wres-http') {
// Better-than-Java's HTTP client
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

implementation 'org.apache.commons:commons-lang3:3.16.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'

// Update vulnerable kotlin-stdlib that okhttp/okio uses
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
Expand Down Expand Up @@ -1879,14 +1879,14 @@ dependencies {
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'

// Servlet container library to run a web application with:
implementation 'org.eclipse.jetty:jetty-webapp:11.0.22'
implementation 'org.eclipse.jetty:jetty-webapp:11.0.24'

// Needed at compile-time to reference ServletContainer.class and
// DefaultServlet.class
implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.6'
implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.8'

// Jetty server
implementation 'org.eclipse.jetty:jetty-server:11.0.20'
implementation 'org.eclipse.jetty:jetty-server:11.0.24'

implementation('com.github.ben-manes.caffeine:caffeine:3.1.8') {
// Not used at runtime, bloat
Expand Down Expand Up @@ -1918,20 +1918,20 @@ dependencies {
// JCIP annotations
compileOnly group: 'net.jcip', name: 'jcip-annotations', version: '1.0'

runtimeOnly 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.6'
runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.6'
runtimeOnly 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.8'
runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.8'
// currently locked at this version, check this ticket for more information
// https://vlab.***REMOVED***/redmine/issues/124200
runtimeOnly 'org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3'
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.6'
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.8'

// Support HTTP/2
implementation 'org.eclipse.jetty.http2:http2-server:11.0.22'
implementation 'org.eclipse.jetty.http2:http2-server:11.0.24'

// Support ALPN
implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.20'
implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.24'

runtimeOnly('ch.qos.logback:logback-classic:1.5.7') {
runtimeOnly('ch.qos.logback:logback-classic:1.5.8') {
// Not used at runtime, bloat
exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework'
}
Expand All @@ -1950,7 +1950,7 @@ dependencies {
testCompileOnly 'junit:junit:4.13.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.11.0'

testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.mockito:mockito-core:5.13.0'

testImplementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
}
Expand Down Expand Up @@ -2122,4 +2122,4 @@ configurations.runtimeOnly {
exclude group: 'org.jboss.logmanager', module: 'jboss-logmanager'
}

defaultTasks 'installDist', 'test', 'javadoc'
defaultTasks 'installDist', 'test', 'javadoc'
2 changes: 1 addition & 1 deletion wres-broker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rabbitmq:3.13.6-management-alpine
FROM rabbitmq:3.13.7-management-alpine

# Wish we could do the following, but busybox does not support long gids:
#RUN addgroup -g 1370800073 wres && adduser -D -u 498 -g 1370800073 wres_docker
Expand Down
Loading

0 comments on commit 80977b3

Please sign in to comment.