Skip to content

Commit

Permalink
Upgrade various dependencies (#689)
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-adam authored Jan 24, 2024
1 parent 10d4d12 commit 8e2bae3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ allprojects {
force "com.google.http-client:google-http-client-apache-v2:${googleHttpClientVersion}"
force "com.google.http-client:google-http-client-gson:${googleHttpClientVersion}"

// FileTransfer depends on this directly; WNPRC_EHR and GoogleDrive bring a different version in transitively.
force "com.google.oauth-client:google-oauth-client:${googleOauthClientVersion}"

// Google HTTP Client Library and Guava bring in different versions; force the latest
force "com.google.errorprone:error_prone_annotations:${googleErrorProneAnnotationsVersion}"
// Force patched version of GPRC, dependency of a number of Google service APIs in WNPRC and fileTransfer
Expand Down
15 changes: 7 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ fopVersion=2.9
googleAutoValueAnnotationsVersion=1.10.4
googleErrorProneAnnotationsVersion=2.24.1
googleHttpClientVersion=1.43.3
googleOauthClientVersion=1.34.1
googleProtocolBufVersion=3.25.1
googleOauthClientVersion=1.35.0
googleProtocolBufVersion=3.25.2

graalVersion=23.1.2

Expand All @@ -172,7 +172,7 @@ graalVersion=23.1.2
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
gsonVersion=2.8.9

grpcVersion=1.60.1
grpcVersion=1.61.0

guavaVersion=33.0.0-jre
gwtVersion=2.10.0
Expand Down Expand Up @@ -239,13 +239,13 @@ lombokVersion=1.18.24

luceneVersion=9.9.1

mysqlDriverVersion=8.2.0

mssqlJdbcVersion=12.4.2.jre11

mysqlDriverVersion=8.3.0

# forced compatibility between docker and UserReg-
# update version in modules/UserReg-WS/gradle.properties as well
nettyVersion=4.1.104.Final
nettyVersion=4.1.106.Final

objenesisVersion=1.0

Expand Down Expand Up @@ -291,8 +291,7 @@ springBootTomcatVersion=9.0.83

springVersion=5.3.31

# Do not upgrade until BaseDaoImpl stops calling getGeneratedKeys()
sqliteJdbcVersion=3.42.0.1
sqliteJdbcVersion=3.45.0.0

# NLP and SAML bring stax2-api in as a transitive dependency but with very different versions. We force the later version.
stax2ApiVersion=4.2.1
Expand Down

0 comments on commit 8e2bae3

Please sign in to comment.