Simplify dependency locking and version def (#1024)

DataBiosphere · Oct 3, 2024 · 3db4e4f · 3db4e4f
1 parent f0d8647
commit 3db4e4f
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 163 deletions.
diff --git a/annotationProcessor/build.gradle b/annotationProcessor/build.gradle
@@ -3,8 +3,8 @@ plugins {
 
     // These plugins are needed to resolve versions of spring dependencies
     // transitively added by terra-common-lib
-    id 'org.springframework.boot' version '3.3.3'
-    id 'io.spring.dependency-management' version '1.1.5'
+    id 'io.spring.dependency-management' version "${vSpringDepMgt}"
+    id 'org.springframework.boot' version "${vSpringBoot}"
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -39,9 +39,9 @@ dependencies {
         implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
     }
 
-    implementation "org.slf4j:slf4j-api:${gradle.vSlf4jApi}"
+    implementation "org.slf4j:slf4j-api:${vSlf4jApi}"
 
-    implementation("bio.terra:terra-common-lib:${gradle.vTerraCommonLib}") {
+    implementation("bio.terra:terra-common-lib:${vTerraCommonLib}") {
         exclude group: 'com.azure'
         exclude group: 'io.swagger', module: 'swagger-annotations'
         exclude group: 'io.opentelemetry'
@@ -53,13 +53,13 @@ dependencies {
     implementation project(path: ':service')
 
     // explicity declare libs and version to address synk warnings
-    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}"
+    implementation "org.springframework:spring-web:${vSpringWeb}"
+    implementation "org.springframework:spring-webmvc:${vSpringWeb}"
+    testFixturesImplementation "org.springframework:spring-web:${vSpringWeb}"
+    testFixturesImplementation "org.springframework:spring-webmvc:${vSpringWeb}"
 
     // Static analysis
-    pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}"
+    pmd "net.sourceforge.pmd:pmd-ant:${vPmd}"
 }
 
 // e.g. ./gradlew annotationProcessor:run -Pgenerator=APPLICATION_CONFIG_DOCS

diff --git a/annotationProcessor/gradle.lockfile b/annotationProcessor/gradle.lockfile
@@ -8,8 +8,8 @@ bio.terra:terra-common-lib:1.1.16-SNAPSHOT=compileClasspath,productionRuntimeCla
 ch.qos.logback.contrib:logback-jackson:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 ch.qos.logback.contrib:logback-json-classic:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 ch.qos.logback.contrib:logback-json-core:0.1.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.5.7=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.5.7=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+ch.qos.logback:logback-classic:1.5.8=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.5.8=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.amazonaws:aws-java-sdk-core:1.12.652=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.amazonaws:aws-java-sdk-sts:1.12.652=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.amazonaws:jmespath-java:1.12.652=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -155,11 +155,11 @@ io.gsonfire:gson-fire:1.9.0=productionRuntimeClasspath,runtimeClasspath,testFixt
 io.kubernetes:client-java-api:20.0.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.kubernetes:client-java-proto:20.0.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.kubernetes:client-java:20.0.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-io.micrometer:micrometer-commons:1.13.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-io.micrometer:micrometer-observation:1.13.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+io.micrometer:micrometer-commons:1.13.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+io.micrometer:micrometer-observation:1.13.4=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.netty:netty-bom:4.1.111.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-io.netty:netty-buffer:4.1.112.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-io.netty:netty-common:4.1.112.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+io.netty:netty-buffer:4.1.113.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+io.netty:netty-common:4.1.113.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-api:0.31.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-contrib-http-util:0.31.1=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-proto:0.2.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -236,9 +236,9 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.apache.tomcat.embed:tomcat-embed-core:10.1.28=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.apache.tomcat.embed:tomcat-embed-el:10.1.28=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.apache.tomcat.embed:tomcat-embed-core:10.1.30=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.apache.tomcat.embed:tomcat-embed-el:10.1.30=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.apache.tomcat.embed:tomcat-embed-websocket:10.1.30=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.bitbucket.b_c:jose4j:0.9.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.bouncycastle:bcpkix-jdk18on:1.77=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -278,7 +278,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.8=productionRuntimeClas
 org.glassfish.jersey.media:jersey-media-multipart:3.1.8=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.hashids:hashids:1.0.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.hibernate.orm:hibernate-core:6.5.2.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.hibernate.orm:hibernate-core:6.5.3.Final=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.12=jacocoAnt
@@ -307,37 +307,37 @@ org.ow2.asm:asm-util:9.7=spotbugs
 org.ow2.asm:asm:9.6=pmd,productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm:9.7=jacocoAnt,spotbugs
 org.pcollections:pcollections:3.2.0=pmd
-org.postgresql:postgresql:42.7.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.postgresql:postgresql:42.7.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.scala-lang:scala-library:2.13.10=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.16=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:2.0.16=pmd,productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.16=compileClasspath,productionRuntimeClasspath,runtimeClasspath,spotbugs,spotbugsSlf4j,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.16=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-autoconfigure:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-data-jdbc:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-jdbc:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-json:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-logging:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-tomcat:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-web:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.data:spring-data-commons:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.data:spring-data-jdbc:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.data:spring-data-relational:3.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework.retry:spring-retry:2.0.8=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-autoconfigure:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-data-jdbc:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-jdbc:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-json:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-logging:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-tomcat:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-web:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.data:spring-data-commons:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.data:spring-data-jdbc:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.data:spring-data-relational:3.3.4=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework.retry:spring-retry:2.0.9=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.springframework.security:spring-security-core:6.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.springframework.security:spring-security-crypto:6.3.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-aop:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-beans:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-context:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-core:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-expression:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-jcl:6.1.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-jdbc:6.1.12=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.springframework:spring-tx:6.1.12=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-aop:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-beans:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-context:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-core:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-expression:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-jcl:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-jdbc:6.1.13=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+org.springframework:spring-tx:6.1.13=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.springframework:spring-web:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.springframework:spring-webmvc:6.1.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.threeten:threeten-extra:1.8.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,35 @@
 // Required by spotless. https://github.com/diffplug/spotless/issues/747
 buildscript {
+    ext {
+        // plugin versions
+        vSpringBoot = '3.3.4'
+        vSpringDepMgt = '1.1.6'
+        vHidetakeSwagger = '2.19.2'
+        vGoogleProtobuf = '0.9.4'
+
+        // library versions
+        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.2'
+        vJersey = '3.1.8' // Java 17 compatible
+        vSwaggerAnnotations = '2.2.22'
+        vSwaggerCodegen = '3.0.57'
+        vPicocliVersion = '4.7.6'
+        vJunit5 = '5.10.2'
+    }
     repositories {
         mavenCentral()
     }
 }
 
-gradle.ext {
-    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.2'
-    vJersey = '3.1.8' // Java 17 compatible
-    vSwaggerAnnotations = '2.2.22'
-    vSwaggerCodegen = '3.0.57'
-    vPicocliVersion = '4.7.6'
-    vJunit5 = '5.10.2'
+tasks.named('dependencies') {
+    dependsOn(':underlay:dependencies')
+    dependsOn(':service:dependencies')
+    dependsOn(':cli:dependencies')
+    dependsOn(':indexer:dependencies')
+    dependsOn(':annotationProcessor:dependencies')
 }
diff --git a/buildSrc/src/main/groovy/tanagra.quality-conventions.gradle b/buildSrc/src/main/groovy/tanagra.quality-conventions.gradle
@@ -17,8 +17,8 @@ quality {
     spotbugs = true
     pmdIncremental = true
 
-    spotbugsVersion = gradle.vSpotBugs
-    pmdVersion = gradle.vPmd
+    spotbugsVersion = "${vSpotBugs}"
+    pmdVersion = "${vPmd}"
 
     configDir = "${rootDir}/gradle/config/"