From df05d1d5716b7c0324f3f16b8fb0e58124195eb6 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <Josh Eckels>
Date: Mon, 19 Oct 2020 18:35:13 -0700
Subject: [PATCH 1/2] Use consistent versions across modules for Commons
 Collections 4 and Google Protocol Buffers

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index 3b1068008b..fad23b9eef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
 

From 39805589e7c5e021e9b28bda41209cc36ef29941 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <Josh Eckels>
Date: Tue, 20 Oct 2020 16:39:38 -0700
Subject: [PATCH 2/2] Do a top-level forcing for versions of Commons
 Collections 4 and Google Protocol Buffers

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 1908539cad..a0b99b414f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
@@ -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}"