You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/02/19 03:24:15 UTC
svn commit: r1569612 - in /lucene/dev/branches/lucene_solr_4_7: ./ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/
lucene/analysis/common/src/java/org/apache/lucene/analysis/st...
Author: sarowe
Date: Wed Feb 19 02:24:14 2014
New Revision: 1569612
URL: http://svn.apache.org/r1569612
Log:
LUCENE-5411: Upgrade to released JFlex 1.5.0; stop requiring a locally built JFlex snapshot jar. (merged trunk r1560260)
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/build.xml
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/CHANGES.txt Wed Feb 19 02:24:14 2014
@@ -132,6 +132,9 @@ Build
* LUCENE-5383: fix changes2html to link pull requests (Steve Rowe)
+* LUCENE-5411: Upgrade to released JFlex 1.5.0; stop requiring
+ a locally built JFlex snapshot jar. (Steve Rowe)
+
Bug fixes
* LUCENE-5285: Improved highlighting of multi-valued fields with
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/build.xml?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/build.xml Wed Feb 19 02:24:14 2014
@@ -29,7 +29,7 @@
<import file="../analysis-module-build.xml"/>
- <target name="jflex" depends="jflex-check,clean-jflex,-gen-uax29-supp-macros,
+ <target name="jflex" depends="-install-jflex,clean-jflex,-gen-uax29-supp-macros,
-jflex-StandardAnalyzer,-jflex-UAX29URLEmailTokenizer,
-jflex-wiki-tokenizer,-jflex-HTMLStripCharFilter"/>
@@ -40,11 +40,7 @@
</target>
<target name="-jflex-HTMLStripCharFilter"
- depends="init,jflex-check,generate-jflex-html-char-entities"
- if="jflex.present">
- <taskdef classname="jflex.anttask.JFlexTask" name="jflex">
- <classpath refid="jflex.classpath"/>
- </taskdef>
+ depends="init,generate-jflex-html-char-entities">
<jflex file="src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex"
outdir="src/java/org/apache/lucene/analysis/charfilter"
nobak="on" inputstreamctor="false"/>
@@ -65,17 +61,11 @@
<fixcrlf file="src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex" encoding="UTF-8"/>
</target>
- <target name="-jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">
- <taskdef classname="jflex.anttask.JFlexTask" name="jflex">
- <classpath refid="jflex.classpath"/>
- </taskdef>
+ <target name="-jflex-wiki-tokenizer" depends="init,-install-jflex">
<run-jflex dir="src/java/org/apache/lucene/analysis/wikipedia" name="WikipediaTokenizerImpl"/>
</target>
- <target name="-jflex-StandardAnalyzer" depends="init,jflex-check" if="jflex.present">
- <taskdef classname="jflex.anttask.JFlexTask" name="jflex">
- <classpath refid="jflex.classpath"/>
- </taskdef>
+ <target name="-jflex-StandardAnalyzer" depends="init,-install-jflex">
<run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="StandardTokenizerImpl"/>
<run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="ClassicTokenizerImpl"/>
<run-jflex dir="src/java/org/apache/lucene/analysis/standard/std31" name="StandardTokenizerImpl31"/>
@@ -83,10 +73,7 @@
<run-jflex dir="src/java/org/apache/lucene/analysis/standard/std40" name="StandardTokenizerImpl40"/>
</target>
- <target name="-jflex-UAX29URLEmailTokenizer" depends="jflex-check" if="jflex.present">
- <taskdef classname="jflex.anttask.JFlexTask" name="jflex">
- <classpath refid="jflex.classpath"/>
- </taskdef>
+ <target name="-jflex-UAX29URLEmailTokenizer" depends="init,-install-jflex">
<run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="UAX29URLEmailTokenizerImpl"/>
<run-jflex dir="src/java/org/apache/lucene/analysis/standard/std31" name="UAX29URLEmailTokenizerImpl31"/>
<run-jflex dir="src/java/org/apache/lucene/analysis/standard/std34" name="UAX29URLEmailTokenizerImpl34"/>
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java Wed Feb 19 02:24:14 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.jflex</tt>
*/
public final class StandardTokenizerImpl31 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java Wed Feb 19 02:24:14 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.jflex</tt>
*/
public final class UAX29URLEmailTokenizerImpl31 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java Wed Feb 19 02:24:14 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.jflex</tt>
*/
public final class StandardTokenizerImpl34 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.java Wed Feb 19 02:24:14 2014
@@ -35,7 +35,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/UAX29URLEmailTokenizerImpl34.jflex</tt>
*/
public final class UAX29URLEmailTokenizerImpl34 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java Wed Feb 19 02:24:14 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex</tt>
*/
public final class UAX29URLEmailTokenizerImpl36 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java Wed Feb 19 02:24:14 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex</tt>
*/
public final class StandardTokenizerImpl40 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java Wed Feb 19 02:24:14 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex</tt>
+ * from the specification file <tt>/Users/sarowe/svn/lucene/dev/branches/lucene_solr_4_7/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex</tt>
*/
public final class UAX29URLEmailTokenizerImpl40 implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml?rev=1569612&r1=1569611&r2=1569612&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml Wed Feb 19 02:24:14 2014
@@ -227,17 +227,6 @@
<property name="m2.repository.id" value="local"/>
<property name="m2.credentials.prompt" value="true"/>
- <property name="jflex.home" location="${common.dir}"/>
-
- <path id="jflex.classpath">
- <fileset dir="${jflex.home}/">
- <!-- for a JFlex trunk checkout: -->
- <include name="jflex/target/*.jar"/>
- <!-- for a JFlex distribution (not yet available): -->
- <include name="lib/*.jar"/>
- </fileset>
- </path>
-
<property name="backwards.dir" location="backwards"/>
<property name="build.dir.backwards" location="${build.dir}/backwards"/>
@@ -475,31 +464,6 @@
</sequential>
</macrodef>
- <target name="jflex-check">
- <available property="jflex.present" classname="jflex.anttask.JFlexTask">
- <classpath refid="jflex.classpath"/>
- </available>
- <fail unless="jflex.present"> 
- ##################################################################
- JFlex not found.
- JFlex Home: ${jflex.home}
-
- Please install the jFlex 1.5 version (currently not released)
- from its SVN repository:
-
- svn co -r 722 https://svn.code.sf.net/p/jflex/code/trunk jflex
- cd jflex
- mvn install
-
- Then, create a build.properties file either in your home
- directory, or within the Lucene directory and set the jflex.home
- property to the path where the JFlex trunk checkout is located
- (in the above example it's the directory called "jflex").
-
- ##################################################################
- </fail>
- </target>
-
<target name="compile-core" depends="init, clover"
description="Compiles core classes">
<compile
@@ -2200,7 +2164,15 @@ ${ant.project.name}.test.dependencies=${
</scp>
</sequential>
</macrodef>
-
+
+ <!-- JFlex task -->
+ <target name="-install-jflex" unless="jflex.loaded" depends="ivy-availability-check,ivy-configure">
+ <ivy:cachepath organisation="de.jflex" module="jflex" revision="1.5.0"
+ inline="true" conf="default" transitive="true" pathid="jflex.classpath"/>
+ <taskdef name="jflex" classname="jflex.anttask.JFlexTask" classpathref="jflex.classpath"/>
+ <property name="jflex.loaded" value="true"/>
+ </target>
+
<!-- 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.2.1"