[DR-3398] [ID-948] Upgrade to Spring Boot 3.1.6, TCL 0.1.9

.editorconfig

@@ -337,7 +337,7 @@ ij_groovy_for_statement_right_paren_on_new_line = false
 ij_groovy_for_statement_wrap = off
 ij_groovy_if_brace_force = never
 ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_imports_layout = *,|,jakarta.**,java.**,|,$*
 ij_groovy_indent_case_from_switch = true
 ij_groovy_indent_label_blocks = true
 ij_groovy_insert_inner_class_imports = false
@@ -367,7 +367,7 @@ ij_groovy_method_parameters_right_paren_on_new_line = false
 ij_groovy_method_parameters_wrap = off
 ij_groovy_modifier_list_wrap = false
 ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+ij_groovy_packages_to_use_import_on_demand = java.awt.*,jakarta.swing.*
 ij_groovy_parameter_annotation_wrap = off
 ij_groovy_parentheses_expression_new_line_after_left_paren = false
 ij_groovy_parentheses_expression_right_paren_on_new_line = false

.github/workflows/publish.yml

@@ -31,20 +31,13 @@ jobs:
         id: tag
         run: echo tag=$(git describe --tags) >> $GITHUB_OUTPUT
 
-      - name: Publish to Artifactory (javax for clients running Spring 2)
+      - name: Publish jakarta-based client library to Artifactory
         run: ./gradlew --build-cache :client-resttemplate:artifactoryPublish
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           ARTIFACTORY_REPO_KEY: libs-snapshot-local
 
-      - name: Publish to Artifactory (jakarta for clients running Spring 3)
-        run: ./gradlew --build-cache :client-resttemplate-jakarta:artifactoryPublish
-        env:
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          ARTIFACTORY_REPO_KEY: libs-snapshot-local
-
       - name: Auth to GCR
         uses: google-github-actions/auth@v1
         with:

build.gradle

@@ -1,8 +1,11 @@
+import org.hidetake.gradle.swagger.generator.GenerateSwaggerCode
+import org.springframework.boot.gradle.plugin.SpringBootPlugin
+
 plugins {
 	id 'idea'
 
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
-	id 'org.springframework.boot' version '2.7.15' apply false
+	id 'io.spring.dependency-management' version '1.1.4' apply false
+	id 'org.springframework.boot' version '3.1.6' apply false
 	id 'com.diffplug.spotless' version '6.3.0' apply false
 	// ^^ for some reason, can't use spotless in multiple subprojects without this ^^
 	id 'com.google.cloud.tools.jib' version '3.1.4' apply false
@@ -14,16 +17,6 @@ plugins {
 
 repositories { mavenCentral() }
 
-ext {
-	springBootVersion = '2.7.15'
-	springSecurityVersion = '5.6.9'
-
-	// Dependency versions for libraries managed by Spring dependency management, affecting all projects
-	// This can be removed once ECM has migrated to Spring Boot 3
-	set('thymeleaf.version', '3.1.2.RELEASE')
-	set('snakeyaml.version', '1.33')
-}
-
 subprojects {
 	group = 'bio.terra'
 	version = '0.112.0-SNAPSHOT'
@@ -39,7 +32,7 @@ subprojects {
 
 	dependencyManagement {
 		imports {
-			mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
+			mavenBom(SpringBootPlugin.BOM_COORDINATES)
 		}
 
 		dependencies {
@@ -48,7 +41,7 @@ subprojects {
 		}
 	}
 
-	tasks.withType(org.hidetake.gradle.swagger.generator.GenerateSwaggerCode).all {
+	tasks.withType(GenerateSwaggerCode).all {
 		jvmArgs = ['--add-opens=java.base/java.util=ALL-UNNAMED'] // for jvm 16+
 	}
 

client-resttemplate/README.md

@@ -1,5 +1,5 @@
 # terra-external-credentials-manager
-ECM Javax-based Client Library for compatibility with Java clients running Spring Boot 2.
+ECM jakarta-based Client Library for compatibility with Java clients running Spring Boot 3.
 
 ## Publish a new version
 To publish a new version of this client library:

client-resttemplate/build.gradle

@@ -11,5 +11,3 @@ repositories { mavenCentral() }
 
 apply from: 'artifactory.gradle'
 apply from: 'swagger.gradle'
-
-sourceCompatibility = JavaLanguageVersion.of(11)

client-resttemplate/publish.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copied from Terra RBS repo
-# Publish ECM javax Client Package:
+# Publish ECM jakarta Client Package:
 VAULT_TOKEN=${1:-$(cat "$HOME"/.vault-token)}
 DSDE_TOOLBOX_DOCKER_IMAGE=broadinstitute/dsde-toolbox:consul-0.20.0
 ARTIFACTORY_ACCOUNT_PATH=secret/dsp/accts/artifactory/dsdejenkins

client-resttemplate/swagger.gradle

@@ -4,6 +4,9 @@ dependencies {
 
 	implementation 'io.swagger.core.v3:swagger-annotations'
 	swaggerCodegen 'io.swagger.codegen.v3:swagger-codegen-cli'
+
+	implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+	implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
 }
 
 
@@ -21,7 +24,8 @@ generateSwaggerCode {
 			modelPackage  : "${artifactGroup}.model",
 			apiPackage    : "${artifactGroup}.api",
 			invokerPackage: "${artifactGroup}.client",
-			dateLibrary   : 'java11'
+			dateLibrary   : 'java11',
+			jakarta       : true
 	]
 
 	rawOptions = ["--ignore-file-override", "${projectDir}/.swagger-codegen-ignore"]

integration/build.gradle

@@ -20,9 +20,6 @@ dependencies {
 	// ECM client library
 	implementation project(':client-resttemplate')
 
-	// ECM jakarta-based client library
-	implementation project(':client-resttemplate-jakarta')
-
 	// Terra Test Runner Library
 	implementation 'bio.terra:terra-test-runner:0.2.0-SNAPSHOT'
 }

service/build.gradle

@@ -27,32 +27,36 @@ apply from: 'analysis.gradle'
 
 dependencies {
 	// google
-	implementation platform('com.google.cloud:libraries-bom:25.1.0')
-	implementation 'com.google.cloud:google-cloud-pubsub:1.120.19'
-	implementation 'com.google.cloud:google-cloud-kms:2.6.8'
+	implementation platform('com.google.cloud:libraries-bom:26.28.0')
+	implementation 'com.google.cloud:google-cloud-pubsub'
+	implementation 'com.google.cloud:google-cloud-kms'
+	implementation 'com.google.cloud:spring-cloud-gcp-starter-logging:4.9.0'
+
+	annotationProcessor 'org.immutables:value:2.9.2'
+	implementation 'bio.terra:terra-common-lib:0.1.9-SNAPSHOT'
+	// https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
+	implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
+	implementation 'org.codehaus.janino:janino:3.1.9' // Provides if/else xml parsing for logback config
 
-	annotationProcessor 'org.immutables:value:2.9.0'
-	implementation 'bio.terra:terra-common-lib:0.0.93-SNAPSHOT'
-	// https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on
-	implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
-	implementation 'org.codehaus.janino:janino:3.1.7' // Provides if/else xml parsing for logback config
-	implementation('org.springframework.cloud:spring-cloud-gcp-starter-logging:1.2.8.RELEASE') {
-		exclude group: 'org.springframework', module: 'spring-jcl'
-	}
-	// Transitive dependency constraints due to security vulnerabilities in prior versions.
-	// These are not directly included, they are just constrained if they are pulled in as
-	// transitive dependencies.
-	constraints {
-		implementation('com.google.protobuf:protobuf-java:3.21.10')
-		implementation('org.mozilla:rhino:1.7.12')
-	}
 	// for testing with mock web server
 	testImplementation('org.mock-server:mockserver-netty:5.15.0') {
 		// Incompatible with the version brought in as a non-test dependency
 		exclude group: 'com.nimbusds', module: 'nimbus-jose-jwt'
 	}
 	// https://mvnrepository.com/artifact/org.mockito/mockito-core
 	testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0'
+
+	// OpenTelemetry
+	var openTelemetryVersion = '1.32.0'
+	implementation "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
+	implementation "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}"
+	implementation "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}"
+	implementation "io.opentelemetry:opentelemetry-exporter-logging:${openTelemetryVersion}"
+	implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha"
+	implementation "io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0:${openTelemetryVersion}-alpha"
+	implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:${openTelemetryVersion}"
+	implementation "io.opentelemetry.instrumentation:opentelemetry-spring-boot:${openTelemetryVersion}-alpha"
+	implementation "com.google.cloud.opentelemetry:exporter-trace:0.25.2"
 }
 
 sonarqube {

service/generators.gradle

@@ -6,7 +6,7 @@ dependencies {
 	runtimeOnly 'org.webjars.npm:swagger-ui-dist:4.18.1'
 
 	// Versioned by Spring:
-	implementation 'javax.validation:validation-api'
+	implementation 'jakarta.validation:jakarta.validation-api'
 	implementation 'org.webjars:webjars-locator-core'
 }
 
@@ -19,6 +19,7 @@ generateSwaggerCode {
 			apiPackage       : "${artifactGroup}.generated.api",
 			dateLibrary      : 'java11',
 			interfaceOnly    : 'true',
+			jakarta          : 'true',
 			useTags          : 'true',
 			springBootVersion: dependencyManagement.managedVersions['org.springframework.boot:spring-boot']
 	]

service/spring.gradle

@@ -1,29 +1,30 @@
 configurations { compileOnly { extendsFrom annotationProcessor } }
 
+// All version controlled by dependency management plugin
 dependencies {
-	annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion"
-	developmentOnly "org.springframework.boot:spring-boot-devtools:$springBootVersion"
-	implementation "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion"
-	implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
-	implementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
-	implementation "org.springframework.boot:spring-boot-starter-webflux:$springBootVersion"
-	implementation "org.springframework.boot:spring-boot-starter-cache:$springBootVersion"
-	testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-	implementation "org.springframework.security:spring-security-oauth2-core:$springSecurityVersion"
-	implementation ("org.springframework.security:spring-security-oauth2-client:$springSecurityVersion") {
-		// Need to exclude this because its strictly tied to a vulnerable version.
-		exclude group: 'net.minidev', module: 'json-smart'
-	}
-	implementation('net.minidev:json-smart:2.4.10')
-	implementation "org.springframework.security:spring-security-oauth2-jose:$springSecurityVersion"
-	implementation 'org.springframework.retry:spring-retry:1.3.2'
+	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+	developmentOnly 'org.springframework.boot:spring-boot-devtools'
+	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'org.springframework.boot:spring-boot-starter-cache'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+	implementation 'org.springframework:spring-aop'
+	implementation 'org.springframework:spring-aspects'
+
+	implementation 'org.springframework.security:spring-security-oauth2-core'
+	implementation 'org.springframework.security:spring-security-oauth2-client'
+	implementation 'org.springframework.security:spring-security-oauth2-jose'
+	implementation 'org.springframework.retry:spring-retry'
 
 	// allows mocking final classes
-	testImplementation 'org.mockito:mockito-inline:4.0.0'
+	testImplementation 'org.mockito:mockito-inline:5.2.0'
 
 	// DB deps (still versioned by Spring):
-	implementation 'org.liquibase:liquibase-core:4.8.0'
-	runtimeOnly 'org.postgresql:postgresql:42.3.7'
+	implementation 'org.liquibase:liquibase-core'
+	runtimeOnly 'org.postgresql:postgresql'
 }
 
 test { useJUnitPlatform() }