You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/06/01 15:42:07 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_3 updated (24aa9aa ->
04bdcea)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 24aa9aa SOLR-13452: Clean up and fix various regenerate issues and get buildTest passing.
new d817768 SOLR-13452: Fix runJflex target we have in lucene to give a better top level description.
new ee874c9 SOLR-13452: Don't resolve runtimeClasspath.files during configuration.
new 04bdcea SOLR-13452: Update gradle-consistent-versions plugin to pick up verifyLocks task.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 2 +-
.../main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy | 4 ++--
lucene/build.gradle | 2 +-
versions.lock | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
[lucene-solr] 01/03: SOLR-13452: Fix runJflex target we have in
lucene to give a better top level description.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d817768e3d4dd13de70261c8b79039ac1f0dbcc3
Author: markrmiller <ma...@apache.org>
AuthorDate: Fri May 31 21:32:05 2019 -0500
SOLR-13452: Fix runJflex target we have in lucene to give a better top level description.
---
lucene/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lucene/build.gradle b/lucene/build.gradle
index bbdb699..c2c726c 100644
--- a/lucene/build.gradle
+++ b/lucene/build.gradle
@@ -39,7 +39,7 @@ task packageDist(type: org.apache.lucene.gradle.PackageLuceneSolrDist) {
description = "Generates the Lucene and Solr distribution."
}
-task jflex(type: org.apache.lucene.gradle.JFlex) {
+task runJflex() {
group = 'Build Regenerate'
description = "Runs all jflex targets to regenerate src files."
}
\ No newline at end of file
[lucene-solr] 03/03: SOLR-13452: Update gradle-consistent-versions
plugin to pick up verifyLocks task.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 04bdcea40714841fc21fc770c114a5121bedf26b
Author: markrmiller <ma...@apache.org>
AuthorDate: Sat Jun 1 10:41:47 2019 -0500
SOLR-13452: Update gradle-consistent-versions plugin to pick up verifyLocks task.
---
build.gradle | 2 +-
versions.lock | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 038f73d..44dea47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ import org.apache.lucene.gradle.CheckWorkingCopy
import org.apache.lucene.gradle.LuceneSolrForbiddenApisPlugin
plugins {
- id "com.palantir.consistent-versions" version "1.6.1"
+ id "com.palantir.consistent-versions" version "1.8.0"
}
// define lucene-solr project lists that exclude buildSrc
diff --git a/versions.lock b/versions.lock
index e66a081..01059f6 100644
--- a/versions.lock
+++ b/versions.lock
@@ -206,7 +206,7 @@ org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
org.jdom:jdom2:2.0.6 (2 constraints: 681134f2)
-org.jsoup:jsoup:1.11.3 (1 constraints: 8d0c750e)
+org.jsoup:jsoup:1.11.3 (2 constraints: c411dd0f)
org.jvnet.staxex:stax-ex:1.7.8 (1 constraints: c50dc135)
org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c)
org.noggit:noggit:0.8 (1 constraints: ac041f2c)
[lucene-solr] 02/03: SOLR-13452: Don't resolve
runtimeClasspath.files during configuration.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ee874c9f2544eecb102802ff17ff64c0c5241bb7
Author: markrmiller <ma...@apache.org>
AuthorDate: Sat Jun 1 10:39:16 2019 -0500
SOLR-13452: Don't resolve runtimeClasspath.files during configuration.
---
.../main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
index 2936e86..d085636 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
@@ -78,7 +78,7 @@ class PackageLuceneSolrDist extends DefaultTask {
include "*.jar"
into (project.relativePath(subproject.projectDir))
}
- def files = getFiles(subproject)
+ def files = { getFiles(subproject) }
from(files) {
include "*.jar"
into (project.relativePath(subproject.projectDir) + "/lib")
@@ -112,7 +112,7 @@ class PackageLuceneSolrDist extends DefaultTask {
include "*.jar"
into (project.relativePath(subproject.projectDir))
}
- def files = getFiles(subproject)
+ def files = { getFiles(subproject) }
from(files) {
include "*.jar"
into (project.relativePath(subproject.projectDir) + "/lib")