[lucene-solr] branch jira/LUCENE-9220 updated: LUCENE-9220: move all this stuff to lucene/analysis/common, leaving just one task at the root that depends on it

[rm...@apache.org]

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

rmuir pushed a commit to branch jira/LUCENE-9220
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/LUCENE-9220 by this push:
     new 600bb7e  LUCENE-9220: move all this stuff to lucene/analysis/common, leaving just one task at the root that depends on it
600bb7e is described below

commit 600bb7e5d7764f5e1346d411a6928246be01258b
Author: Robert Muir <rm...@apache.org>
AuthorDate: Mon Feb 17 07:23:33 2020 -0500

    LUCENE-9220: move all this stuff to lucene/analysis/common, leaving just one task at the root that depends on it
---
 gradle/generation/snowball.gradle | 28 +++++++++++++---------------
 lucene/analysis/common/README.txt |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/gradle/generation/snowball.gradle b/gradle/generation/snowball.gradle
index b4f68b8..a6f5e88 100644
--- a/gradle/generation/snowball.gradle
+++ b/gradle/generation/snowball.gradle
@@ -18,20 +18,22 @@
 apply plugin: "de.undercouch.download"
 
 configure(rootProject) {
-  ext {
-    snowballWorkDir    = file("${buildDir}/snowball")
-    snowballStemmerDir = file("${buildDir}/snowball/stemmers")
-    snowballPatchedDir = file("${buildDir}/snowball/patched")
-    snowballWebsiteDir = file("${buildDir}/snowball/website")
-    snowballDataDir    = file("${buildDir}/snowball/data")
-  }
-
   task snowball()  {
     description "Regenerate snowball-based sources, stopwords, and tests for ...lucene/analysis."
     group "generation"
 
     dependsOn ":lucene:analysis:common:snowballGen"
   }
+}
+
+configure(project(":lucene:analysis:common")) {
+  ext {
+    snowballWorkDir    = file("${buildDir}/snowball")
+    snowballStemmerDir = file("${snowballWorkDir}/stemmers")
+    snowballPatchedDir = file("${snowballWorkDir}/patched")
+    snowballWebsiteDir = file("${snowballWorkDir}/website")
+    snowballDataDir    = file("${snowballWorkDir}/data")
+  }
 
   task downloadSnowballStemmers(type: Download) {
     def stemmerZip = file("${snowballWorkDir}/stemmers.zip")
@@ -98,15 +100,11 @@ configure(rootProject) {
       ant.patch(patchfile: rootProject.file("gradle/generation/snowball.patch"), dir: snowballPatchedDir, strip: "1")
     }
   }
-}
 
-configure(project(":lucene:analysis:common")) {
   task snowballGen() {
-    description "Patch and Regenerate snowball sources, stopwords, and tests"
-    group "generation"
-    dependsOn rootProject.patchSnowball
-    dependsOn rootProject.downloadSnowballWebsite
-    dependsOn rootProject.downloadSnowballData
+    dependsOn patchSnowball
+    dependsOn downloadSnowballWebsite
+    dependsOn downloadSnowballData
 
     doLast {
       project.exec {
diff --git a/lucene/analysis/common/README.txt b/lucene/analysis/common/README.txt
index a3ce924..2d6cac9 100644
--- a/lucene/analysis/common/README.txt
+++ b/lucene/analysis/common/README.txt
@@ -5,7 +5,7 @@ now located at https://github.com/snowballstem/snowball/tree/53739a805cfa6c77ff8
 together with classes integrating them with the Lucene search engine.
 
 The snowball tree needs patches applied to properly generate efficient code for lucene.
-You can regenerate everything with 'gradlew -p lucene/analysis/common snowballGen'
+You can regenerate everything with 'gradlew snowball'
 Refer to gradle/generation/snowball* files in the build for upgrading snowball.
 
 IMPORTANT NOTICE ON BACKWARDS COMPATIBILITY!