Align versions with ant build.

build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
   id "base"
-  id "com.palantir.consistent-versions" version "1.12.4"
+  id "com.palantir.consistent-versions" version "1.13.1"
   id "com.gradle.build-scan" version "3.0"
   id 'de.thetaphi.forbiddenapis' version '2.7' apply false
 }
@@ -50,6 +50,7 @@ apply from: file('gradle/help.gradle')
 // Ant-compatibility layer. ALL OF THESE SHOULD BE GONE at some point. They are
 // here so that we can coexist with current ant build but they are indicative
 // of potential problems with the build conventions, dependencies, etc.
+apply from: file('gradle/ant-compat/force-versions.gradle')
 apply from: file('gradle/ant-compat/folder-layout.gradle')
 apply from: file('gradle/ant-compat/misc.gradle')
 apply from: file('gradle/ant-compat/resolve.gradle')

gradle/ant-compat/force-versions.gradle

@@ -0,0 +1,11 @@
+
+// Force versions of certain components to align them with ant build.
+
+subprojects {
+  plugins.withType(JavaPlugin) {
+    dependencies {
+      implementation enforcedPlatform('org.slf4j:slf4j-api:1.7.24')
+      implementation enforcedPlatform('commons-logging:commons-logging:1.1.3')
+    }
+  }
+}

gradle/ant-compat/misc.gradle

@@ -27,16 +27,4 @@ configure(project(":lucene:benchmark")) {
   }
 }
 
-// lucene:replicator has httpclient dependency with transitive commons-logging:1.2 but currently
-// requires 1.1.2. This commons-logging should be removed entirely and replaced with slf4j-to-*
-// redirector.
-configure(project(":lucene:replicator")) {
-  plugins.withType(JavaPlugin) {
-    configurations.all {
-      resolutionStrategy {
-        force 'commons-logging:commons-logging:1.1.3'
-      }
-    }
-  }
-}
 

gradle/validation/jar-checks.gradle

@@ -7,6 +7,9 @@
 import org.apache.commons.codec.digest.DigestUtils
 import org.apache.commons.codec.digest.MessageDigestAlgorithms
 
+// This should be true.
+def failOnError = false
+
 buildscript {
   repositories {
     mavenCentral()
@@ -91,8 +94,6 @@ subprojects {
     }
   }
 
-  def failOnError = false
-
   // Verifies that each JAR has a corresponding checksum and that it matches actual JAR available for this dependency.
   task validateJarChecksums() {
     group = 'Dependency validation'
@@ -204,4 +205,4 @@ configure(project(":solr:solr-ref-guide")) {
   [validateJarLicenses, validateJarChecksums].each { task ->
     task.enabled = false
   }
-}
+}

versions.lock

@@ -24,7 +24,7 @@ com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 170aecb4)
 com.google.errorprone:error_prone_annotations:2.1.3 (1 constraints: 180aebb4)
 com.google.guava:guava:25.1-jre (1 constraints: 4a06b047)
 com.google.j2objc:j2objc-annotations:1.1 (1 constraints: b609eba0)
-com.google.protobuf:protobuf-java:3.7.1 (1 constraints: 0d051036)
+com.google.protobuf:protobuf-java:3.6.1 (1 constraints: 0c050d36)
 com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 0605f335)
 com.googlecode.mp4parser:isoparser:1.1.22 (1 constraints: 38052d3b)
@@ -51,7 +51,7 @@ commons-codec:commons-codec:1.11 (1 constraints: d704f230)
 commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
 commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
 commons-io:commons-io:2.5 (2 constraints: be142680)
-commons-logging:commons-logging:1.2 (2 constraints: c8149e7f)
+commons-logging:commons-logging:1.1.3 (2 constraints: c8149e7f)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
 io.dropwizard.metrics:metrics-core:4.0.5 (5 constraints: 204326bf)
 io.dropwizard.metrics:metrics-graphite:4.0.5 (1 constraints: 0b050436)
@@ -202,9 +202,9 @@ org.ow2.asm:asm-commons:5.1 (1 constraints: aa04272c)
 org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
 org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
 org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
-org.slf4j:jcl-over-slf4j:1.7.25 (1 constraints: 4005473b)
+org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.25 (19 constraints: aaff8c21)
+org.slf4j:slf4j-api:1.7.24 (19 constraints: a7ff2521)
-org.slf4j:slf4j-simple:1.7.25 (1 constraints: 4005473b)
+org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)
 org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
 org.tukaani:xz:1.8 (1 constraints: ad04222c)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
@@ -227,4 +227,4 @@ org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
 org.locationtech.jts:jts-core:1.15.0 (1 constraints: 3905383b)
 org.mockito:mockito-core:2.23.4 (1 constraints: 3d05403b)
 org.objenesis:objenesis:2.6 (2 constraints: 5f0ffb79)
-org.slf4j:log4j-over-slf4j:1.7.25 (1 constraints: 4005473b)
+org.slf4j:log4j-over-slf4j:1.7.24 (1 constraints: 4005473b)

versions.props

@@ -10,7 +10,7 @@ com.github.ben-manes.caffeine:caffeine=2.8.0
 com.github.virtuald:curvesapi=1.04
 com.github.zafarkhaja:java-semver=0.9.0
 com.google.guava:guava=25.1-jre
-com.google.protobuf:protobuf-java=3.7.1
+com.google.protobuf:protobuf-java=3.6.1
 com.google.re2j:re2j=1.2
 com.googlecode.juniversalchardet:juniversalchardet=1.0.3
 com.googlecode.mp4parser:isoparser=1.1.22