[DCJ-400] Minor and patch dependency updates, inc. Spring Boot 3.2.4 -> 3.3.2 #1767
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,25 +22,25 @@ buildscript { | |
| dependencies { | ||
| classpath('io.swagger.codegen.v3:swagger-codegen:3.0.52') | ||
| // Required for gradle liquibase plugin | ||
| classpath ('org.liquibase:liquibase-core:4.29.1') | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| id 'com.google.cloud.tools.jib' version '3.4.3' | ||
| id 'org.liquibase.gradle' version '3.0.0' | ||
| id 'org.gradle.test-retry' version '1.5.10' | ||
| id 'antlr' | ||
| id 'org.hidetake.swagger.generator' version '2.19.2' | ||
| id 'org.springframework.boot' version '3.3.2' | ||
| id 'idea' | ||
| id 'java' | ||
| id 'io.spring.dependency-management' version '1.1.6' | ||
| id 'jacoco' | ||
| id 'com.diffplug.spotless' version '6.7.1' | ||
| id 'com.dorongold.task-tree' version '4.0.0' | ||
| // enables release info in sentry events | ||
| id 'com.gorylenko.gradle-git-properties' version '2.4.2' | ||
| id 'org.sonarqube' version '4.2.1.3168' | ||
| id 'com.srcclr.gradle' version '3.1.12' | ||
| } | ||
|
|
@@ -162,19 +162,13 @@ configurations { | |
| runtimeClasspath | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Now 4.1.111.Final. |
||
| dependencies { | ||
| implementation 'com.google.apis:google-api-services-serviceusage:v1-rev20230215-2.0.0' | ||
| implementation 'com.google.apis:google-api-services-appengine:v1-rev20230206-2.0.0' | ||
| implementation 'com.google.apis:google-api-services-oauth2:v2-rev20200213-2.0.0' | ||
| implementation 'com.google.apis:google-api-services-iam:v1-rev20230209-2.0.0' | ||
|
|
||
| implementation platform('com.google.cloud:libraries-bom:26.43.0') | ||
| implementation 'com.google.cloud:google-cloud-billing' | ||
| implementation 'com.google.cloud:google-cloud-resourcemanager' | ||
| implementation 'com.google.cloud:google-cloud-bigquery' | ||
|
|
@@ -184,13 +178,15 @@ dependencies { | |
| implementation 'com.google.cloud:spring-cloud-gcp-starter-logging:4.9.0' | ||
| implementation 'com.google.http-client:google-http-client' | ||
|
|
||
| implementation 'org.apache.commons:commons-compress:1.26.2' // For srcclr, jib plugin conflict | ||
| // More info: https://discuss.gradle.org/t/plugin-dependency-conflict-with-jib-and-srcclr/42355 | ||
| implementation 'org.apache.commons:commons-dbcp2' // For database connection support | ||
| implementation 'org.apache.commons:commons-lang3' | ||
| implementation 'org.apache.commons:commons-collections4' | ||
| implementation 'org.apache.directory.studio:org.apache.commons.io:2.4' | ||
| implementation 'org.apache.httpcomponents.client5:httpclient5' | ||
|
|
||
| implementation 'org.liquibase:liquibase-core' | ||
|
|
||
| implementation 'org.codehaus.janino:janino' // Provides if/else xml parsing for logback config | ||
| implementation 'org.springframework.boot:spring-boot-starter-web' | ||
|
|
@@ -201,90 +197,82 @@ dependencies { | |
| swaggerCodegen 'io.swagger.codegen.v3:swagger-codegen-cli' | ||
|
|
||
| implementation 'org.springframework:spring-jdbc' | ||
| implementation 'org.antlr:ST4:4.3.4' // String templating | ||
|
|
||
| implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' | ||
| implementation 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api' | ||
|
|
||
| implementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.3.jre17' | ||
|
|
||
| // For distributed locking of Spring @Scheduled tasks across multiple instances | ||
| implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:5.14.0' | ||
| implementation 'net.javacrumbs.shedlock:shedlock-spring:5.14.0' | ||
|
|
||
| implementation 'bio.terra:terra-common-lib:1.1.17-SNAPSHOT' | ||
| implementation 'org.broadinstitute.dsde.workbench:sam-client_2.13:v0.0.241' | ||
| implementation 'bio.terra:terra-policy-client:1.0.15-SNAPSHOT' | ||
| implementation 'bio.terra:terra-resource-buffer-client:0.198.42-SNAPSHOT' | ||
| implementation 'bio.terra:externalcreds-client-resttemplate:1.45.0-SNAPSHOT' | ||
|
|
||
| implementation 'org.glassfish.jersey.inject:jersey-hk2' | ||
|
|
||
| implementation 'com.squareup.okhttp3:okhttp' | ||
| implementation 'org.springframework.boot:spring-boot-starter-actuator' | ||
| implementation 'io.micrometer:micrometer-registry-prometheus' | ||
|
|
||
| implementation 'com.fasterxml.jackson.core:jackson-core' | ||
| implementation 'com.fasterxml.jackson.core:jackson-annotations' | ||
| implementation 'com.fasterxml.jackson.core:jackson-databind' | ||
|
|
||
| // Azure related dependencies | ||
| implementation 'com.azure:azure-identity:1.13.2' | ||
| implementation 'com.azure.resourcemanager:azure-resourcemanager:2.41.0' | ||
| implementation 'com.azure.resourcemanager:azure-resourcemanager-loganalytics:1.0.0' | ||
| implementation 'com.azure.resourcemanager:azure-resourcemanager-securityinsights:1.0.0-beta.4' | ||
| implementation 'com.azure:azure-storage-common:12.26.0' | ||
| implementation 'com.azure:azure-storage-file-datalake:12.20.0' | ||
| implementation 'com.azure:azure-data-tables:12.4.3' | ||
|
|
||
| implementation platform('io.sentry:sentry-bom:7.13.0') //import bom | ||
| implementation('io.sentry:sentry-spring-boot-starter-jakarta') | ||
| implementation('io.sentry:sentry-logback') | ||
|
|
||
| // OpenTelemetry @WithSpan annotations: | ||
| implementation 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.6.0' | ||
|
|
||
| testImplementation 'org.apache.parquet:parquet-common:1.14.1' | ||
|
There was a problem hiding this comment. For repeated values like this we could use a variable |
||
| testImplementation 'org.apache.parquet:parquet-hadoop:1.14.1' | ||
| testImplementation 'org.apache.parquet:parquet-hadoop-bundle:1.14.1' | ||
| testImplementation 'org.apache.parquet:parquet-encoding:1.14.1' | ||
| testImplementation 'org.apache.parquet:parquet-column:1.14.1' | ||
| testImplementation ('org.apache.hadoop:hadoop-common:3.4.0') { | ||
| exclude group: 'com.sun.jersey', module: 'jersey-core' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-servlet' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-json' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-server' | ||
| exclude group: 'org.slf4j', module: 'slf4j-reload4j' | ||
| } | ||
| testImplementation('org.apache.hadoop:hadoop-mapreduce-client-core:3.4.0') { | ||
| exclude group: 'com.sun.jersey', module: 'jersey-core' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-servlet' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-json' | ||
| exclude group: 'com.sun.jersey', module: 'jersey-server' | ||
| exclude group: 'org.slf4j', module: 'slf4j-reload4j' | ||
| } | ||
|
|
||
| testImplementation 'au.com.dius.pact.provider:junit5:4.6.12' | ||
| testImplementation 'au.com.dius.pact.provider:junit5spring:4.6.12' | ||
|
|
||
|
There was a problem hiding this comment. We use XML now, and logback hasn't supported groovy since 2021: https://logback.qos.ch/news.html#1.2.9 |
||
| antlr 'org.antlr:antlr4:4.13.2' | ||
|
|
||
| liquibaseRuntime 'org.liquibase:liquibase-core' | ||
| liquibaseRuntime 'org.postgresql:postgresql' | ||
| liquibaseRuntime 'info.picocli:picocli:4.7.6' | ||
|
|
||
| testImplementation 'org.junit.vintage:junit-vintage-engine' | ||
| testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
| testImplementation 'io.zonky.test:embedded-database-spring-test:2.5.1' | ||
| testImplementation 'io.zonky.test:embedded-postgres:2.0.7' | ||
| implementation enforcedPlatform('io.zonky.test.postgres:embedded-postgres-binaries-bom:12.8.0') | ||
|
|
||
| generatedCompile 'org.springframework.boot:spring-boot-starter-web' | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now 1.37.0.