Skip to content

Commit

Permalink
[risk=low][no ticket] Upgrades to many API packages and notes for cas…
Browse files Browse the repository at this point in the history 
…es where we can't (#8869)
  • Loading branch information
@jmthibault79
jmthibault79 authored Oct 18, 2024
1 parent dc5d082 commit f1e8db1
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 46 deletions.
82 changes: 46 additions & 36 deletions api/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,25 @@ buildscript {
// External properties on the default project. Values declared in ext blocks
// outside of the buildscript block aren't usable here.
ext {
GAE_VERSION = '2.0.29'
GOOGLE_TRUTH_VERSION = '1.1.3'
GAE_VERSION = '2.0.31'
GSON_VERSION = '2.10'
HIBERNATE_VERSION = '6.5.2.Final'
JACKSON_VERSION = '2.17.2'
LIQUIBASE_VERSION = '4.29.0'
LOGBACK_VERSION = '1.5.6' // upgrading past this results in an error
MAPSTRUCT_VERSION = '1.5.5.Final'
LIQUIBASE_VERSION = '4.29.2'
// 1.5.7+ results in a runtime error:
// Logging system failed to initialize using configuration from 'null'
// java.lang.NoSuchMethodError: 'java.lang.Object ch.qos.logback.classic.LoggerContext.getConfigurationLock()'
LOGBACK_VERSION = '1.5.6'
MAPSTRUCT_VERSION = '1.6.2'
OKHTTP_VERSION = '4.12.0'
OPENTELEMETRY_SDK_VERSION = '1.43.0'
OPENTELEMETRY_JAVA_VERSION = '2.5.0'
OPENTELEMETRY_JAVA_VERSION = '2.8.0'
OPENTELEMETRY_GOOGLE_VERSION = '0.31.0'
SPRINGFOX_VERSION = '3.0.0'
SPRING_BOOT_VERSION = '3.3.2'
SPRING_FRAMEWORK_VERSION = '6.1.9'
SPRING_SECURITY_VERSION = '6.3.0'
SWAGGER_3_CODEGEN_VERSION = '3.0.55'
SPRING_FRAMEWORK_VERSION = '6.1.13'
SPRING_SECURITY_VERSION = '6.3.3'
SWAGGER_VERSION = '2.2.25'
}

repositories {
Expand Down Expand Up @@ -398,7 +400,12 @@ repositories {
dependencies {
annotationProcessor "org.mapstruct:mapstruct-processor:$project.ext.MAPSTRUCT_VERSION"

__swaggerCodegenV3__ "io.swagger.codegen.v3:swagger-codegen-cli:$project.ext.SWAGGER_3_CODEGEN_VERSION"
// 3.0.57+ results in runtime errors because it adds @NotNull annotations by default:
// https://github.com/swagger-api/swagger-codegen-generators/issues/1295
// 3.0.62+ results in compilation errors:
// package org.openapitools.jackson.nullable does not exist
// package io.swagger.configuration does not exist
__swaggerCodegenV3__ "io.swagger.codegen.v3:swagger-codegen-cli:3.0.56"

implementation "ch.qos.logback:logback-classic:$project.ext.LOGBACK_VERSION"
implementation "ch.qos.logback:logback-core:$project.ext.LOGBACK_VERSION"
Expand All @@ -408,6 +415,7 @@ dependencies {
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$project.ext.JACKSON_VERSION"
implementation "com.github.java-json-tools:json-patch:1.13"
implementation "com.github.rholder:guava-retrying:2.0.0"
// 6.0.0+ causes a failure in ProfileServiceTest
implementation 'org.javers:javers-core:5.15.0'
implementation "com.squareup.okhttp3:logging-interceptor:$project.ext.OKHTTP_VERSION"
implementation "com.squareup.okhttp3:okhttp:$project.ext.OKHTTP_VERSION"
Expand All @@ -420,7 +428,6 @@ dependencies {
implementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$project.ext.OPENTELEMETRY_SDK_VERSION"
implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:$project.ext.OPENTELEMETRY_JAVA_VERSION"
implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$project.ext.OPENTELEMETRY_JAVA_VERSION"
implementation "io.opentelemetry.instrumentation:opentelemetry-spring-boot-3:$project.ext.OPENTELEMETRY_JAVA_VERSION-alpha"
implementation("com.google.cloud.opentelemetry:exporter-trace:$project.ext.OPENTELEMETRY_GOOGLE_VERSION") {
exclude group: 'com.google.cloud', module: 'libraries-bom'
exclude group: 'com.google.cloud', module: 'google-cloud-core'
Expand All @@ -433,16 +440,17 @@ dependencies {
}
implementation "com.google.cloud.opentelemetry:exporter-auto:$project.ext.OPENTELEMETRY_GOOGLE_VERSION-alpha"

implementation 'io.swagger:swagger-annotations:1.6.14'
implementation "org.liquibase:liquibase-core:$project.ext.LIQUIBASE_VERSION"
implementation 'com.mysql:mysql-connector-j:8.3.0'
implementation 'com.mysql:mysql-connector-j:9.0.0'
implementation "org.apache.commons:commons-collections4:4.4"
implementation 'org.apache.commons:commons-lang3:3.15.0'
implementation 'org.apache.commons:commons-text:1.11.0'
// 5.4+ results in a runtime error:
// java.lang.NoSuchMethodError: 'void org.apache.hc.core5.http.impl.io.DefaultHttpRequestWriterFactory.<init>(org.apache.hc.core5.http.config.Http1Config)'
implementation "org.apache.httpcomponents.client5:httpclient5:5.3.1"
implementation "org.springframework.boot:spring-boot-starter-validation:$project.ext.SPRING_BOOT_VERSION"
implementation 'commons-codec:commons-codec:1.17.0'
implementation 'com.auth0:java-jwt:3.19.2'
implementation 'com.auth0:java-jwt:4.4.0'
implementation 'io.netty:netty-common:4.1.112.Final'
implementation 'org.json:json:20231013'

Expand All @@ -456,10 +464,14 @@ dependencies {
implementation 'com.google.apis:google-api-services-cloudresourcemanager:v3-rev20220925-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-rev20220825-2.0.0'
implementation 'com.google.api-client:google-api-client-appengine:2.2.0'
implementation 'com.google.api-client:google-api-client-appengine:2.5.0'
implementation 'com.google.auth:google-auth-library-appengine:1.23.0'
implementation 'com.google.auth:google-auth-library-oauth2-http:1.23.0'
implementation 'com.google.cloud.sql:mysql-socket-factory:1.7.0' // upgrading beyond this may cause errors
// 1.11.2+ results in a compilation error:
// > Could not find com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.11.1-SNAPSHOT.
// Required by:
// project : > com.google.cloud.sql:mysql-socket-factory:1.11.2
implementation 'com.google.cloud.sql:mysql-socket-factory:1.11.1'
implementation 'com.google.cloud:google-cloud-bigquery:2.25.0'
implementation 'com.google.cloud:google-cloud-iamcredentials:2.3.6'
implementation 'com.google.cloud:google-cloud-logging:3.11.5'
Expand All @@ -472,12 +484,12 @@ dependencies {
implementation 'com.google.oauth-client:google-oauth-client-jetty:1.34.1'
implementation 'com.google.protobuf:protobuf-java:3.25.5'
implementation 'com.google.protobuf:protobuf-java-util:3.25.5'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'

implementation "org.hibernate.orm:hibernate-core:$project.ext.HIBERNATE_VERSION"
implementation "org.hibernate.orm:hibernate-community-dialects:$project.ext.HIBERNATE_VERSION"

implementation('org.apache.tomcat:tomcat-jdbc:10.0.23')
implementation('org.apache.tomcat:tomcat-jdbc:11.0.0')
implementation("org.springframework.boot:spring-boot-starter-tomcat:$project.ext.SPRING_BOOT_VERSION")
implementation("org.springframework.boot:spring-boot-starter-jdbc:$project.ext.SPRING_BOOT_VERSION") {
exclude group: 'com.zaxxer', module: 'HikariCP'
Expand Down Expand Up @@ -538,8 +550,8 @@ dependencies {

// transitive dependencies called out by libyears

implementation "org.jetbrains:annotations:24.1.0"
implementation "commons-logging:commons-logging:1.3.1"
implementation "org.jetbrains:annotations:26.0.1"
implementation "commons-logging:commons-logging:1.3.4"

// jakarta
implementation "jakarta.servlet:jakarta.servlet-api:6.0.0"
Expand Down Expand Up @@ -576,27 +588,25 @@ dependencies {
// Swagger3 codegen deps
// TODO(calbach): The duplicated deps here are highly suspect. Investigate
// removing the generated sourceSet, or else fixing the runtime deps.
implementation 'io.swagger.core.v3:swagger-annotations:2.2.3'
implementation 'io.swagger.core.v3:swagger-models:2.2.3'
implementation 'io.gsonfire:gson-fire:1.8.5'
implementation 'org.threeten:threetenbp:1.6.2'
implementation 'io.springfox:springfox-oas:3.0.0'
generatedCompile 'io.swagger.core.v3:swagger-annotations:2.2.3'
generatedCompile 'io.swagger.core.v3:swagger-models:2.2.3'
generatedCompile 'io.gsonfire:gson-fire:1.8.5'
generatedCompile 'org.threeten:threetenbp:1.6.2'
generatedCompile 'io.springfox:springfox-oas:3.0.0'
implementation "io.swagger.core.v3:swagger-annotations:$project.ext.SWAGGER_VERSION"
implementation "io.swagger.core.v3:swagger-models:$project.ext.SWAGGER_VERSION"
implementation 'io.gsonfire:gson-fire:1.9.0'
generatedCompile "io.swagger.core.v3:swagger-annotations:$project.ext.SWAGGER_VERSION"
generatedCompile "io.swagger.core.v3:swagger-models:$project.ext.SWAGGER_VERSION"
generatedCompile 'io.gsonfire:gson-fire:1.9.0'

// war plugin. Add this to scope of the compile configuration, but do not include in .war file.
providedCompile group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'

__tools__Implementation 'commons-cli:commons-cli:1.5.0'
__tools__Implementation 'com.opencsv:opencsv:5.7.0'
__tools__Implementation 'commons-cli:commons-cli:1.9.0'
__tools__Implementation 'com.opencsv:opencsv:5.9'

testImplementation 'org.mockito:mockito-core:5.3.1'
testImplementation "com.google.truth:truth:$project.ext.GOOGLE_TRUTH_VERSION"
testImplementation "com.google.truth.extensions:truth-java8-extension:$project.ext.GOOGLE_TRUTH_VERSION"
testImplementation 'com.h2database:h2:1.4.194'
testImplementation 'org.mockito:mockito-core:5.14.2'
// 1.4.2+ results in a compilation error: reference to assertThat is ambiguous
testImplementation "com.google.truth:truth:1.4.1"
// 1.4.197+ results in a small number of test failures in CircleCI
// 1.4.200+ results in a large number of test failures due to missing DB tables
testImplementation 'com.h2database:h2:1.4.196'
testImplementation "org.liquibase:liquibase-core:$project.ext.LIQUIBASE_VERSION"
testImplementation 'org.bitbucket.radistao.test:before-after-spring-test-runner:0.1.0'

Expand Down
10 changes: 5 additions & 5 deletions api/db-cdr/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ def liquibase_password = System.getenv("LIQUIBASE_DB_PASSWORD") ?: "lb-notasecre
applicationDefaultJvmArgs = ["-Xmx2048m","-Xms2048m"]

dependencies {
liquibaseRuntime 'org.liquibase:liquibase-core:4.29.0'
liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:3.0.2'
liquibaseRuntime 'info.picocli:picocli:4.6.1'
liquibaseRuntime 'com.mysql:mysql-connector-j:8.3.0'
liquibaseRuntime 'org.liquibase:liquibase-core:4.29.2'
liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:4.0.0'
liquibaseRuntime 'info.picocli:picocli:4.7.6'
liquibaseRuntime 'com.mysql:mysql-connector-j:9.0.0'
liquibaseRuntime 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
liquibaseRuntime 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
liquibaseRuntime 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
}

liquibase {
Expand Down
10 changes: 5 additions & 5 deletions api/db/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ def db_port = System.getenv("DB_PORT") ?: "3307" // We launch Cloud SQL Proxy on
def liquibase_password = System.getenv("LIQUIBASE_DB_PASSWORD") ?: "lb-notasecret"

dependencies {
liquibaseRuntime 'org.liquibase:liquibase-core:4.29.0'
liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:3.0.2'
liquibaseRuntime 'info.picocli:picocli:4.6.1'
liquibaseRuntime 'com.mysql:mysql-connector-j:8.3.0'
liquibaseRuntime 'org.liquibase:liquibase-core:4.29.2'
liquibaseRuntime 'org.liquibase:liquibase-groovy-dsl:4.0.0'
liquibaseRuntime 'info.picocli:picocli:4.7.6'
liquibaseRuntime 'com.mysql:mysql-connector-j:9.0.0'
liquibaseRuntime 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
liquibaseRuntime 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
liquibaseRuntime 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
}

liquibase {
Expand Down

0 comments on commit f1e8db1

Please sign in to comment.