diff --git a/workshop/appd/app/pom.xml b/workshop/appd/app/pom.xml index 94fca6e377..c2d274bfa8 100644 --- a/workshop/appd/app/pom.xml +++ b/workshop/appd/app/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.15 + 4.1.1 @@ -19,8 +19,10 @@ 17 - 10.1.59 - 2.21.6 + 11.0.24 + 3.1.7 + 2.21.7 + 7.0.9 diff --git a/workshop/demos/otel-discovery-demo/src/loanservice/build.gradle b/workshop/demos/otel-discovery-demo/src/loanservice/build.gradle index 41299e03bd..5caf651855 100644 --- a/workshop/demos/otel-discovery-demo/src/loanservice/build.gradle +++ b/workshop/demos/otel-discovery-demo/src/loanservice/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.5.14' + id 'org.springframework.boot' version '4.1.1' id 'io.spring.dependency-management' version '1.1.7' } @@ -11,11 +11,10 @@ java { sourceCompatibility = '17' } -ext['tomcat.version'] = '10.1.59' -ext['logback.version'] = '1.5.35' -ext['jackson-bom.version'] = '2.21.6' -ext['spring-framework.version'] = '6.2.19' -ext['spring-kafka.version'] = '3.3.16' +ext['tomcat.version'] = '11.0.24' +ext['jackson-bom.version'] = '3.1.7' +ext['jackson-2-bom.version'] = '2.21.7' +ext['spring-framework.version'] = '7.0.9' repositories { mavenCentral() @@ -27,8 +26,11 @@ dependencies { implementation 'com.mysql:mysql-connector-j' implementation 'org.springframework.kafka:spring-kafka' constraints { - implementation('at.yawk.lz4:lz4-java:1.11.1') { - because 'CVE-2026-59949' + implementation('at.yawk.lz4:lz4-java:1.11.4') { + because 'CVE-2026-106451' + } + implementation('org.springframework.retry:spring-retry:2.0.13') { + because 'CVE-2026-41710' } } } diff --git a/workshop/demos/otel-discovery-demo/src/loanservice/gradle/wrapper/gradle-wrapper.properties b/workshop/demos/otel-discovery-demo/src/loanservice/gradle/wrapper/gradle-wrapper.properties index ac72c34e8a..d4081da476 100644 --- a/workshop/demos/otel-discovery-demo/src/loanservice/gradle/wrapper/gradle-wrapper.properties +++ b/workshop/demos/otel-discovery-demo/src/loanservice/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/workshop/profiling/doorgame/pom.xml b/workshop/profiling/doorgame/pom.xml index fa836d721b..648073d598 100644 --- a/workshop/profiling/doorgame/pom.xml +++ b/workshop/profiling/doorgame/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.15 + 4.1.1 com.splunk.profiling.workshop @@ -15,8 +15,10 @@ Door game profiling workshop app 21 - 10.1.59 - 2.21.6 + 11.0.24 + 3.1.7 + 2.21.7 + 7.0.9 diff --git a/workshop/tagging/creditcheckservice-java-with-tags/pom.xml b/workshop/tagging/creditcheckservice-java-with-tags/pom.xml index 25a43d8aeb..ecb6b24423 100644 --- a/workshop/tagging/creditcheckservice-java-with-tags/pom.xml +++ b/workshop/tagging/creditcheckservice-java-with-tags/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.15 + 4.1.1 com.example @@ -15,8 +15,10 @@ credit check service 22 - 10.1.59 - 2.21.6 + 11.0.24 + 3.1.7 + 2.21.7 + 7.0.9 @@ -41,6 +43,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-restclient + io.opentelemetry opentelemetry-api diff --git a/workshop/tagging/creditcheckservice-java-with-tags/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java b/workshop/tagging/creditcheckservice-java-with-tags/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java index 30d49b98c5..4790386059 100644 --- a/workshop/tagging/creditcheckservice-java-with-tags/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java +++ b/workshop/tagging/creditcheckservice-java-with-tags/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.web.client.RestTemplate; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; diff --git a/workshop/tagging/creditcheckservice-java/pom.xml b/workshop/tagging/creditcheckservice-java/pom.xml index 25a43d8aeb..ecb6b24423 100644 --- a/workshop/tagging/creditcheckservice-java/pom.xml +++ b/workshop/tagging/creditcheckservice-java/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.15 + 4.1.1 com.example @@ -15,8 +15,10 @@ credit check service 22 - 10.1.59 - 2.21.6 + 11.0.24 + 3.1.7 + 2.21.7 + 7.0.9 @@ -41,6 +43,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-restclient + io.opentelemetry opentelemetry-api diff --git a/workshop/tagging/creditcheckservice-java/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java b/workshop/tagging/creditcheckservice-java/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java index 30d49b98c5..4790386059 100644 --- a/workshop/tagging/creditcheckservice-java/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java +++ b/workshop/tagging/creditcheckservice-java/src/main/java/com/example/creditcheckservice/CreditCheckApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.web.client.RestTemplate; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry;