Skip to content

Commit

Permalink
Bump spring and lib versions
Browse files Browse the repository at this point in the history
  • Loading branch information
dexamundsen committed Sep 13, 2024
1 parent 4b66bb5 commit d5c2bd0
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 184 deletions.
8 changes: 5 additions & 3 deletions annotationProcessor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {

// These plugins are needed to resolve versions of spring dependencies
// transitively added by terra-common-lib
id 'org.springframework.boot' version '3.3.1'
id 'org.springframework.boot' version '3.3.3'
id 'io.spring.dependency-management' version '1.1.5'
}

Expand Down Expand Up @@ -53,8 +53,10 @@ dependencies {
implementation project(path: ':service')

// explicity declare libs and version to address synk warnings
implementation 'org.springframework:spring-web:6.1.12'
testFixturesImplementation 'org.springframework:spring-web:6.1.12'
implementation "org.springframework:spring-web:${gradle.vSpringWeb}"
implementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}"
testFixturesImplementation "org.springframework:spring-web:${gradle.vSpringWeb}"
testFixturesImplementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}"

// Static analysis
pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}"
Expand Down
129 changes: 64 additions & 65 deletions annotationProcessor/gradle.lockfile

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ buildscript {
}

gradle.ext {
vSpringBoot = '3.3.1'
vSpringBoot = '3.3.3'
vSpringWeb = '6.1.13'
vPmd = '7.1.0'
vTerraCommonLib = '1.1.16-SNAPSHOT'
vApacheCommonsText = '1.12.0'
vSlf4jApi = '2.0.16'
vSpotBugs = '4.8.5'
vJackson = '2.17.1'
vJersey3 = '3.1.7' // Java 17 compatible
vJackson = '2.17.2'
vJersey = '3.1.8' // Java 17 compatible
vSwaggerAnnotations = '2.2.22'
vSwaggerCodegen = '3.0.57'
vPicocliVersion = '4.7.6'
Expand Down
10 changes: 5 additions & 5 deletions cli/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# This file is expected to be part of source control.
ch.qos.logback:logback-classic:1.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.spotbugs:spotbugs-annotations:4.8.5=compileClasspath,spotbugs,testCompileClasspath
com.github.spotbugs:spotbugs:4.8.5=spotbugs
Expand Down
10 changes: 5 additions & 5 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
id 'com.jfrog.artifactory' version '5.2.2'
id 'io.spring.dependency-management' version '1.1.5'
id 'org.hidetake.swagger.generator' version '2.19.2'
id 'org.springframework.boot' version '3.3.1'
id 'org.springframework.boot' version '3.3.3'
}

repositories {
Expand Down Expand Up @@ -53,10 +53,10 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-core:${gradle.vJackson}"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${gradle.vJackson}"

implementation "org.glassfish.jersey.core:jersey-client:${gradle.vJersey3}"
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${gradle.vJersey3}"
implementation "org.glassfish.jersey.media:jersey-media-multipart:${gradle.vJersey3}"
implementation "org.glassfish.jersey.connectors:jersey-jdk-connector:${gradle.vJersey3}"
implementation "org.glassfish.jersey.core:jersey-client:${gradle.vJersey}"
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${gradle.vJersey}"
implementation "org.glassfish.jersey.media:jersey-media-multipart:${gradle.vJersey}"
implementation "org.glassfish.jersey.connectors:jersey-jdk-connector:${gradle.vJersey}"
}

bootJar {
Expand Down
21 changes: 14 additions & 7 deletions indexer/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ ch.qos.logback:logback-classic:1.5.6=runtimeClasspath,testFixturesRuntimeClasspa
ch.qos.logback:logback-core:1.5.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.charleskorn.kaml:kaml-jvm:0.60.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.charleskorn.kaml:kaml:0.60.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-core:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=compileClasspath,testCompileClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.fasterxml:classmate:1.5.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.spotbugs:spotbugs-annotations:4.8.5=compileClasspath,spotbugs,testCompileClasspath
Expand Down
18 changes: 10 additions & 8 deletions service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

id 'com.google.cloud.tools.jib' version '3.1.2'
id 'org.hidetake.swagger.generator' version '2.19.2'
id 'org.springframework.boot' version '3.3.1'
id 'org.springframework.boot' version '3.3.3'
id 'io.spring.dependency-management' version '1.1.5'
id 'org.barfuin.gradle.taskinfo' version '2.2.0'
id 'net.linguica.maven-settings' version '0.5'
Expand Down Expand Up @@ -94,8 +94,10 @@ dependencies {
implementation 'org.springframework.security:spring-security-core'

// explicity declare libs and version to address synk warnings
implementation 'org.springframework:spring-web:6.1.12'
testFixturesImplementation 'org.springframework:spring-web:6.1.12'
implementation "org.springframework:spring-web:${gradle.vSpringWeb}"
implementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}"
testFixturesImplementation "org.springframework:spring-web:${gradle.vSpringWeb}"
testFixturesImplementation "org.springframework:spring-webmvc:${gradle.vSpringWeb}"

// [Application DB] MySQL/MariaDB
implementation 'org.mariadb.jdbc:mariadb-java-client:3.4.0'
Expand Down Expand Up @@ -124,11 +126,11 @@ dependencies {

// [Access control]: VUMC admin service
// Changed form javax->jakarta, so using jersey3
implementation "org.glassfish.jersey.core:jersey-common:${gradle.vJersey3}"
implementation "org.glassfish.jersey.core:jersey-client:${gradle.vJersey3}"
implementation "org.glassfish.jersey.inject:jersey-hk2:${gradle.vJersey3}"
implementation "org.glassfish.jersey.media:jersey-media-multipart:${gradle.vJersey3}"
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${gradle.vJersey3}"
implementation "org.glassfish.jersey.core:jersey-common:${gradle.vJersey}"
implementation "org.glassfish.jersey.core:jersey-client:${gradle.vJersey}"
implementation "org.glassfish.jersey.inject:jersey-hk2:${gradle.vJersey}"
implementation "org.glassfish.jersey.media:jersey-media-multipart:${gradle.vJersey}"
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${gradle.vJersey}"

implementation 'org.vumc.vda.tanagra:admin-client:0.0.113-SNAPSHOT'

Expand Down
Loading

0 comments on commit d5c2bd0

Please sign in to comment.