Skip to content

Use consistent versions for Commons Collections 4 and Google Protocol Buffers #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Oct 21, 2020
Merged

Use consistent versions for Commons Collections 4 and Google Protocol Buffers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df05d1d
Use consistent versions across modules for Commons Collections 4 and …
Oct 20, 2020
3980558
Do a top-level forcing for versions of Commons Collections 4 and Goog…
Oct 20, 2020
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
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ allprojects {
force "commons-collections:commons-collections:${commonsCollectionsVersion}"
// force version for ms2, saml, fileTransfer, harvest, scrumtime, api, accounts, docker
force "commons-codec:commons-codec:${commonsCodecVersion}"
// force version consistency in OmeroIntegration, API, probably many more
force "org.apache.commons:commons-collections4:${commonsCollections4Version}"
// force version consistency in TCRdb, SequenceAnalysis, API
force "org.apache.commons:commons-math3:${commonsMath3Version}"
// force version for api, accounts, fileTransfer, harvest, scrumtime, docker
Expand All @@ -206,6 +208,8 @@ allprojects {
force "xml-apis:xml-apis:${xmlApisVersion}"
// cloud and SequenceAnalysis bring this in as a transitive dependency. We resolve to the later version here to keep things consistent
force "com.google.code.gson:gson:${gsonVersion}"
// TargetedMS uses this directly, and OmeroIntegration brings this in as a transitive dependency
force "com.google.protobuf:protobuf-java:${googleProtocolBufVersion}"
// workflow (Activiti) brings in older versions of these libraries, so we need to force these versions
force "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
force "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ googleApiServicesCalendarVersion=v3-rev255-1.23.0
googleApiClientVersion=1.23.0
googleHttpClientVersion=1.23.0
googleOauthClientVersion=1.23.0
googleProtocolBufVersion=3.12.2

graalVersion=20.0.0

Expand Down