Skip to content

Commit

Permalink
Merge pull request #15903 from CDCgov/platform/thetaurean/mass-depend…
Browse files Browse the repository at this point in the history
…abots

Resolve open backend dependabots
  • Loading branch information
thetaurean committed Sep 24, 2024
2 parents 64cc62d + 0dd2d0b commit e5cd452
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
54 changes: 27 additions & 27 deletions prime-router/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts"))
plugins {
val kotlinVersion by System.getProperties()
id("reportstream.project-conventions")
id("org.flywaydb.flyway") version "10.17.0"
id("org.flywaydb.flyway") version "10.18.0"
id("nu.studer.jooq") version "9.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.microsoft.azure.azurefunctions") version "1.16.1"
id("com.adarshr.test-logger") version "4.0.0"
id("jacoco")
id("org.jetbrains.dokka") version "1.8.20"
id("com.avast.gradle.docker-compose") version "0.17.7"
id("com.avast.gradle.docker-compose") version "0.17.8"
id("org.jetbrains.kotlin.plugin.serialization") version "$kotlinVersion"
id("com.nocwriter.runsql") version ("1.0.3")
id("io.swagger.core.v3.swagger-gradle-plugin") version "2.2.22"
id("io.swagger.core.v3.swagger-gradle-plugin") version "2.2.23"
}

group = "gov.cdc.prime.reportstream"
Expand All @@ -65,7 +65,7 @@ val javaVersion = when (appJvmTarget) {
}
val ktorVersion = "2.3.12"
val kotlinVersion by System.getProperties()
val jacksonVersion = "2.17.1"
val jacksonVersion = "2.17.2"
jacoco.toolVersion = "0.8.12"

// Local database information, first one wins:
Expand Down Expand Up @@ -805,7 +805,7 @@ buildscript {
// will need to be removed once this issue is resolved in Maven.
classpath("net.minidev:json-smart:2.5.1")
// as per flyway v10 docs the postgres flyway module must be on the project buildpath
classpath("org.flywaydb:flyway-database-postgresql:10.17.0")
classpath("org.flywaydb:flyway-database-postgresql:10.18.0")
}
}

Expand All @@ -818,37 +818,37 @@ configurations {
}

dependencies {
jooqGenerator("org.postgresql:postgresql:42.7.3")
jooqGenerator("org.postgresql:postgresql:42.7.4")

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("com.microsoft.azure.functions:azure-functions-java-library:3.1.0")
implementation("com.azure:azure-core:1.51.0")
implementation("com.azure:azure-core-http-netty:1.15.3")
implementation("com.azure:azure-core:1.52.0")
implementation("com.azure:azure-core-http-netty:1.15.4")
implementation("com.azure:azure-storage-blob:12.27.0") {
exclude(group = "com.azure", module = "azure-core")
}
implementation("com.azure:azure-storage-queue:12.22.0") {
exclude(group = "com.azure", module = "azure-core")
}
implementation("com.azure:azure-security-keyvault-secrets:4.8.5") {
implementation("com.azure:azure-security-keyvault-secrets:4.8.6") {
exclude(group = "com.azure", module = "azure-core")
exclude(group = "com.azure", module = "azure-core-http-netty")
}
implementation("com.azure:azure-identity:1.13.2") {
implementation("com.azure:azure-identity:1.13.3") {
exclude(group = "com.azure", module = "azure-core")
exclude(group = "com.azure", module = "azure-core-http-netty")
}
implementation("com.nimbusds:nimbus-jose-jwt:9.40")
implementation("org.apache.logging.log4j:log4j-api:2.23.1")
implementation("org.apache.logging.log4j:log4j-core:2.23.1")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
implementation("org.apache.logging.log4j:log4j-layout-template-json:2.23.1")
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.4.0")
implementation("com.nimbusds:nimbus-jose-jwt:9.41.1")
implementation("org.apache.logging.log4j:log4j-api:2.24.0")
implementation("org.apache.logging.log4j:log4j-core:2.24.0")
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.0")
implementation("org.apache.logging.log4j:log4j-layout-template-json:2.24.0")
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.9.3")
implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.10.0")
implementation("tech.tablesaw:tablesaw-core:0.43.1")
implementation("com.github.ajalt.clikt:clikt-jvm:4.4.0")

Expand All @@ -857,7 +857,7 @@ dependencies {
implementation("com.github.javafaker:javafaker:1.0.2") {
exclude(group = "org.yaml", module = "snakeyaml")
}
implementation("org.yaml:snakeyaml:2.2")
implementation("org.yaml:snakeyaml:2.3")
implementation("io.github.linuxforhealth:hl7v2-fhir-converter") {
version {
branch = "master"
Expand All @@ -873,7 +873,7 @@ dependencies {
implementation("ca.uhn.hapi:hapi-base:2.5.1")
implementation("ca.uhn.hapi:hapi-structures-v251:2.5.1")
implementation("ca.uhn.hapi:hapi-structures-v27:2.5.1")
implementation("com.googlecode.libphonenumber:libphonenumber:8.13.42")
implementation("com.googlecode.libphonenumber:libphonenumber:8.13.46")
implementation("org.thymeleaf:thymeleaf:3.1.2.RELEASE")
implementation("com.sendgrid:sendgrid-java:4.10.2")
implementation("com.okta.jwt:okta-jwt-verifier:0.5.7")
Expand All @@ -887,12 +887,12 @@ dependencies {
implementation("org.apache.commons:commons-text:1.12.0")
implementation("commons-codec:commons-codec:1.17.1")
implementation("commons-io:commons-io:2.16.1")
implementation("org.postgresql:postgresql:42.7.3")
implementation("org.postgresql:postgresql:42.7.4")
implementation("com.zaxxer:HikariCP:5.1.0")
implementation("org.flywaydb:flyway-core:10.17.0")
implementation("org.flywaydb:flyway-database-postgresql:10.17.0")
implementation("org.flywaydb:flyway-core:10.18.0")
implementation("org.flywaydb:flyway-database-postgresql:10.18.0")
implementation("org.commonmark:commonmark:0.22.0")
implementation("com.google.guava:guava:33.2.1-jre")
implementation("com.google.guava:guava:33.3.0-jre")
implementation("com.helger.as2:as2-lib:5.1.2")
implementation("org.bouncycastle:bcprov-jdk15to18:1.78.1")
implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
Expand All @@ -915,14 +915,14 @@ dependencies {
implementation("it.skrape:skrapeit-http-fetcher:1.3.0-alpha.2")
implementation("org.apache.poi:poi:5.3.0")
implementation("org.apache.poi:poi-ooxml:5.3.0")
implementation("org.apache.commons:commons-compress:1.26.2")
implementation("org.apache.commons:commons-compress:1.27.1")
implementation("commons-io:commons-io:2.16.1")
implementation("com.anyascii:anyascii:0.3.2")
// force jsoup since [email protected]+ has not updated
implementation("org.jsoup:jsoup:1.18.1")
// https://mvnrepository.com/artifact/io.swagger/swagger-annotations
implementation("io.swagger:swagger-annotations:1.6.14")
implementation("io.swagger.core.v3:swagger-jaxrs2:2.2.22")
implementation("io.swagger.core.v3:swagger-jaxrs2:2.2.23")
// https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api
implementation("javax.ws.rs:javax.ws.rs-api:2.1.1")
// https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
Expand All @@ -948,7 +948,7 @@ dependencies {
implementation("io.konform:konform-jvm:0.4.0")

runtimeOnly("com.okta.jwt:okta-jwt-verifier-impl:0.5.7")
runtimeOnly("com.squareup.okio:okio:3.9.0")
runtimeOnly("com.squareup.okio:okio:3.9.1")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")

Expand Down
4 changes: 2 additions & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ repositories {
}

dependencies {
implementation("org.apache.commons:commons-lang3:3.15.0")
implementation("org.apache.commons:commons-lang3:3.17.0")
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1")
testImplementation("org.apache.commons:commons-compress:1.26.2")
testImplementation("org.apache.commons:commons-compress:1.27.1")
}

tasks.test {
Expand Down
8 changes: 4 additions & 4 deletions submissions/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply(from = rootProject.file("buildSrc/shared.gradle.kts"))

plugins {
id("org.springframework.boot") version "3.3.2"
id("org.springframework.boot") version "3.3.4"
id("io.spring.dependency-management") version "1.1.6"
id("reportstream.project-conventions")
kotlin("plugin.spring") version "2.0.0"
kotlin("plugin.spring") version "2.0.20"
}

group = "gov.cdc.prime"
Expand All @@ -29,9 +29,9 @@ dependencies {
testImplementation("org.xmlunit:xmlunit-core:2.10.0")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
testImplementation("org.apache.commons:commons-compress:1.26.2")
testImplementation("org.apache.commons:commons-compress:1.27.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.8.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.9.0")
implementation(project(":shared"))
}

Expand Down

0 comments on commit e5cd452

Please sign in to comment.