[lucene-solr] branch master updated: Move jgit version declaration to scriptDepVersions.

[dw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 7604639  Move jgit version declaration to scriptDepVersions.
7604639 is described below

commit 7604639b599bdf007de6018f418c60d88f647a33
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Thu Feb 20 13:54:07 2020 +0100

    Move jgit version declaration to scriptDepVersions.
---
 build.gradle                        | 7 ++++---
 gradle/validation/git-status.gradle | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 03637bd..cff33c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,13 +37,14 @@ ext {
   buildTime = DateTimeFormatter.ofPattern("HH:mm:ss").format(tstamp)
   buildYear = DateTimeFormatter.ofPattern("yyyy").format(tstamp)
 
-  // Workaround for this one, for now:
-  // https://github.com/palantir/gradle-consistent-versions/issues/383
+  // Declare script dependency versions outside of palantir's
+  // version unification control. These are not our main dependencies.
   scriptDepVersions = [
       "apache-rat": "0.11",
+      "ecj": "3.19.0",
       "javacc": "5.0",
       "jflex": "1.7.0",
-      "ecj": "3.19.0"
+      "jgit": "5.3.0.201903130848-r",
   ]
 }
 
diff --git a/gradle/validation/git-status.gradle b/gradle/validation/git-status.gradle
index ea4ae63..5706b0a 100644
--- a/gradle/validation/git-status.gradle
+++ b/gradle/validation/git-status.gradle
@@ -21,15 +21,13 @@ import org.eclipse.jgit.api.*;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.errors.*;
 
-
 buildscript {
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath 'org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r'
-    classpath 'commons-codec:commons-codec:1.6'
+    classpath "org.eclipse.jgit:org.eclipse.jgit:${scriptDepVersions['jgit']}"
   }
 }