lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject [1/2] lucene-solr:master: LUCENE-7387: fix defaultCodec in build.xml to account for the line ending
Date Tue, 15 Nov 2016 19:36:42 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x b90b4dc69 -> 38a67e25a
  refs/heads/master 358c16462 -> 280cbfd8f


LUCENE-7387: fix defaultCodec in build.xml to account for the line ending

this not only fixes the link in the javadoc to be correct, but also gets precommit working
with ant 1.9.6


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

Branch: refs/heads/master
Commit: 280cbfd8fb70376be3d32902baa629baf0b66e00
Parents: 358c164
Author: Chris Hostetter <hossman@apache.org>
Authored: Tue Nov 15 12:24:54 2016 -0700
Committer: Chris Hostetter <hossman@apache.org>
Committed: Tue Nov 15 12:24:54 2016 -0700

----------------------------------------------------------------------
 lucene/CHANGES.txt | 5 +++++
 lucene/build.xml   | 2 ++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/280cbfd8/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 213a8f9..5182276 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -92,6 +92,11 @@ Other
 
 * LUCENE-7534: fix smokeTestRelease.py to run on Cygwin (Mikhail Khludnev)
 
+Build
+
+* LUCENE-7387: fix defaultCodec in build.xml to account for the line ending (hossman)
+
+
 ======================= Lucene 6.3.0 =======================
 
 API Changes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/280cbfd8/lucene/build.xml
----------------------------------------------------------------------
diff --git a/lucene/build.xml b/lucene/build.xml
index ca13941..11f4644 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -213,6 +213,8 @@
       <filterchain>
         <!--  private static Codec defaultCodec   =   LOADER    .   lookup    (   "LuceneXXX"
                )   ; -->
         <containsregex pattern="^.*defaultCodec\s*=\s*LOADER\s*\.\s*lookup\s*\(\s*&quot;([^&quot;]+)&quot;\s*\)\s*;.*$"
replace="\1"/>
+        <fixcrlf eol="unix" eof="remove" />
+        <deletecharacters chars="\n"/>
       </filterchain>
     </loadfile>
 


Mime
View raw message