Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions workshop/appd/app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.15</version>
<version>4.1.1</version>
<relativePath/>
</parent>

Expand All @@ -19,8 +19,10 @@

<properties>
<java.version>17</java.version>
<tomcat.version>10.1.59</tomcat.version>
<jackson-bom.version>2.21.6</jackson-bom.version>
<tomcat.version>11.0.24</tomcat.version>
<jackson-bom.version>3.1.7</jackson-bom.version>
<jackson-2-bom.version>2.21.7</jackson-2-bom.version>
<spring-framework.version>7.0.9</spring-framework.version>
</properties>

<dependencies>
Expand Down
18 changes: 10 additions & 8 deletions workshop/demos/otel-discovery-demo/src/loanservice/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

Expand All @@ -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()
Expand All @@ -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'
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions workshop/profiling/doorgame/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.15</version>
<version>4.1.1</version>
<relativePath/>
</parent>
<groupId>com.splunk.profiling.workshop</groupId>
Expand All @@ -15,8 +15,10 @@
<description>Door game profiling workshop app</description>
<properties>
<java.version>21</java.version>
<tomcat.version>10.1.59</tomcat.version>
<jackson-bom.version>2.21.6</jackson-bom.version>
<tomcat.version>11.0.24</tomcat.version>
<jackson-bom.version>3.1.7</jackson-bom.version>
<jackson-2-bom.version>2.21.7</jackson-2-bom.version>
<spring-framework.version>7.0.9</spring-framework.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
12 changes: 9 additions & 3 deletions workshop/tagging/creditcheckservice-java-with-tags/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.15</version>
<version>4.1.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
Expand All @@ -15,8 +15,10 @@
<description>credit check service</description>
<properties>
<java.version>22</java.version>
<tomcat.version>10.1.59</tomcat.version>
<jackson-bom.version>2.21.6</jackson-bom.version>
<tomcat.version>11.0.24</tomcat.version>
<jackson-bom.version>3.1.7</jackson-bom.version>
<jackson-2-bom.version>2.21.7</jackson-2-bom.version>
<spring-framework.version>7.0.9</spring-framework.version>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -41,6 +43,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-restclient</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 9 additions & 3 deletions workshop/tagging/creditcheckservice-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.15</version>
<version>4.1.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
Expand All @@ -15,8 +15,10 @@
<description>credit check service</description>
<properties>
<java.version>22</java.version>
<tomcat.version>10.1.59</tomcat.version>
<jackson-bom.version>2.21.6</jackson-bom.version>
<tomcat.version>11.0.24</tomcat.version>
<jackson-bom.version>3.1.7</jackson-bom.version>
<jackson-2-bom.version>2.21.7</jackson-2-bom.version>
<spring-framework.version>7.0.9</spring-framework.version>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -41,6 +43,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-restclient</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading