lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwe...@apache.org
Subject [lucene-solr] branch gradle-master updated: Add workaround for https://github.com/palantir/gradle-consistent-versions/issues/383
Date Wed, 15 Jan 2020 10:44:28 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/gradle-master by this push:
     new 44c203d  Add workaround for https://github.com/palantir/gradle-consistent-versions/issues/383
44c203d is described below

commit 44c203d72fb14c7527068d9cca3914619c7d9e5d
Author: Dawid Weiss <dweiss@apache.org>
AuthorDate: Wed Jan 15 11:44:21 2020 +0100

    Add workaround for https://github.com/palantir/gradle-consistent-versions/issues/383
---
 build.gradle                                      | 6 ++++++
 gradle/validation/rat-sources.gradle              | 2 +-
 gradle/validation/validate-source-patterns.gradle | 2 +-
 versions.props                                    | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 75756fd..0dc2c14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,12 @@ ext {
   buildDate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(tstamp)
   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
+  scriptDepVersions = [
+      "apache-rat": "0.11"
+  ]
 }
 
 // Include smaller chunks configuring dedicated build areas.
diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradle
index 841ad9d..c50bd50 100644
--- a/gradle/validation/rat-sources.gradle
+++ b/gradle/validation/rat-sources.gradle
@@ -25,7 +25,7 @@ configure(rootProject) {
     }
 
     dependencies {
-        ratDeps "org.apache.rat:apache-rat"
+        ratDeps "org.apache.rat:apache-rat:${scriptDepVersions['apache-rat']}"
     }
 }
 
diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradle
index f177c4b..453a467 100644
--- a/gradle/validation/validate-source-patterns.gradle
+++ b/gradle/validation/validate-source-patterns.gradle
@@ -10,7 +10,7 @@ configure(rootProject) {
 
   dependencies {
     checkSourceDeps "org.codehaus.groovy:groovy-all:2.4.17"
-    checkSourceDeps "org.apache.rat:apache-rat"
+    checkSourceDeps "org.apache.rat:apache-rat:${scriptDepVersions['apache-rat']}"
   }
 
   task validateSourcePatterns() {
diff --git a/versions.props b/versions.props
index 94c48ef..7f25678 100644
--- a/versions.props
+++ b/versions.props
@@ -72,7 +72,6 @@ org.apache.opennlp:opennlp-tools=1.9.1
 org.apache.pdfbox:*=2.0.17
 org.apache.pdfbox:jempbox=1.8.16
 org.apache.poi:*=4.1.1
-org.apache.rat:apache-rat:0.11
 org.apache.tika:*=1.23
 org.apache.velocity.tools:*=3.0
 org.apache.xmlbeans:xmlbeans=3.1.0


Mime
View raw message