diff --git a/app/build.gradle b/app/build.gradle index b5dbea99e..25c4f51cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ plugins { id 'groovy' id 'application' - id 'com.github.johnrengelman.shadow' version '8.0.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' } java { @@ -28,7 +28,7 @@ dependencies { testImplementation 'org.apache.groovy:groovy:4.0.23' testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' testImplementation 'com.openpojo:openpojo:0.9.1' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.16.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17' } jacocoTestCoverageVerification { diff --git a/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java b/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java index cb39882f3..38914b657 100644 --- a/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java +++ b/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java @@ -35,8 +35,11 @@ public static RequestSessionTokenUsecase getInstance() { private RequestSessionTokenUsecase() {} public String getToken(AuthRequest request) - throws InvalidTokenException, IllegalArgumentException, TokenGenerationException, - SecretRetrievalException, UnknownOrganizationException { + throws InvalidTokenException, + IllegalArgumentException, + TokenGenerationException, + SecretRetrievalException, + UnknownOrganizationException { logger.logInfo("Validating that organization {} exists", request.scope()); var organization = diff --git a/build.gradle b/build.gradle index d222aed6c..2789dca40 100644 --- a/build.gradle +++ b/build.gradle @@ -11,10 +11,10 @@ plugins { id 'java' id 'jacoco' id 'jacoco-report-aggregation' - id 'com.diffplug.spotless' version '6.11.0' - id 'com.github.johnrengelman.shadow' version '8.0.0' - id 'org.cyclonedx.bom' version '1.7.4' - id 'org.sonarqube' version '5.0.0.4638' + id 'com.diffplug.spotless' version '6.25.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'org.cyclonedx.bom' version '1.10.0' + id 'org.sonarqube' version '5.1.0.4882' } dependencies { diff --git a/e2e/build.gradle b/e2e/build.gradle index 9157b4918..d803e8c8c 100644 --- a/e2e/build.gradle +++ b/e2e/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.4' //jackson - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.18.0' implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' //fhir diff --git a/etor/build.gradle b/etor/build.gradle index b589992ce..f00a67581 100644 --- a/etor/build.gradle +++ b/etor/build.gradle @@ -19,7 +19,7 @@ dependencies { testImplementation 'org.apache.groovy:groovy:4.0.23' testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' testImplementation 'com.openpojo:openpojo:0.9.1' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.16.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17' } jacocoTestCoverageVerification { diff --git a/shared/build.gradle b/shared/build.gradle index 4d63a9528..8d898580a 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -22,10 +22,10 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:8.0' //jackson - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.18.0' implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0' //fhir api 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.2' @@ -51,7 +51,7 @@ dependencies { testFixturesImplementation 'org.apache.groovy:groovy:4.0.23' testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' testFixturesImplementation 'com.openpojo:openpojo:0.9.1' - testFixturesImplementation 'nl.jqno.equalsverifier:equalsverifier:3.16.2' + testFixturesImplementation 'nl.jqno.equalsverifier:equalsverifier:3.17' // dotenv-java implementation 'io.github.cdimascio:dotenv-java:3.0.2' diff --git a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelperTest.groovy b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelperTest.groovy index 528381e9a..69ea61d19 100644 --- a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelperTest.groovy +++ b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelperTest.groovy @@ -849,6 +849,5 @@ class HapiHelperTest extends Specification { then: ext.getValue() == null - } } diff --git a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/KeyCacheTest.groovy b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/KeyCacheTest.groovy index 5666c6fed..f994defaa 100644 --- a/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/KeyCacheTest.groovy +++ b/shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/KeyCacheTest.groovy @@ -41,7 +41,6 @@ class KeyCacheTest extends Specification { then: keys.size() == threadsNum // one key per thread keys.values().toSet().size() == 1 // all entries have same value, threads had to wait on the lock - } def "keyCache removal works"() {