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
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ allprojects {
configurations.configureEach
{Configuration config ->
resolutionStrategy {
// spring-ai pulls a different version of open-telemetry than graphMailTransport and selenium-web-driver
force "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
// spring-ai pulls a different version of antr-ST4 than the version pulled by query (via antlr)
force "org.antlr:ST4:${antlrST4Version}"
// different spring-ai artifacts (e.g. spring-ai-transformers) pull different antlr4-runtime versions than ST4 does
Expand Down Expand Up @@ -381,6 +383,10 @@ allprojects {
force "org.springframework:spring-tx:${springVersion}"
force "org.springframework:spring-webflux:${springVersion}"

// Spring AI, its MCP SDK, and saml request different versions of these
force "com.networknt:json-schema-validator:${jsonSchemaValidatorVersion}"
force "io.micrometer:micrometer-observation:${micrometerVersion}"

// Force consistency between pipeline's ActiveMQ and cloud's jClouds dependencies
force "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"

Expand Down
11 changes: 10 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ jsr305Version=3.0.2

orgJsonVersion=20260814

# Spring AI's spring-ai-client-chat and its MCP SDK request different versions; force for consistency across modules
jsonSchemaValidatorVersion=3.0.6

jsoupVersion=1.23.2

junitVersion=4.13.2
Expand All @@ -264,6 +267,9 @@ lombokVersion=1.18.48

luceneVersion=10.5.2

# transitive dependency via Spring AI and saml; force for version consistency across modules
micrometerVersion=1.17.2

# Microsoft library for sending OAuth2-authenticated notification emails via the Microsoft Graph API
microsoftGraphVersion=6.71.0

Expand All @@ -278,6 +284,9 @@ objenesisVersion=1.0

opencsvVersion=2.3

# transitive via Selenium, Spring AI, and Microsoft Graph; force for consistency across modules. Keep >= Selenium's version or testAutomation's api and sdk split.
openTelemetryVersion=1.64.0

openTracingVersion=0.33.0

# sync with version Tika ships
Expand Down Expand Up @@ -314,7 +323,7 @@ snappyJavaVersion=1.1.10.12
springBootVersion=4.1.2
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=7.0.10
springAiVersion=2.0.1
springAiVersion=2.0.2

sqliteJdbcVersion=3.53.4.0

Expand Down
Loading