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

Platform/david navapbc/21nov24/dependabot #16625

Merged
merged 23 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
30de243
Bump jacksonVersion from 2.18.0 to 2.18.1 in /prime-router
dependabot[bot] Nov 3, 2024
f4abf9f
Bump com.microsoft.azure:applicationinsights-web in /submissions
dependabot[bot] Nov 3, 2024
72bdf59
Bump com.microsoft.azure:applicationinsights-runtime-attach
dependabot[bot] Nov 3, 2024
52eea66
Bump com.azure.spring:spring-cloud-azure-dependencies in /auth
dependabot[bot] Nov 5, 2024
5834c17
Bump the hapifhir group across 1 directory with 3 updates
dependabot[bot] Nov 17, 2024
3b00923
Bump the bouncycastle group in /prime-router with 3 updates
dependabot[bot] Nov 17, 2024
c76addf
Bump the flyway group across 1 directory with 3 updates
dependabot[bot] Nov 17, 2024
7488f67
Bump com.googlecode.libphonenumber:libphonenumber in /prime-router
dependabot[bot] Nov 17, 2024
9f3837b
Bump com.nimbusds:nimbus-jose-jwt from 9.41.1 to 9.47 in /prime-router
dependabot[bot] Nov 17, 2024
f5d7ac6
Bump com.azure:azure-identity from 1.14.0 to 1.14.2 in /prime-router
dependabot[bot] Nov 17, 2024
fb40ec1
Bump com.zaxxer:HikariCP from 6.0.0 to 6.2.0 in /prime-router
dependabot[bot] Nov 17, 2024
6c7add8
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
Nov 21, 2024
d3c825a
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
Nov 21, 2024
4e0e2dd
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
Nov 21, 2024
ceba70b
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/c…
Nov 21, 2024
ca31b6b
merge conflict
Nov 21, 2024
a674c5f
more merge conflicts
Nov 21, 2024
cfacc83
Merge remote-tracking branch 'origin/dependabot/gradle/submissions/co…
Nov 21, 2024
2c74a27
still more merge conflicts
Nov 21, 2024
7a95784
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/j…
Nov 21, 2024
835b67f
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/b…
Nov 21, 2024
f7ac442
Merge remote-tracking branch 'origin/dependabot/gradle/prime-router/h…
Nov 21, 2024
ed63fd1
Merge branch 'main' into platform/david-navapbc/21nov24/dependabot
jack-h-wang Nov 22, 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
2 changes: 1 addition & 1 deletion auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ configurations.all {

dependencyManagement {
imports {
mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.17.1")
mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.18.0")
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.3")
}
}
Expand Down
30 changes: 15 additions & 15 deletions prime-router/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts"))
plugins {
val kotlinVersion by System.getProperties()
id("reportstream.project-conventions")
id("org.flywaydb.flyway") version "10.18.2"
id("org.flywaydb.flyway") version "10.21.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"
Expand Down Expand Up @@ -75,7 +75,7 @@ val javaVersion = when (appJvmTarget) {
}
val ktorVersion = "2.3.12"
val kotlinVersion by System.getProperties()
val jacksonVersion = "2.18.0"
val jacksonVersion = "2.18.1"
jacoco.toolVersion = "0.8.12"

// Local database information, first one wins:
Expand Down Expand Up @@ -840,7 +840,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.18.2")
classpath("org.flywaydb:flyway-database-postgresql:10.21.0")
}
}

Expand Down Expand Up @@ -872,11 +872,11 @@ dependencies {
exclude(group = "com.azure", module = "azure-core")
exclude(group = "com.azure", module = "azure-core-http-netty")
}
implementation("com.azure:azure-identity:1.14.0") {
implementation("com.azure:azure-identity:1.14.2") {
exclude(group = "com.azure", module = "azure-core")
exclude(group = "com.azure", module = "azure-core-http-netty")
}
implementation("com.nimbusds:nimbus-jose-jwt:9.41.1")
implementation("com.nimbusds:nimbus-jose-jwt:9.47")
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")
Expand All @@ -898,17 +898,17 @@ dependencies {
branch = "master"
}
}
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.2")
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.5")
// https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-caching-caffeine
implementation("ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.2")
implementation("ca.uhn.hapi.fhir:hapi-fhir-client:7.4.2")
implementation("ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:7.4.5")
implementation("ca.uhn.hapi.fhir:hapi-fhir-client:7.4.5")
// pin
implementation("ca.uhn.hapi.fhir:org.hl7.fhir.utilities:6.4.0")
implementation("ca.uhn.hapi.fhir:org.hl7.fhir.r4:6.4.0")
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.46")
implementation("com.googlecode.libphonenumber:libphonenumber:8.13.50")
implementation("org.thymeleaf:thymeleaf:3.1.2.RELEASE")
implementation("com.sendgrid:sendgrid-java:4.10.3")
implementation("com.okta.jwt:okta-jwt-verifier:0.5.7")
Expand All @@ -923,15 +923,15 @@ dependencies {
implementation("commons-codec:commons-codec:1.17.1")
implementation("commons-io:commons-io:2.17.0")
implementation("org.postgresql:postgresql:42.7.4")
implementation("com.zaxxer:HikariCP:6.0.0")
implementation("org.flywaydb:flyway-core:10.18.2")
implementation("org.flywaydb:flyway-database-postgresql:10.18.2")
implementation("com.zaxxer:HikariCP:6.2.0")
implementation("org.flywaydb:flyway-core:10.21.0")
implementation("org.flywaydb:flyway-database-postgresql:10.21.0")
implementation("org.commonmark:commonmark:0.24.0")
implementation("com.google.guava:guava:33.3.1-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")
implementation("org.bouncycastle:bcmail-jdk15to18:1.78.1")
implementation("org.bouncycastle:bcprov-jdk15to18:1.79")
implementation("org.bouncycastle:bcprov-jdk18on:1.79")
implementation("org.bouncycastle:bcmail-jdk15to18:1.79")

implementation("commons-net:commons-net:3.11.1")
implementation("com.cronutils:cron-utils:9.2.1")
Expand Down
4 changes: 2 additions & 2 deletions submissions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dependencies {
implementation("org.springframework.security:spring-security-oauth2-jose:6.3.4")

implementation("com.azure.spring:spring-cloud-azure-starter-storage")
implementation("com.microsoft.azure:applicationinsights-runtime-attach:3.5.4")
implementation("com.microsoft.azure:applicationinsights-web:3.5.4")
implementation("com.microsoft.azure:applicationinsights-runtime-attach:3.6.2")
implementation("com.microsoft.azure:applicationinsights-web:3.6.2")
implementation("com.microsoft.azure:applicationinsights-logging-logback:2.6.4")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("org.jetbrains.kotlin:kotlin-reflect")
Expand Down