Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve open backend dependabots #15903

Merged
merged 48 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f4e7217
Bump plugin.spring from 2.0.0 to 2.0.20 in /submissions
dependabot[bot] Aug 25, 2024
f49ae78
Bump org.apache.commons:commons-compress in /submissions
dependabot[bot] Aug 25, 2024
d047a18
Bump org.apache.commons:commons-compress in /shared
dependabot[bot] Aug 25, 2024
1b6da35
Bump org.yaml:snakeyaml from 2.2 to 2.3 in /prime-router
dependabot[bot] Sep 1, 2024
d0e4586
Bump com.avast.gradle.docker-compose in /prime-router
dependabot[bot] Sep 1, 2024
5ef65d7
Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 in /shared
dependabot[bot] Sep 1, 2024
f111a44
Bump com.googlecode.libphonenumber:libphonenumber in /prime-router
dependabot[bot] Sep 8, 2024
a0263ec
Bump the log4j group across 1 directory with 5 updates
dependabot[bot] Sep 15, 2024
70df806
Bump the swagger group in /prime-router with 2 updates
dependabot[bot] Sep 15, 2024
4c344c4
Bump the flyway group across 1 directory with 3 updates
dependabot[bot] Sep 15, 2024
9dcccd5
Bump the azurecore group in /prime-router with 2 updates
dependabot[bot] Sep 15, 2024
1c4a772
Bump com.squareup.okio:okio from 3.9.0 to 3.9.1 in /prime-router
dependabot[bot] Sep 15, 2024
b33bdb7
Bump com.azure:azure-identity from 1.13.2 to 1.13.3 in /prime-router
dependabot[bot] Sep 15, 2024
f3fdb32
Bump com.nimbusds:nimbus-jose-jwt from 9.40 to 9.41.1 in /prime-router
dependabot[bot] Sep 15, 2024
87bd2b0
Bump org.jetbrains.kotlinx:kotlinx-coroutines-core in /prime-router
dependabot[bot] Sep 15, 2024
9bd61ee
Bump org.jetbrains.kotlinx:kotlinx-coroutines-reactor in /submissions
dependabot[bot] Sep 15, 2024
1633ccf
Merge remote-tracking branch 'origin/dependabot/gradle/submissions/or…
thetaurean Sep 17, 2024
a5dd3ec
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/o…
thetaurean Sep 17, 2024
605de1d
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 17, 2024
ac2ed7d
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 17, 2024
ed2ec47
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 17, 2024
a6c1d65
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/a…
thetaurean Sep 17, 2024
f209bc9
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/f…
thetaurean Sep 17, 2024
80fc204
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 17, 2024
fa01800
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/l…
thetaurean Sep 17, 2024
1716538
Merge remote-tracking branch 'origin/dependabot/gradle/shared/org.apa…
thetaurean Sep 17, 2024
ba0dc34
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 17, 2024
984eb47
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/o…
thetaurean Sep 17, 2024
f396416
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/s…
thetaurean Sep 17, 2024
8f681a0
Merge remote-tracking branch 'origin/dependabot/gradle/shared/org.apa…
thetaurean Sep 17, 2024
1a3939a
Merge remote-tracking branch 'origin/dependabot/gradle/submissions/or…
thetaurean Sep 17, 2024
c55e53d
Merge remote-tracking branch 'origin/dependabot/gradle/submissions/pl…
thetaurean Sep 17, 2024
5bccd6c
Bump org.apache.commons:commons-compress in /prime-router
dependabot[bot] Aug 25, 2024
707e70d
Bump com.azure:azure-security-keyvault-secrets in /prime-router
dependabot[bot] Aug 25, 2024
0d231c4
Bump org.postgresql:postgresql from 42.7.3 to 42.7.4 in /prime-router
dependabot[bot] Aug 25, 2024
4ebedda
Bump com.google.guava:guava in /prime-router
dependabot[bot] Aug 18, 2024
0ba7b32
Bump com.github.doyaaaaaken:kotlin-csv-jvm in /prime-router
dependabot[bot] Aug 18, 2024
8eedc3f
Bump jacksonVersion from 2.17.1 to 2.17.2 in /prime-router
dependabot[bot] Aug 9, 2024
efa882c
Authentication Microservice POC (#15765)
jalbinson Sep 17, 2024
cfbf459
Bump azure-storage/azurite in /.environment/docker/docker-compose (#1…
dependabot[bot] Sep 17, 2024
e1207fb
ktlint
snesm Sep 17, 2024
0cc894c
Bump com.googlecode.libphonenumber:libphonenumber in /prime-router
dependabot[bot] Sep 22, 2024
c1ec132
Bump org.springframework.boot from 3.3.2 to 3.3.4 in /submissions
dependabot[bot] Sep 22, 2024
775776e
Merge branch 'master' into platform/thetaurean/mass-dependabots
thetaurean Sep 23, 2024
969e7e0
Merge remote-tracking branch 'origin/dependabot/gradle/submissions/or…
thetaurean Sep 23, 2024
cd56f93
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
thetaurean Sep 23, 2024
23c6d6c
Merge branch 'master' into platform/thetaurean/mass-dependabots
thetaurean Sep 24, 2024
0dd2d0b
Merge branch 'master' into platform/thetaurean/mass-dependabots
snesm Sep 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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