You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2017/02/07 09:07:30 UTC
[4/7] lucene-solr:branch_5_5: LUCENE-7596: Update Groovy to version
2.4.8 to allow building with Java 9 build 148+. Also update JGit version for
working-copy checks.
LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9 build 148+. Also update JGit version for working-copy checks.
# Conflicts:
# build.xml
# lucene/common-build.xml
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/85f08a5e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/85f08a5e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/85f08a5e
Branch: refs/heads/branch_5_5
Commit: 85f08a5ed299132e1e3b94eee0e6248086d19d48
Parents: 7b85395
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Jan 13 20:20:31 2017 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Feb 7 09:32:17 2017 +0100
----------------------------------------------------------------------
build.xml | 2 +-
lucene/CHANGES.txt | 3 +++
lucene/common-build.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/85f08a5e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 79fbaa4..d8eb7f7 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
<project name="lucene-solr" default="-projecthelp" basedir=".">
<import file="lucene/common-build.xml"/>
- <property name="jgit-version" value="4.2.0.201601211800-r"/>
+ <property name="jgit-version" value="4.6.0.201612231935-r"/>
<property name="tests.heap-dump-dir" location="heapdumps"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/85f08a5e/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c8564fb..6296873 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -32,6 +32,9 @@ Build
Lucene and Solr DOAP RDF files into the Git source repository under
dev-tools/doap/ and then pulling release dates from those files, rather than
from JIRA. (Mano Kovacs, hossman, Steve Rowe)
+
+* LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9
+ build 148+. Also update JGit version for working-copy checks. (Uwe Schindler)
======================= Lucene 5.5.3 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/85f08a5e/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 3159290..8c0549f 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2428,7 +2428,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<!-- GROOVY scripting engine for ANT tasks -->
<target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
- <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.4"
+ <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.8"
inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
<taskdef name="groovy"
classname="org.codehaus.groovy.ant.Groovy"