diff --git a/annotationProcessor/build.gradle b/annotationProcessor/build.gradle index 93b77c56b..ae545e175 100644 --- 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 index 358bd68b3..7abbf3b41 100644 --- 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,7 +307,7 @@ 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 @@ -315,29 +315,29 @@ org.slf4j:jul-to-slf4j:2.0.16=pmd,productionRuntimeClasspath,runtimeClasspath,te 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 index 2eca95989..07139b2a6 100644 --- 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 index 71765f14a..a54ff9054 100644 --- 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/" diff --git a/cli/build.gradle b/cli/build.gradle index 530ff3b10..20283308e 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -18,22 +18,22 @@ repositories { } dependencies { - implementation "com.fasterxml.jackson.core:jackson-core:${gradle.vJackson}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${gradle.vJackson}" + implementation "com.fasterxml.jackson.core:jackson-core:${vJackson}" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${vJackson}" - implementation "org.apache.commons:commons-text:${gradle.vApacheCommonsText}" - implementation "org.slf4j:slf4j-api:${gradle.vSlf4jApi}" + implementation "org.apache.commons:commons-text:${vApacheCommonsText}" + implementation "org.slf4j:slf4j-api:${vSlf4jApi}" implementation 'ch.qos.logback:logback-classic:1.5.6' // GCP libraries versions are controlled by the BOM specified in buildSrc. implementation 'com.google.guava:guava' // Command parsing - implementation "info.picocli:picocli:${gradle.vPicocliVersion}" - annotationProcessor "info.picocli:picocli-codegen:${gradle.vPicocliVersion}" + implementation "info.picocli:picocli:${vPicocliVersion}" + annotationProcessor "info.picocli:picocli-codegen:${vPicocliVersion}" // Static analysis - pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}" - compileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" - testCompileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" + pmd "net.sourceforge.pmd:pmd-ant:${vPmd}" + compileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" + testCompileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" } diff --git a/client/build.gradle b/client/build.gradle index 66f6cc08d..aaeb9e6ea 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -5,9 +5,9 @@ plugins { id 'maven-publish' 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.3' + id 'io.spring.dependency-management' version "${vSpringDepMgt}" + id 'org.springframework.boot' version "${vSpringBoot}" + id 'org.hidetake.swagger.generator' version "${vHidetakeSwagger}" } repositories { @@ -41,22 +41,22 @@ dependencyManagement { mavenBom SpringBootPlugin.BOM_COORDINATES } dependencies { - dependency "io.swagger.core.v3:swagger-annotations:${gradle.vSwaggerAnnotations}" - dependency "io.swagger.codegen.v3:swagger-codegen-cli:${gradle.vSwaggerCodegen}" + dependency "io.swagger.core.v3:swagger-annotations:${vSwaggerAnnotations}" + dependency "io.swagger.codegen.v3:swagger-codegen-cli:${vSwaggerCodegen}" } } dependencies { - implementation "io.swagger.core.v3:swagger-annotations:${gradle.vSwaggerAnnotations}" - swaggerCodegen "io.swagger.codegen.v3:swagger-codegen-cli:${gradle.vSwaggerCodegen}" + implementation "io.swagger.core.v3:swagger-annotations:${vSwaggerAnnotations}" + swaggerCodegen "io.swagger.codegen.v3:swagger-codegen-cli:${vSwaggerCodegen}" - implementation "com.fasterxml.jackson.core:jackson-core:${gradle.vJackson}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${gradle.vJackson}" + implementation "com.fasterxml.jackson.core:jackson-core:${vJackson}" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${vJackson}" - 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}" + implementation "org.glassfish.jersey.core:jersey-client:${vJersey}" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${vJersey}" + implementation "org.glassfish.jersey.media:jersey-media-multipart:${vJersey}" + implementation "org.glassfish.jersey.connectors:jersey-jdk-connector:${vJersey}" } bootJar { diff --git a/docs/DEVELOPER_INFO.md b/docs/DEVELOPER_INFO.md index 82df36828..6761da0e1 100644 --- a/docs/DEVELOPER_INFO.md +++ b/docs/DEVELOPER_INFO.md @@ -136,7 +136,7 @@ You can run just the static analysis checks (i.e. no functional tests) with: We use [Gradle dependency locking](https://docs.gradle.org/current/userguide/dependency_locking.html) for building with deterministic dependencies. When adding a new dependency, use ``` -./gradlew underlay:dependencies service:dependencies cli:dependencies indexer:dependencies annotationProcessor:dependencies --write-locks +./gradlew dependencies --write-locks ``` to regenerate the `gradle.lockfile` for each subproject with the added dependencies. Outdated lock files cause errors like: ``` diff --git a/indexer/build.gradle b/indexer/build.gradle index dd784341c..8156a1fcf 100644 --- a/indexer/build.gradle +++ b/indexer/build.gradle @@ -33,13 +33,13 @@ dependencies { implementation project(':underlay') testImplementation(testFixtures(project(':underlay'))) - implementation "org.apache.commons:commons-text:${gradle.vApacheCommonsText}" + implementation "org.apache.commons:commons-text:${vApacheCommonsText}" implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0' // Command parsing implementation project(':cli') - compileOnly "info.picocli:picocli:${gradle.vPicocliVersion}" - annotationProcessor "info.picocli:picocli-codegen:${gradle.vPicocliVersion}" + compileOnly "info.picocli:picocli:${vPicocliVersion}" + annotationProcessor "info.picocli:picocli-codegen:${vPicocliVersion}" // GCP libraries versions are controlled by the BOM specified in buildSrc. implementation 'com.google.cloud:google-cloud-bigquery' @@ -62,9 +62,9 @@ dependencies { testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.7.0' // Static analysis - pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}" - compileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" - testCompileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" + pmd "net.sourceforge.pmd:pmd-ant:${vPmd}" + compileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" + testCompileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" } tasks.withType(Test).configureEach { diff --git a/service/build.gradle b/service/build.gradle index 2d61e232f..f42645818 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -4,12 +4,12 @@ plugins { id 'tanagra.java-conventions' 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.3' - id 'io.spring.dependency-management' version '1.1.5' + id 'io.spring.dependency-management' version "${vSpringDepMgt}" + id 'org.springframework.boot' version "${vSpringBoot}" + id 'org.hidetake.swagger.generator' version "${vHidetakeSwagger}" id 'org.barfuin.gradle.taskinfo' version '2.2.0' id 'net.linguica.maven-settings' version '0.5' - id 'com.google.protobuf' version '0.9.4' + id 'com.google.protobuf' version "${vGoogleProtobuf}" } sourceCompatibility = JavaVersion.VERSION_17 @@ -36,8 +36,8 @@ repositories { // Credentials required to access tanagra-client-libraries, // GITHUB_ACTOR: user running build task // GITHUB_TOKEN: user token or workflow token that grants access to libraries - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") + username = System.getenv('GITHUB_ACTOR') + password = System.getenv('GITHUB_TOKEN') } } } @@ -47,8 +47,8 @@ dependencyManagement { mavenBom SpringBootPlugin.BOM_COORDINATES } dependencies { - dependency "io.swagger.core.v3:swagger-annotations:${gradle.vSwaggerAnnotations}" - dependency "io.swagger.codegen.v3:swagger-codegen-cli:${gradle.vSwaggerCodegen}" + dependency "io.swagger.core.v3:swagger-annotations:${vSwaggerAnnotations}" + dependency "io.swagger.codegen.v3:swagger-codegen-cli:${vSwaggerCodegen}" } } @@ -58,18 +58,18 @@ dependencies { implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3' } - implementation "io.swagger.core.v3:swagger-annotations:${gradle.vSwaggerAnnotations}" - swaggerCodegen "io.swagger.codegen.v3:swagger-codegen-cli:${gradle.vSwaggerCodegen}" + implementation "io.swagger.core.v3:swagger-annotations:${vSwaggerAnnotations}" + swaggerCodegen "io.swagger.codegen.v3:swagger-codegen-cli:${vSwaggerCodegen}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${gradle.vJackson}" - implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${gradle.vJackson}" - implementation "com.fasterxml.jackson.core:jackson-core:${gradle.vJackson}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${gradle.vJackson}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${vJackson}" + implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${vJackson}" + implementation "com.fasterxml.jackson.core:jackson-core:${vJackson}" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${vJackson}" implementation 'org.webjars:webjars-locator-core:0.58' implementation 'org.webjars.npm:swagger-ui-dist:5.17.12' - implementation "org.apache.commons:commons-text:${gradle.vApacheCommonsText}" + implementation "org.apache.commons:commons-text:${vApacheCommonsText}" implementation 'org.apache.commons:commons-dbcp2' implementation 'org.apache.commons:commons-pool2' implementation 'jakarta.validation:jakarta.validation-api' @@ -77,7 +77,7 @@ dependencies { implementation 'jakarta.ws.rs:jakarta.ws.rs-api:4.0.0' implementation 'org.bouncycastle:bcprov-jdk18on:1.78' - 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' @@ -94,10 +94,10 @@ dependencies { implementation 'org.springframework.security:spring-security-core' // 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}" // [Application DB] MySQL/MariaDB implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.12' @@ -120,17 +120,17 @@ dependencies { } // Static analysis - pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}" - compileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" - testCompileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" + pmd "net.sourceforge.pmd:pmd-ant:${vPmd}" + compileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" + testCompileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" // [Access control]: VUMC admin service // Changed form javax->jakarta, so using jersey3 - 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.glassfish.jersey.core:jersey-common:${vJersey}" + implementation "org.glassfish.jersey.core:jersey-client:${vJersey}" + implementation "org.glassfish.jersey.inject:jersey-hk2:${vJersey}" + implementation "org.glassfish.jersey.media:jersey-media-multipart:${vJersey}" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${vJersey}" implementation 'org.vumc.vda.tanagra:admin-client:0.0.113-SNAPSHOT' diff --git a/service/gradle.lockfile b/service/gradle.lockfile index c0747c6c2..da25918cc 100644 --- a/service/gradle.lockfile +++ b/service/gradle.lockfile @@ -8,8 +8,8 @@ bio.terra:terra-common-lib:1.1.16-SNAPSHOT=compileClasspath,compileProtoPath,pro ch.qos.logback.contrib:logback-jackson:0.1.5=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback.contrib:logback-json-classic:0.1.5=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath ch.qos.logback.contrib:logback-json-core:0.1.5=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.5.7=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.7=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.5.8=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.5.8=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.652=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-sts:1.12.652=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.amazonaws:jmespath-java:1.12.652=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -158,11 +158,11 @@ io.gsonfire:gson-fire:1.9.0=compileProtoPath,productionRuntimeClasspath,runtimeC io.kubernetes:client-java-api:20.0.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.kubernetes:client-java-proto:20.0.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.kubernetes:client-java:20.0.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.13.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.13.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.13.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.13.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.netty:netty-bom:4.1.111.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.112.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.112.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.113.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.113.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -243,9 +243,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=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.2=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:10.1.28=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:10.1.28=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.30=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:10.1.30=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.30=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.25.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -289,7 +289,7 @@ org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testCompileProtoPath,testRun org.hamcrest:hamcrest:2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.hashids:hashids:1.0.3=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.hibernate.orm:hibernate-core:6.5.2.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.3.Final=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,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 @@ -335,7 +335,7 @@ org.ow2.asm:asm:9.2=compileClasspath org.ow2.asm:asm:9.6=compileProtoPath,pmd,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.7=jacocoAnt,spotbugs org.pcollections:pcollections:3.2.0=pmd -org.postgresql:postgresql:42.7.3=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.4=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.reflections:reflections:0.10.2=checkstyle org.scala-lang:scala-library:2.13.10=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.skyscreamer:jsonassert:1.5.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -344,34 +344,34 @@ org.slf4j:jul-to-slf4j:2.0.16=compileClasspath,compileProtoPath,pmd,productionRu org.slf4j:slf4j-api:2.0.16=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,spotbugs,spotbugsSlf4j,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.slf4j:slf4j-simple:2.0.16=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-configuration-processor:3.3.3=annotationProcessor -org.springframework.boot:spring-boot-starter-data-jdbc:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-jdbc:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.data:spring-data-commons:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.data:spring-data-jdbc:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.data:spring-data-relational:3.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework.retry:spring-retry:2.0.8=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-configuration-processor:3.3.4=annotationProcessor +org.springframework.boot:spring-boot-starter-data-jdbc:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-jdbc:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.3.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.3.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.springframework.boot:spring-boot-test:3.3.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.springframework.boot:spring-boot:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.data:spring-data-commons:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.data:spring-data-jdbc:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.data:spring-data-relational:3.3.4=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework.retry:spring-retry:2.0.9=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.springframework.security:spring-security-core:6.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.springframework.security:spring-security-crypto:6.3.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-aop:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-context:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-core:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-expression:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-jdbc:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.springframework:spring-test:6.1.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.springframework:spring-tx:6.1.12=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-aop:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-beans:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-context:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-core:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-expression:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-jcl:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-jdbc:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.springframework:spring-test:6.1.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.springframework:spring-tx:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.springframework:spring-web:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.springframework:spring-webmvc:6.1.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath org.threeten:threeten-extra:1.8.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/underlay/build.gradle b/underlay/build.gradle index 49935b9cf..a1fce8ed9 100644 --- a/underlay/build.gradle +++ b/underlay/build.gradle @@ -1,6 +1,6 @@ plugins { id 'tanagra.java-conventions' - id 'com.google.protobuf' version '0.9.4' + id 'com.google.protobuf' version "${vGoogleProtobuf}" } sourceCompatibility = JavaVersion.VERSION_17 @@ -19,13 +19,13 @@ repositories { } dependencies { - implementation "com.fasterxml.jackson.core:jackson-core:${gradle.vJackson}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${gradle.vJackson}" + implementation "com.fasterxml.jackson.core:jackson-core:${vJackson}" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${vJackson}" implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0' - implementation "org.apache.commons:commons-text:${gradle.vApacheCommonsText}" - implementation "org.slf4j:slf4j-simple:${gradle.vSlf4jApi}" - testFixturesImplementation "org.slf4j:slf4j-api:${gradle.vSlf4jApi}" + implementation "org.apache.commons:commons-text:${vApacheCommonsText}" + implementation "org.slf4j:slf4j-simple:${vSlf4jApi}" + testFixturesImplementation "org.slf4j:slf4j-api:${vSlf4jApi}" // GCP libraries versions are controlled by the BOM specified in buildSrc. implementation 'com.google.cloud:google-cloud-bigquery' @@ -36,14 +36,14 @@ dependencies { implementation 'org.hibernate.orm:hibernate-core:6.5.2.Final' // JUnit - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${gradle.vJunit5}" - testImplementation "org.junit.jupiter:junit-jupiter-api:${gradle.vJunit5}" - testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:${gradle.vJunit5}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${vJunit5}" + testImplementation "org.junit.jupiter:junit-jupiter-api:${vJunit5}" + testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:${vJunit5}" // Static analysis - pmd "net.sourceforge.pmd:pmd-ant:${gradle.vPmd}" - compileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" - testCompileOnly "com.github.spotbugs:spotbugs-annotations:${gradle.vSpotBugs}" + pmd "net.sourceforge.pmd:pmd-ant:${vPmd}" + compileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" + testCompileOnly "com.github.spotbugs:spotbugs-annotations:${vSpotBugs}" } protobuf {