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 2018/02/07 18:27:15 UTC

lucene-solr:master: LUCENE-8156: Require users to not have ASM on the Ant classpath during build (this is required by LUCENE-7966)

Repository: lucene-solr
Updated Branches:
  refs/heads/master 62537bebc -> 466c1ef4d


LUCENE-8156: Require users to not have ASM on the Ant classpath during build (this is required by LUCENE-7966)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/466c1ef4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/466c1ef4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/466c1ef4

Branch: refs/heads/master
Commit: 466c1ef4dab4e6da932369a13f587410b6df3203
Parents: 62537be
Author: Uwe Schindler <us...@apache.org>
Authored: Wed Feb 7 19:26:52 2018 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Wed Feb 7 19:26:52 2018 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt      | 3 +++
 lucene/common-build.xml | 6 ++++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/466c1ef4/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e6ba0f2..8ab18a9 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -175,6 +175,9 @@ Other
 * LUCENE-8075: Removed unnecessary null check in IntersectTermsEnum.
   (Pulak Ghosh via Adrien Grand)
 
+* LUCENE-8156: Require users to not have ASM on the Ant classpath during build.
+  This is required by LUCENE-7966. (Adrien Grand, Uwe Schindler)
+
 ======================= Lucene 7.2.1 =======================
 
 Bug Fixes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/466c1ef4/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 7ce8d6f..e63b116 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -65,6 +65,12 @@
       <not><matches pattern="^\Q${version.base}\E(|\-.*)$" casesensitive="true" string="${version}"/></not>
     </condition>
   </fail>
+  
+  <fail message="Your ~/.ant/lib folder or the main classpath of Ant contains some version of ASM. Please remove it, otherwise this build can't run correctly.">
+    <condition>
+      <available classname="org.objectweb.asm.ClassReader"/>
+    </condition>
+  </fail>
 
   <property name="year" value="2000-${current.year}"/>