Skip to content

Commit 773c167

Browse files
let's try "force" instead of "exclude"
1 parent c020879 commit 773c167

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ allprojects {
204204
resolutionStrategy {
205205
// spring-ai pulls a different version of antr-ST4 than the version pulled by query (via antlr)
206206
force "org.antlr:ST4:${antlrST4Version}"
207+
// also it pulls in a bunch of com.google.api dependencies which conflict with DiscvrLabKeyModules:SequenceAnalysis and wnprc-modules:WNPRC_EHR
208+
force "com.google.api:api-common:${googleApiVersion}"
209+
force "com.google.auth:google-auth-library-oauth2-http:${googleAuthVersion}"
210+
force "com.google.auth:google-auth-library-credentials:${googleAuthVersion}"
211+
207212
// we force this version because we have compilation problems with version 1.9.2 of commons-beanutils, which is the version
208213
// that is brought in by Gradle's conflict resolution as a result of our chosen versions for commons-validator (1.5.0) and commons-digester (1.8.1)
209214
force "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ flyingsaucerVersion=R8
155155
fopVersion=2.11
156156

157157
# Force latest for consistency
158+
googleApiVersion=2.47.0
159+
googleAuthVersion=1.33.0
158160
googleAutoValueAnnotationsVersion=1.10.4
159161
googleErrorProneAnnotationsVersion=2.45.0
160162
googleHttpClientVersion=2.0.2

0 commit comments

Comments
 (0)