docs/attachments/LUCENE-6230/LUCENE-6230_fix_ecj_increase_ant.patch

Index: lucene/BUILD.txt
===================================================================
--- lucene/BUILD.txt	(revision 1658537)
+++ lucene/BUILD.txt	(working copy)
@@ -1,7 +1,7 @@
 Lucene Build Instructions
 
 Basic steps:
-  0) Install JDK 1.8 (or greater), Ant 1.8.2+, Ivy 2.2.0
+  0) Install JDK 1.8 (or greater), Ant 1.8.3+, Ivy 2.2.0
   1) Download Lucene from Apache and unpack it
   2) Connect to the top-level of your Lucene installation
   3) Install JavaCC (optional)
@@ -8,7 +8,7 @@
   4) Run ant
 
 Step 0) Set up your development environment (JDK 1.8 or greater,
-Ant 1.8.2+, Ivy 2.2.0)
+Ant 1.8.3+, Ivy 2.2.0)
 
 We'll assume that you know how to get and set up the JDK - if you
 don't, then we suggest starting at http://www.oracle.com/java/ and learning
@@ -16,7 +16,7 @@
 JDK 1.8 and later.
 
 Like many Open Source java projects, Lucene uses Apache Ant for build
-control.  Specifically, you MUST use Ant version 1.8.2+.
+control.  Specifically, you MUST use Ant version 1.8.3+.
 
 Ant is "kind of like make without make's wrinkles".  Ant is
 implemented in java and uses XML-based configuration files.  You can
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1658537)
+++ lucene/common-build.xml	(working copy)
@@ -301,9 +301,9 @@
   </condition>
 
   <!-- Check for minimum supported ANT version. -->
-  <fail message="Minimum supported ANT version is 1.8.2. Yours: ${ant.version}">
+  <fail message="Minimum supported ANT version is 1.8.3. Yours: ${ant.version}">
     <condition>
-      <not><antversion atleast="1.8.2" /></not>
+      <not><antversion atleast="1.8.3" /></not>
     </condition>
   </fail>
 
@@ -1921,29 +1921,22 @@
     <element name="nested" implicit="yes" optional="yes"/>
 
     <sequential>
-      <!-- hack: we can tell ECJ not to create classfiles, but it still creates
-           package-info.class files. so redirect output to a tempdir -->
-      <tempfile property="ecj.trash.out" destdir="${java.io.tmpdir}" prefix="ecj"/>
-      <mkdir dir="${ecj.trash.out}"/>
       <javac
         includeAntRuntime="@{includeantruntime}"
         encoding="${build.encoding}"
         srcdir="@{srcdir}"
-        destdir="${ecj.trash.out}"
         source="@{javac.source}"
         target="@{javac.source}"
-        taskname="ecj-lint">
+        taskname="ecj-lint"
+        createMissingPackageInfoClass="false">
         <ecj-component/>
         <nested/>
-      <!-- hack: we can't disable classfile creation right now, because we need
-           to specify a destination for buggy package-info.class files
         <compilerarg value="-d"/>
-        <compilerarg value="none"/> -->
+        <compilerarg value="none"/>
         <compilerarg value="-enableJavadoc"/>
         <compilerarg value="-properties"/>
         <compilerarg value="@{configuration}"/>
       </javac>
-      <delete dir="${ecj.trash.out}"/>
     </sequential>
   </macrodef>
 
Index: lucene/ivy-versions.properties
===================================================================
--- lucene/ivy-versions.properties	(revision 1658537)
+++ lucene/ivy-versions.properties	(working copy)
@@ -84,7 +84,7 @@
 /net.sourceforge.jmatio/jmatio = 1.0
 /net.sourceforge.nekohtml/nekohtml = 1.9.17
 /org.antlr/antlr-runtime = 3.5
-/org.apache.ant/ant = 1.8.2
+/org.apache.ant/ant = 1.8.3
 /org.apache.avro/avro = 1.7.5
 /org.apache.commons/commons-compress = 1.8.1
 /org.apache.derby/derby = 10.9.1.0
Index: lucene/licenses/ant-1.8.2.jar.sha1
===================================================================
--- lucene/licenses/ant-1.8.2.jar.sha1	(revision 1658537)
+++ lucene/licenses/ant-1.8.2.jar.sha1	(working copy)
@@ -1 +0,0 @@
-fc33bf7cd8c5309dd7b81228e8626515ee42efd9
Index: lucene/licenses/ant-1.8.3.jar.sha1
===================================================================
--- lucene/licenses/ant-1.8.3.jar.sha1	(revision 0)
+++ lucene/licenses/ant-1.8.3.jar.sha1	(working copy)
@@ -0,0 +1 @@
+077c746ecab048b9839c7a8e39e55fe8636c5b11

Property changes on: lucene/licenses/ant-1.8.3.jar.sha1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: solr/README.txt
===================================================================
--- solr/README.txt	(revision 1658537)
+++ solr/README.txt	(working copy)
@@ -129,7 +129,7 @@
    folder included on your command path. To test this, issue a "java -version" command 
    from your shell (command prompt) and verify that the Java version is 1.8 or later.
 
-2. Download the Apache Ant binary distribution (1.8.2+) from 
+2. Download the Apache Ant binary distribution (1.8.3+) from 
    http://ant.apache.org/  You will need Ant installed and the $ANT_HOME/bin (Windows: 
    %ANT_HOME%\bin) folder included on your command path. To test this, issue a 
    "ant -version" command from your shell (command prompt) and verify that Ant is 
Index: solr/licenses/ant-1.8.2.jar.sha1
===================================================================
--- solr/licenses/ant-1.8.2.jar.sha1	(revision 1658537)
+++ solr/licenses/ant-1.8.2.jar.sha1	(working copy)
@@ -1 +0,0 @@
-fc33bf7cd8c5309dd7b81228e8626515ee42efd9
Index: solr/licenses/ant-1.8.3.jar.sha1
===================================================================
--- solr/licenses/ant-1.8.3.jar.sha1	(revision 0)
+++ solr/licenses/ant-1.8.3.jar.sha1	(working copy)
@@ -0,0 +1 @@
+077c746ecab048b9839c7a8e39e55fe8636c5b11

Property changes on: solr/licenses/ant-1.8.3.jar.sha1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property