You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/03/28 12:50:48 UTC
svn commit: r1086181 [2/20] - in /lucene/dev/branches/docvalues: ./
dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/ dev-tools/idea/solr/
dev-tools/idea/solr/contrib/analysis-extras/ dev-to...
Modified: lucene/dev/branches/docvalues/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/README.txt?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/README.txt (original)
+++ lucene/dev/branches/docvalues/README.txt Mon Mar 28 10:50:28 2011
@@ -1,3 +1,5 @@
+Apache Lucene/Solr
+
lucene/ is a search engine library
solr/ is a search engine server that uses lucene
modules/ is shared code
Modified: lucene/dev/branches/docvalues/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/build.xml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/build.xml (original)
+++ lucene/dev/branches/docvalues/build.xml Mon Mar 28 10:50:28 2011
@@ -18,6 +18,7 @@
-->
<project name="lucene-solr" default="test" basedir=".">
+ <import file="common-build.xml"/>
<target name="test" description="Test both Lucene and Solr">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
@@ -27,9 +28,16 @@
</subant>
</sequential>
</target>
-
- <target name="compile" description="Compile Lucene and Solr">
+ <target name="validate" description="Validate dependencies, licenses, etc.">
+ <sequential><subant target="validate" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="modules" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant></sequential>
+ </target>
+ <target name="compile" depends="validate" description="Compile Lucene and Solr">
<sequential>
+
<subant target="compile" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="modules" includes="build.xml" />
@@ -83,19 +91,9 @@
</echo>
</target>
- <condition property="isMac"><os family="mac"/></condition>
- <condition property="isUnix"><os family="unix"/></condition>
- <condition property="isWindows"><os family="windows"/></condition>
- <property environment="env"/>
- <target name="idea" depends="copy-idea-files,finish-idea-setup-windows,
- finish-idea-setup-mac,
- finish-idea-setup-unix"
- description="Setup IntelliJ IDEA configuration files"/>
- <target name="copy-idea-files">
+ <target name="idea" description="Setup IntelliJ IDEA configuration">
<copy todir=".">
- <fileset dir="dev-tools/idea">
- <exclude name="Intellij-Lucene-Codestyle.xml"/>
- </fileset>
+ <fileset dir="dev-tools/idea"/>
</copy>
<echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
<subant target="get-je-jar">
@@ -105,57 +103,18 @@
<subant target="get-db-jar">
<fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
</subant>
- </target>
- <target name="finish-idea-setup-windows" if="isWindows">
<echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools\idea\Intellij-Lucene-Codestyle.xml to
- ${env.HOMEDRIVE}${env.HOMEPATH}\.IntelliJIdeaXX\config\codestyles\
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
To complete IntelliJ IDEA setup, you must manually configure
Project Structure | Project | Project SDK.
</echo>
</target>
- <target name="finish-idea-setup-mac" if="isMac">
- <echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools/idea/Intellij-Lucene-Codestyle.xml to
- ~/Library/Preferences/IntelliJXX/codestyles/
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
- To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
- </echo>
- </target>
- <target name="finish-idea-setup-unix" if="isUnix">
- <echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools/idea/Intellij-Lucene-Codestyle.xml to
- ~/.IntelliJIdeaXX/config/codestyles/
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
- To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
- </echo>
- </target>
- <target name="clean-idea"
+ <target name="clean-idea"
description="Removes all IntelliJ IDEA configuration files">
<delete dir=".idea" failonerror="true"/>
<delete failonerror="true">
<fileset dir="." includes="*.iml,*.ipr,*.iws"/>
<fileset dir="solr" includes="**/*.iml"/>
<fileset dir="lucene" includes="**/*.iml"/>
- <fileset dir="modules" includes="**/*.iml"/>
</delete>
</target>
Modified: lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath Mon Mar 28 10:50:28 2011
@@ -90,11 +90,10 @@
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.0.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.1.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/xml-apis-2.9.0.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
@@ -104,7 +103,7 @@
<classpathentry kind="lib" path="solr/lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/easymock.jar"/>
+ <classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
<classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
@@ -117,15 +116,14 @@
<classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.1.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-util-6.1.26.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-2.5-20081211.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/core-3.1.1.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.4.2.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar"/>
@@ -142,7 +140,6 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2.jar"/>
@@ -157,11 +154,11 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-0.8.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-core.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml Mon Mar 28 10:50:28 2011
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="Servlet API 2.4">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lucene/contrib/demo/lib/servlet-api-2.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/solr/lib/servlet-api-2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/lucene.iml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/lucene.iml Mon Mar 28 10:50:28 2011
@@ -9,6 +9,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
+ <excludeFolder url="file://$MODULE_DIR$/dist" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/parent.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/parent.iml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/parent.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/parent.iml Mon Mar 28 10:50:28 2011
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
- <content url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.idea" />
+ <excludeFolder url="file://$MODULE_DIR$/dist" />
+ </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Mon Mar 28 10:50:28 2011
@@ -7,6 +7,8 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
+ <excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
</content>
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="icu" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml Mon Mar 28 10:50:28 2011
@@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="highlighter" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml Mon Mar 28 10:50:28 2011
@@ -13,6 +13,9 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
+ <excludeFolder url="file://$MODULE_DIR$/dist" />
+ <excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
+ <excludeFolder url="file://$MODULE_DIR$/package" />
</content>
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="highlighter" />
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/ant/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/ant/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/ant/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/ant/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/lucli/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/lucli/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/lucli/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/memory/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/misc/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -52,7 +52,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queries/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queries/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -54,7 +54,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -54,7 +54,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/swing/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/swing/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/swing/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/swing/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/src/test-framework/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/src/test-framework/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -40,45 +40,31 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
- <directory>${build-directory}/classes/test-framework</directory>
- <testOutputDirectory>${build-directory}/classes/test-framework</testOutputDirectory>
- <testSourceDirectory>.</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${project.build.testSourceDirectory}</directory>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
+ <sourceDirectory>.</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.sourceDirectory}</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
- </testResource>
- </testResources>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/common/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -52,7 +52,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/icu/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -55,7 +55,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -71,8 +70,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -47,7 +47,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/analysis/stempel/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -45,7 +45,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -84,12 +83,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -42,9 +42,9 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.5</java.compat.version>
<jetty.version>6.1.26</jetty.version>
+ <patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
<slf4j.version>1.6.1</slf4j.version>
<tika.version>0.8</tika.version>
- <uima.version>${project.version}</uima.version>
</properties>
<issueManagement>
<system>JIRA</system>
@@ -128,9 +128,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.6</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
@@ -259,28 +259,28 @@
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-alchemy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-calais</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-tagger</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-wst</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
- <version>${uima.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -315,12 +315,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
+ <version>${patched.jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
+ <version>${patched.jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -363,14 +363,9 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1-patched-XERCESJ-1257</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -559,6 +554,7 @@
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>NO-REVISION-AVAILABLE</revisionOnScmFailure>
<buildNumberPropertyName>svn.revision</buildNumberPropertyName>
</configuration>
</plugin>
@@ -624,9 +620,9 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.6</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>modules/analysis/icu/lib/icu4j-4_6.jar</file>
</configuration>
@@ -638,28 +634,14 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1-patched-XERCESJ-1257</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
</configuration>
</execution>
<execution>
- <id>install-xml-apis</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
- <packaging>jar</packaging>
- <file>modules/benchmark/lib/xml-apis-2.9.0.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-berkeleydb</id>
<phase>install</phase>
<goals>
@@ -716,74 +698,88 @@
</configuration>
</execution>
<execution>
- <id>install-solr-uima-alchemy-annotator</id>
+ <id>install-solr-uima-an-alchemy</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-alchemy</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-alchemy.jar</file>
+ <file>solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-OpenCalaisAnnotator</id>
+ <id>install-solr-uima-an-calais</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-calais</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-calais.jar</file>
+ <file>solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-Tagger</id>
+ <id>install-solr-uima-an-tagger</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-tagger</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-tagger.jar</file>
+ <file>solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-WhitespaceTokenizer</id>
+ <id>install-solr-uima-an-wst</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-wst</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-wst.jar</file>
+ <file>solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-uimaj-core</id>
+ <id>install-jetty</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
- <version>${uima.version}</version>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${patched.jetty.version}</version>
<packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-core.jar</file>
- </configuration>
+ <file>solr/example/lib/jetty-${patched.jetty.version}.jar</file>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-jetty-util</id>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${patched.jetty.version}</version>
+ <packaging>jar</packaging>
+ <file>solr/example/lib/jetty-util-${patched.jetty.version}.jar</file>
+ </configuration>
</execution>
</executions>
</plugin>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -78,7 +78,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/clustering/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -63,18 +63,54 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -70,7 +70,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,8 +93,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -63,10 +63,14 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
@@ -88,6 +92,16 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/extraction/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -66,20 +66,24 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -58,7 +58,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -70,24 +69,29 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
+ <artifactId>solr-uima-an-alchemy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
+ <artifactId>solr-uima-an-calais</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
+ <artifactId>solr-uima-an-tagger</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
+ <artifactId>solr-uima-an-wst</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -50,7 +50,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -132,10 +131,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
+ <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -46,7 +46,6 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/webapp/pom.xml.template?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/webapp/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/webapp/pom.xml.template Mon Mar 28 10:50:28 2011
@@ -94,14 +94,6 @@
<artifactId>struts-tiles</artifactId>
</exclusion>
<exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
@@ -116,11 +108,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-dataimporthandler</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
@@ -160,11 +147,6 @@
<configuration>
<warSourceDirectory>web</warSourceDirectory>
<webXml>web/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>../../contrib/dataimporthandler/src/main/webapp</directory>
- </resource>
- </webResources>
</configuration>
</plugin>
<plugin>
@@ -181,7 +163,7 @@
<webAppConfig>
<contextPath>/</contextPath>
<baseResource implementation="org.mortbay.resource.ResourceCollection">
- <resources>web,../../contrib/dataimporthandler/src/main/webapp</resources>
+ <resources>web</resources>
</baseResource>
</webAppConfig>
</configuration>
Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Mon Mar 28 10:50:28 2011
@@ -138,6 +138,9 @@ Changes in backwards compatibility polic
* LUCENE-2236: Similarity can now be configured on a per-field basis. See the
migration notes in MIGRATE.txt for more details. (Robert Muir, Doron Cohen)
+* LUCENE-2315: AttributeSource's methods for accessing attributes are now final,
+ else its easy to corrupt the internal states. (Uwe Schindler)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
@@ -159,6 +162,13 @@ Changes in Runtime Behavior
say "in order". If this is a problem then you can use either of the
LogMergePolicy impls, and call setRequireContiguousMerge(true).
(Mike McCandless)
+
+* LUCENE-2881: FieldInfos is now tracked per segment. Before it was tracked
+ per IndexWriter session, which resulted in FieldInfos that had the FieldInfo
+ properties from all previous segments combined. Field numbers are now tracked
+ globally across IndexWriter sessions and persisted into a X.fnx file on
+ successful commit. The corresponding file format changes are backwards-
+ compatible. (Michael Busch, Simon Willnauer)
API Changes
@@ -199,6 +209,9 @@ API Changes
which takes Analyzer as a parameter, for easier customization by subclasses.
(Robert Muir)
+* LUCENE-2953: In addition to changes in 3.x, PriorityQueue#initialize(int)
+ function was moved into the ctor. (Uwe Schindler, Yonik Seeley)
+
New features
* LUCENE-2604: Added RegexpQuery support to QueryParser. Regular expressions
@@ -350,10 +363,27 @@ Bug fixes
with more document deletions is requested before a reader with fewer
deletions, provided they share some segments. (yonik)
+* LUCENE-2936: PhraseQuery score explanations were not correctly
+ identifying matches vs non-matches. (hossman)
+
======================= Lucene 3.x (not yet released) =======================
Changes in backwards compatibility policy
+* LUCENE-2953: PriorityQueue's internal heap was made private, as subclassing
+ with generics can lead to ClassCastException. For advanced use (e.g. in Solr)
+ a method getHeapArray() was added to retrieve the internal heap array as a
+ non-generic Object[]. (Uwe Schindler, Yonik Seeley)
+
+Optimizations
+
+* LUCENE-2990: ArrayUtil/CollectionUtil.*Sort() methods now exit early
+ on empty or one-element lists/arrays. (Uwe Schindler)
+
+======================= Lucene 3.1 (not yet released) =======================
+
+Changes in backwards compatibility policy
+
* LUCENE-2719: Changed API of internal utility class
org.apache.lucene.util.SorterTemplate to support faster quickSort using
pivot values and also merge sort and insertion sort. If you have used
@@ -507,6 +537,10 @@ Changes in runtime behavior
* LUCENE-2010: Segments with 100% deleted documents are now removed on
IndexReader or IndexWriter commit. (Uwe Schindler, Mike McCandless)
+* LUCENE-2960: Allow some changes to IndexWriterConfig to take effect
+ "live" (after an IW is instantiated), via
+ IndexWriter.getConfig().setXXX(...) (Shay Banon, Mike McCandless)
+
API Changes
* LUCENE-2076: Rename FSDirectory.getFile -> getDirectory. (George
@@ -734,6 +768,18 @@ Bug fixes
* LUCENE-2891: IndexWriterConfig did not accept -1 in setReaderTermIndexDivisor,
which can be used to prevent loading the terms index into memory. (Shai Erera)
+* LUCENE-2937: Encoding a float into a byte (e.g. encoding field norms during
+ indexing) had an underflow detection bug that caused floatToByte(f)==0 where
+ f was greater than 0, but slightly less than byteToFloat(1). This meant that
+ certain very small field norms (index_boost * length_norm) could have
+ been rounded down to 0 instead of being rounded up to the smallest
+ positive number. (yonik)
+
+* LUCENE-2975: A hotspot bug corrupts IndexInput#readVInt()/readVLong() if
+ the underlying readByte() is inlined (which happens e.g. in MMapDirectory).
+ The loop was unwinded which makes the hotspot bug disappear.
+ (Uwe Schindler, Robert Muir, Mike McCandless)
+
New features
* LUCENE-2128: Parallelized fetching document frequencies during weight
@@ -1050,7 +1096,7 @@ Documentation
(Adriano Crestani via Robert Muir)
* LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
- (Koji Sekiguchi)
+ (Shinichiro Abe, Koji Sekiguchi)
================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
Modified: lucene/dev/branches/docvalues/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/MIGRATE.txt?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/docvalues/lucene/MIGRATE.txt Mon Mar 28 10:50:28 2011
@@ -313,6 +313,21 @@ LUCENE-1458, LUCENE-2111: Flexible Index
- o.a.l.analysis.StopwordAnalyzerBase -> o.a.l.analysis.util.StopwordAnalyzerBase
- o.a.l.analysis.WordListLoader -> o.a.l.analysis.util.WordListLoader
+* LUCENE-2514: The option to use a Collator's order (instead of binary order) for
+ sorting and range queries has been moved to contrib/queries.
+
+ The Collated TermRangeQuery/Filter has been moved to SlowCollatedTermRangeQuery/Filter,
+ and the collated sorting has been moved to SlowCollatedStringComparator.
+
+ Note: this functionality isn't very scalable and if you are using it, consider
+ indexing collation keys with the collation support in the analysis module instead.
+
+ To perform collated range queries, use a suitable collating analyzer: CollationKeyAnalyzer
+ or ICUCollationKeyAnalyzer, and set qp.setAnalyzeRangeTerms(true).
+
+ TermRangeQuery and TermRangeFilter now work purely on bytes. Both have helper factory methods
+ (newStringRange) similar to the NumericRange API, to easily perform range queries on Strings.
+
* LUCENE-2691: The near-real-time API has moved from IndexWriter to
IndexReader. Instead of IndexWriter.getReader(), call
IndexReader.open(IndexWriter) or IndexReader.reopen(IndexWriter).
Modified: lucene/dev/branches/docvalues/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/NOTICE.txt?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/docvalues/lucene/NOTICE.txt Mon Mar 28 10:50:28 2011
@@ -1,10 +1,12 @@
Apache Lucene
-Copyright 2006 The Apache Software Foundation
+Copyright 2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Includes lib/servlet-api-2.4.jar from Apache Tomcat
+Includes lib/ant-1.7.1.jar and lib/ant-junit-1.7.1.jar from Apache Ant
+Includes contrib/queries/lib/jakarta-regexp-1.4.jar from Apache Jakarta Regexp
ICU4J, (under contrib/icu) is licensed under an MIT styles license
(contrib/icu/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008
@@ -30,3 +32,10 @@ which is Apache-licensed.
The Google Code Prettify is Apache License 2.0.
See http://code.google.com/p/google-code-prettify/
+
+JUnit (under lib/junit-4.7.jar) is licensed under the Common Public License v. 1.0
+See http://junit.sourceforge.net/cpl-v10.html
+
+JLine (under contrib/lucli/lib/jline.jar) is licensed under the BSD License.
+See http://jline.sourceforge.net/
+
Modified: lucene/dev/branches/docvalues/lucene/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/README.txt?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/README.txt (original)
+++ lucene/dev/branches/docvalues/lucene/README.txt Mon Mar 28 10:50:28 2011
@@ -1,4 +1,4 @@
-Lucene README file
+Apache Lucene README file
INTRODUCTION
@@ -12,33 +12,31 @@ The Lucene web site is at:
Please join the Lucene-User mailing list by sending a message to:
java-user-subscribe@lucene.apache.org
-FILES
+Files in a binary distribution:
lucene-core-XX.jar
- The compiled lucene library.
+ The compiled Lucene library.
+
+lucene-core-XX-javadoc.jar
+ The Javadoc jar for the compiled Lucene library.
+
+lucene-test-framework-XX.jar
+ The compiled Lucene test-framework library.
+
+lucene-test-framework-XX-javadoc.jar
+ The Javadoc jar for the compiled Lucene test-framework library.
contrib/demo/lucene-demo-XX.jar
The compiled simple example code.
-contrib/demo/luceneweb.war
- The compiled simple example Web Application.
-
contrib/*
Contributed code which extends and enhances Lucene, but is not
part of the core library. Of special note are the JAR files in the analyzers directory which
contain various analyzers that people may find useful in place of the StandardAnalyzer.
-
-
docs/index.html
The contents of the Lucene website.
docs/api/index.html
- The Javadoc Lucene API documentation. This includes the core
- library, the demo, as well as all of the contrib modules.
-
-src/java
- The Lucene source code.
-
-contrib/demo/src
- Some example code.
+ The Javadoc Lucene API documentation. This includes the core library,
+ the test framework, and the demo, as well as all of the contrib modules.
Modified: lucene/dev/branches/docvalues/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/build.xml?rev=1086181&r1=1086180&r2=1086181&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/build.xml Mon Mar 28 10:50:28 2011
@@ -45,15 +45,13 @@
<pathelement path="${java.class.path}"/>
</path>
- <patternset id="src.dist.patterns"
- includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,*pom.xml*,lib/,backwards/"
- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
- />
<patternset id="binary.build.dist.patterns"
- includes="${final.name}*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ includes="${final.name}*.jar,lucene-test-framework*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ excludes="*-src.jar"
/>
<patternset id="binary.root.dist.patterns"
- includes="docs/,*.txt,contrib/*/README*,**/CHANGES.txt"
+ includes="docs/,*.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
+ excludes="BUILD.txt"
/>
@@ -163,6 +161,7 @@
<ul>
<li><a href="all/index.html">All</a></li>
<li><a href="core/index.html">Core</a></li>
+ <li><a href="test-framework/index.html">Test Framework</a></li>
<li>Contrib packages:</li>
<ul>
]]></echo>
@@ -337,60 +336,97 @@
<mkdir dir="${dist.dir}"/>
<mkdir dir="${maven.dist.dir}"/>
</target>
- <!-- ================================================================== -->
- <!-- Packages the sources with zip -->
- <!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="package-zip-src" depends="init, init-dist"
- description="--> Generates the Lucene sources as .zip">
- <zip destfile="${dist.dir}/lucene-${version}-src.zip">
- <zipfileset prefix="lucene-${version}" dir=".">
- <patternset refid="src.dist.patterns"/>
- </zipfileset>
- </zip>
- <lucene-checksum file="${dist.dir}/lucene-${version}-src.zip"/>
- </target>
+
+
+ <property name="svn.export.dir" location="${build.dir}/svn-export"/>
<!-- ================================================================== -->
- <!-- Packages the sources with tar-gzip -->
+ <!-- Packages the sources from "svn export" with tar-gzip -->
<!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="package-tgz-src" depends="init, init-dist"
+ <target name="package-tgz-src" depends="init, init-dist, svn-export-source"
description="--> Generates the Lucene distribution as .tar.gz">
-
- <delete file="${build.dir}/lucene-${version}-src.tar"/>
- <delete file="${dist.dir}/lucene-${version}-src.tar.gz"/>
- <tar tarfile="${build.dir}/lucene-${version}-src.tar" longfile="gnu">
- <tarfileset prefix="lucene-${version}" dir=".">
- <patternset refid="src.dist.patterns"/>
- </tarfileset>
+ <property name="source.package.file"
+ value="${dist.dir}/lucene-${version}-src.tar.gz"/>
+ <delete file="${source.package.file}"/>
+ <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
+ <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
</tar>
-
- <gzip zipfile="${dist.dir}/lucene-${version}-src.tar.gz"
- src="${build.dir}/lucene-${version}-src.tar"
- />
- <lucene-checksum file="${dist.dir}/lucene-${version}-src.tar.gz"/>
+ <lucene-checksum file="${source.package.file}"/>
</target>
<!-- ================================================================== -->
- <!-- Packages the sources with zip and tar-gzip -->
+ <!-- Runs "svn export" in build/svn-export/ with the same URL -->
+ <!-- and revision as the current working copy. -->
<!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="package-all-src" depends="package-zip-src, package-tgz-src"
- description="--> Generates the .tar.gz and .zip source distributions"/>
+ <target name="svn-export-source" depends="get-svn-info">
+ <delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/>
+ <mkdir dir="${build.dir}"/>
+ <exec dir="." executable="${svn.exe}" failonerror="true">
+ <arg value="export"/>
+ <arg value="--native-eol"/>
+ <arg value="LF"/>
+ <arg value="-r"/>
+ <arg value="${svn.Revision}"/>
+ <arg value="${svn.URL}"/>
+ <arg value="${svn.export.dir}"/>
+ </exec>
+ <build-changes changes.src.dir="${svn.export.dir}/src/site/changes" changes.target.dir="${svn.export.dir}/docs/changes"/>
+ </target>
<!-- ================================================================== -->
- <!-- same as package-all-src. it is just here for compatibility. -->
+ <!-- Populates properties svn.URL and svn.Revision using "svn info". -->
<!-- ================================================================== -->
- <!-- -->
+ <target name="get-svn-info">
+ <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
+ <arg value="info"/>
+ </exec>
+ <loadproperties>
+ <propertyresource name="svn.info"/>
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="(URL|Revision):"/>
+ </linecontainsregexp>
+ <replacestring from=": " to="="/>
+ <prefixlines prefix="svn."/>
+ </filterchain>
+ </loadproperties>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- same as package-tgz-src. it is just here for compatibility. -->
<!-- ================================================================== -->
- <target name="dist-src" depends="package-all-src"/>
+ <target name="dist-src" depends="package-tgz-src"/>
<target name="dist-all" depends="dist, dist-src"/>
+ <property name="rc" value="rc0"/>
+ <property name="remote.staging.dir" value="public_html/staging_area/${rc}/${version}"/>
+ <property name="keyfile" value="${user.home}/.ssh/id_rsa"/>
+ <property name="scp.user" value="${user.name}"/>
+ <!--keys.dir is the location of the https://svn.apache.org/repos/asf/lucene/java/dist/ directory-->
+ <property name="keys.dir" value="${common.dir}/../../dist"/>
+ <target name="copy-to-stage">
+ <sshexec host="people.apache.org"
+ username="${scp.user}"
+ keyfile="${keyfile}"
+ command="mkdir -p ${remote.staging.dir}"/>
+ <echo>Uploading artifacts to ${scp.user}@people.apache.org:${remote.staging.dir}</echo>
+ <scp todir="${scp.user}@people.apache.org:${remote.staging.dir}"
+ username="${scp.user}"
+ keyfile="${keyfile}"
+ verbose="true"
+ >
+ <fileset dir="dist"/>
+ <fileset dir="${keys.dir}">
+ <include name="KEYS"/>
+ </fileset>
+ </scp>
+ </target>
+
+ <target name="stage" depends="dist-all, generate-maven-artifacts, sign-artifacts, copy-to-stage">
+ </target>
+
<target name="generate-maven-artifacts"
depends="maven.ant.tasks-check, package, jar-src, jar-test-framework-src, javadocs">
<sequential>
@@ -406,36 +442,14 @@
classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <!--
- For the purposes of the generated artifacts, change the <packaging>
- in the test-framework POM from "jar" to "test-jar" - this allows
- artifact:deploy to properly name the artifact. The Maven build doesn't
- have a lifecycle mapping for the "test-jar" packaging, though, so the
- POM in src/test-framework/ is left with the "jar" packaging.
- -->
- <property name="test-jar-packaging-test-framework-pom"
- location="${build.dir}/test-jar-packaging-test-framework,pom"/>
- <copy file="src/test-framework/pom.xml"
- tofile="${test-jar-packaging-test-framework-pom}">
- <filterset begintoken="<packaging>" endtoken="</packaging>">
- <filter token="jar"
- value="<packaging>test-jar</packaging>"/>
- </filterset>
- </copy>
- <artifact:pom id="test-framework-pom"
- file="${test-jar-packaging-test-framework-pom}"/>
- <artifact:deploy file="${build.dir}/${final.name}-tests.jar">
- <attach file="${build.dir}/${final.name}-tests-src.jar"
- classifier="test-sources"/>
- <attach file="${build.dir}/${final.name}-tests-javadoc.jar"
- classifier="test-javadoc"/>
- <remoteRepository url="${m2.repository.url}">
- <authentication username="${m2.repository.username}"
- privateKey="${m2.repository.private.key}"/>
- </remoteRepository>
- <pom refid="test-framework-pom"/>
- </artifact:deploy>
+ <m2-deploy pom.xml="src/test-framework/pom.xml">
+ <artifact-attachments>
+ <attach file="${build.dir}/lucene-test-framework-${version}-src.jar"
+ classifier="sources"/>
+ <attach file="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
+ classifier="javadoc"/>
+ </artifact-attachments>
+ </m2-deploy>
<contrib-crawl target="dist-maven"/>
</sequential>
@@ -604,18 +618,26 @@
<!--
compile changes.txt into an html file
-->
+ <macrodef name="build-changes">
+ <attribute name="changes.src.dir" default="${changes.src.dir}"/>
+ <attribute name="changes.target.dir" default="${changes.target.dir}"/>
+ <sequential>
+ <mkdir dir="@{changes.target.dir}"/>
+ <exec executable="perl" input="CHANGES.txt" output="@{changes.target.dir}/Changes.html" failonerror="true">
+ <arg value="@{changes.src.dir}/changes2html.pl"/>
+ </exec>
+ <exec executable="perl" input="contrib/CHANGES.txt" output="@{changes.target.dir}/Contrib-Changes.html"
+ failonerror="true">
+ <arg value="@{changes.src.dir}/changes2html.pl"/>
+ </exec>
+ <copy todir="@{changes.target.dir}">
+ <fileset dir="@{changes.src.dir}" includes="*.css"/>
+ </copy>
+ </sequential>
+ </macrodef>
<target name="changes-to-html">
- <mkdir dir="${changes.target.dir}"/>
- <exec executable="perl" input="CHANGES.txt" output="${changes.target.dir}/Changes.html" failonerror="true">
- <arg value="${changes.src.dir}/changes2html.pl"/>
- </exec>
- <exec executable="perl" input="contrib/CHANGES.txt" output="${changes.target.dir}/Contrib-Changes.html" failonerror="true">
- <arg value="${changes.src.dir}/changes2html.pl"/>
- </exec>
- <copy todir="${changes.target.dir}">
- <fileset dir="${changes.src.dir}" includes="*.css"/>
- </copy>
+ <build-changes changes.src.dir="${changes.src.dir}" changes.target.dir="${changes.target.dir}" />
</target>
<!--
@@ -632,7 +654,7 @@
</target>
<target name="jar-test-framework" depends="compile-test-framework">
- <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/${final.name}-tests.jar"
+ <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/lucene-test-framework-${version}.jar"
title="Lucene Search Engine: Test Framework" />
</target>
@@ -640,6 +662,7 @@
<sequential>
<mkdir dir="${javadoc.dir}/test-framework"/>
<invoke-javadoc
+ overview="src/test-framework/overview.html"
destdir="${javadoc.dir}/test-framework"
title="${Name} ${version} Test Framework API">
<sources>
@@ -647,13 +670,13 @@
<link href=""/>
</sources>
</invoke-javadoc>
- <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/${final.name}-tests-javadoc.jar"
+ <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
title="Lucene Search Engine: Test Framework" />
</sequential>
</target>
<target name="jar-test-framework-src" depends="init">
- <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/${final.name}-tests-src.jar"
+ <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/lucene-test-framework-${version}-src.jar"
title="Lucene Search Engine: Test Framework" />
</target>