You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cm...@apache.org on 2013/08/11 14:19:39 UTC
svn commit: r1512909 [2/38] - in /lucene/dev/branches/lucene4956: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/suggest/ dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/core/src/test/ dev-tool...
Modified: lucene/dev/branches/lucene4956/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/.gitignore?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/.gitignore (original)
+++ lucene/dev/branches/lucene4956/.gitignore Sun Aug 11 12:19:13 2013
@@ -1,4 +1,5 @@
-
+# hdfs
+/solr/example/hdfs
*.jar
# .
@@ -11,7 +12,7 @@
/velocity.log
/build.properties
/.idea
-/*.iml
+*.iml
/*.ipr
/*.iws
/.project
Modified: lucene/dev/branches/lucene4956/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/build.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/build.xml (original)
+++ lucene/dev/branches/lucene4956/build.xml Sun Aug 11 12:19:13 2013
@@ -90,6 +90,7 @@
<target name="rat-sources" description="Runs rat across all sources and tests">
<subant target="rat-sources" inheritall="false" failonerror="true">
+ <fileset dir="." includes="extra-targets.xml" /><!-- run rat-sources also for root directory -->
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
</subant>
@@ -130,7 +131,7 @@
<target name="get-maven-poms"
description="Copy Maven POMs from dev-tools/maven/ to maven-build/">
- <copy todir="${maven-build-dir}" overwrite="true">
+ <copy todir="${maven-build-dir}" overwrite="true" encoding="UTF-8">
<fileset dir="${basedir}/dev-tools/maven"/>
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
@@ -185,7 +186,12 @@
</target>
<target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
- <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
+ <basename file="${basedir}" property="eclipseprojectname"/>
+ <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
+ <filterset>
+ <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
+ </filterset>
+ </copy>
<mkdir dir=".settings"/>
<copy todir=".settings/" overwrite="true">
<fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
@@ -199,7 +205,7 @@
<!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->
<pathconvert property="eclipse.fileset.libs" pathsep="|" dirsep="/">
<fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
- <fileset dir="${basedir}/solr" includes="**/lib/*.jar" excludes="core/lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/**, build/**, dist/**, package/**" />
+ <fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
<map from="${basedir}/" to=""/>
</pathconvert>
<xslt in="${ant.file}" out=".classpath" style="dev-tools/eclipse/dot.classpath.xsl" force="true">
@@ -281,6 +287,9 @@
<target name="nightly-smoke" description="Builds an unsigned release and smoke tests it" depends="clean,-env-JAVA7_HOME">
<fail unless="JAVA7_HOME">JAVA7_HOME property or environment variable is not defined.</fail>
+ <exec executable="${python32.exe}" failonerror="true">
+ <arg value="-V"/>
+ </exec>
<property name="svnversion.exe" value="svnversion" />
<subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -413,5 +422,20 @@
<target name="run-clover"/>
</antcall>
</target>
-
+
+ <target name="regenerate" description="Runs all code regenerators">
+ <subant target="regenerate" inheritall="false" failonerror="false">
+ <fileset dir="lucene" includes="build.xml" />
+ <!-- todo:
+ <fileset dir="solr" includes="build.xml" />-->
+ </subant>
+ </target>
+
+ <target name="-check-after-regeneration">
+ <subant buildpath="." antfile="extra-targets.xml" target="-check-after-regeneration" inheritall="false" failonerror="true"/>
+ </target>
+
+ <!-- TODO: remove me when jenkins works -->
+ <target name="regenerateAndCheck" depends="regenerate,-check-after-regeneration"/>
+
</project>
Modified: lucene/dev/branches/lucene4956/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/eclipse/dot.project?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/lucene4956/dev-tools/eclipse/dot.project Sun Aug 11 12:19:13 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>lucene_solr_trunk</name>
+ <name>@ECLIPSEPROJECTNAME@</name>
<comment></comment>
<projects>
</projects>
Modified: lucene/dev/branches/lucene4956/dev-tools/idea/lucene/suggest/suggest.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/idea/lucene/suggest/suggest.iml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/idea/lucene/suggest/suggest.iml (original)
+++ lucene/dev/branches/lucene4956/dev-tools/idea/lucene/suggest/suggest.iml Sun Aug 11 12:19:13 2013
@@ -12,6 +12,8 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+ <orderEntry type="module" module-name="analysis-common" />
+ <orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene-core" />
</component>
</module>
Modified: lucene/dev/branches/lucene4956/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/lucene4956/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Sun Aug 11 12:19:13 2013
@@ -15,6 +15,7 @@
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
<orderEntry type="library" scope="TEST" name="Derby" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr DIH test library" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
Modified: lucene/dev/branches/lucene4956/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/idea/solr/core/src/test/solr-core-tests.iml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/idea/solr/core/src/test/solr-core-tests.iml (original)
+++ lucene/dev/branches/lucene4956/dev-tools/idea/solr/core/src/test/solr-core-tests.iml Sun Aug 11 12:19:13 2013
@@ -11,8 +11,10 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" scope="TEST" name="Solr core library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr core test library" level="project" />
<orderEntry type="library" scope="TEST" name="Solrj library" level="project" />
<orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
+ <orderEntry type="library" scope="TEST" name="Solr test framework library" level="project" />
<orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
<orderEntry type="module" scope="TEST" module-name="solr-core-test-files" />
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -95,7 +95,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/benchmark/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -141,7 +141,7 @@
<!-- <bundledSignature>jdk-system-out</bundledSignature> -->
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/core/src/java/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/core/src/java/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -86,7 +86,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/demo/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/demo/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -112,7 +112,7 @@
<!-- <bundledSignature>jdk-system-out</bundledSignature> -->
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/facet/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/facet/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -97,7 +97,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/misc/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/misc/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -85,7 +85,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -77,7 +77,7 @@
<bundledSignature>jdk-system-out</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -95,7 +95,7 @@
</bundledSignatures>
<signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/queryparser/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -100,7 +100,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/replicator/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/replicator/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/replicator/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/replicator/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -62,12 +62,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -87,10 +81,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/suggest/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/suggest/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/suggest/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -59,6 +59,11 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/lucene/test-framework/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -104,8 +104,8 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -47,10 +47,11 @@
<jetty.version>8.1.10.v20130312</jetty.version>
<slf4j.version>1.6.6</slf4j.version>
<log4j.version>1.2.16</log4j.version>
- <tika.version>1.3</tika.version>
+ <tika.version>1.4</tika.version>
<httpcomponents.version>4.2.3</httpcomponents.version>
<commons-io.version>2.1</commons-io.version>
<restlet.version>2.1.1</restlet.version>
+ <hadoop.version>2.0.5-alpha</hadoop.version>
<!-- RandomizedTesting library system properties -->
<tests.iters>1</tests.iters>
@@ -183,6 +184,11 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.version}</version>
@@ -204,6 +210,16 @@
<version>0.5</version>
</dependency>
<dependency>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.16</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
@@ -281,6 +297,38 @@
<version>10.9.1.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
@@ -307,8 +355,8 @@
<artifactId>vorbis-java-core</artifactId>
</exclusion>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-debug-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.aspectj</groupId>
@@ -359,12 +407,12 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-mini</artifactId>
- <version>3.6.2</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
- <version>1.5.5</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -398,6 +446,16 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
<version>${restlet.version}</version>
@@ -510,7 +568,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>${java.compat.version}</source>
<target>${java.compat.version}</target>
@@ -519,7 +577,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -529,7 +587,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -565,7 +623,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -574,8 +632,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <version>2.15</version>
<configuration>
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
@@ -640,7 +703,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -739,7 +802,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.4.0</version>
<configuration>
<instructions>
<Export-Package>*;-split-package:=merge-first</Export-Package>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/java/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -125,6 +125,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -137,6 +141,146 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
<version>${restlet.version}</version>
@@ -247,7 +391,7 @@
<bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
</signaturesFiles>
</configuration>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/core/src/test/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -56,6 +56,148 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Jetty 6 required for Hadoop DfsMiniCluster -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory/>
@@ -136,8 +278,8 @@
<bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
</bundledSignatures>
<signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -34,7 +34,6 @@
<modules>
<module>core</module>
<module>solrj</module>
- <module>webapp</module>
<module>test-framework</module>
<module>contrib</module>
</modules>
@@ -128,6 +127,7 @@
<configuration>
<systemPropertyVariables>
<tests.jettyConnector>${tests.jettyConnector}</tests.jettyConnector>
+ <tests.disableHdfs>${tests.disableHdfs}</tests.disableHdfs>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -148,7 +148,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -168,7 +168,7 @@
</bundledSignatures>
<signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -188,4 +188,15 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>windows-tests-disableHdfs</id>
+ <activation>
+ <os><family>windows</family></os>
+ </activation>
+ <properties>
+ <tests.disableHdfs>true</tests.disableHdfs>
+ </properties>
+ </profile>
+ </profiles>
</project>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/java/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -154,7 +154,7 @@
<bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<!-- Solr-J does NOT depend on servlet-api -->
<!-- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile> -->
</signaturesFiles>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/solrj/src/test/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -140,8 +140,8 @@
<bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
</bundledSignatures>
<signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene4956/dev-tools/maven/solr/test-framework/pom.xml.template Sun Aug 11 12:19:13 2013
@@ -72,6 +72,7 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
+
<!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
you can exclude the two Jetty dependencies below. -->
<dependency>
@@ -127,9 +128,9 @@
<bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
</bundledSignatures>
<signaturesFiles>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene4956/dev-tools/scripts/buildAndPushRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/scripts/buildAndPushRelease.py?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/scripts/buildAndPushRelease.py (original)
+++ lucene/dev/branches/lucene4956/dev-tools/scripts/buildAndPushRelease.py Sun Aug 11 12:19:13 2013
@@ -46,9 +46,10 @@ def run(command):
raise RuntimeError(msg)
def runAndSendGPGPassword(command, password):
- p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
+ p = subprocess.Popen(command, shell=True, bufsize=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
f = open(LOG, 'ab')
while True:
+ p.stdout.flush()
line = p.stdout.readline()
if len(line) == 0:
break
@@ -114,7 +115,7 @@ def prepare(root, version, gpgKeyID, gpg
print(' lucene prepare-release')
os.chdir('lucene')
- cmd = 'ant -Dversion=%s -Dspecversion=%s' % (version, version)
+ cmd = 'ant -Dversion=%s' % version
if gpgKeyID is not None:
cmd += ' -Dgpg.key=%s prepare-release' % gpgKeyID
else:
@@ -127,7 +128,7 @@ def prepare(root, version, gpgKeyID, gpg
print(' solr prepare-release')
os.chdir('../solr')
- cmd = 'ant -Dversion=%s -Dspecversion=%s' % (version, version)
+ cmd = 'ant -Dversion=%s' % version
if gpgKeyID is not None:
cmd += ' -Dgpg.key=%s prepare-release' % gpgKeyID
else:
Modified: lucene/dev/branches/lucene4956/dev-tools/scripts/diffSources.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/scripts/diffSources.py?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/scripts/diffSources.py (original)
+++ lucene/dev/branches/lucene4956/dev-tools/scripts/diffSources.py Sun Aug 11 12:19:13 2013
@@ -50,7 +50,7 @@ while True:
elif l.endswith('\n'):
l = l[:-1]
if l.startswith('diff ') or l.startswith('Binary files '):
- keep = l.lower().find('/build/') == -1 and (l.lower().startswith('Only in') or ((l.lower().endswith('.java') or l.lower().endswith('.txt') or l.lower().endswith('.xml') or l.lower().endswith('.iml')) and l.find('/.svn/') == -1))
+ keep = not l.endswith('timehints.txt') and l.lower().find('/build/') == -1 and (l.lower().startswith('Only in') or ((l.lower().endswith('.java') or l.lower().endswith('.txt') or l.lower().endswith('.xml') or l.lower().endswith('.iml')) and l.find('/.svn/') == -1))
if keep:
print
print
Modified: lucene/dev/branches/lucene4956/dev-tools/scripts/poll-mirrors.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/scripts/poll-mirrors.pl?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/scripts/poll-mirrors.pl (original)
+++ lucene/dev/branches/lucene4956/dev-tools/scripts/poll-mirrors.pl Sun Aug 11 12:19:13 2013
@@ -30,35 +30,57 @@ use Getopt::Long;
use POSIX qw/strftime/;
use LWP::UserAgent;
+my $rel_path;
my $version;
my $interval = 300;
-my $quiet = 0;
+my $details = 0;
-my $result = GetOptions ("version=s" => \$version, "interval=i" => \$interval);
-
-my $usage = "$0 -v version [ -i interval (seconds; default: 300) ]";
+my $result = GetOptions ("version=s" => \$version,
+ "details!" => \$details,
+ "path=s" => \$rel_path,
+ "interval=i" => \$interval);
+
+my $usage = ""
+ . "$0 -v version [ -i interval (seconds; default: 300) ] [ -details ]\n"
+ . "$0 -p some/explicit/path [ -i interval (seconds; default: 300) ] [ -details ]\n"
+ ;
unless ($result) {
print STDERR $usage;
exit(1);
}
-unless (defined($version) && $version =~ /\d+(?:\.\d+)+/) {
- print STDERR "You must specify the release version.\n$usage";
+
+unless (defined($version) xor defined($rel_path)) {
+ print STDERR "You must specify either -version or -path but not both\n$usage";
exit(1);
}
+my $label;
+my $apache_url_suffix;
+my $maven_url;
+
+if (defined($version)) {
+ if ($version !~ /^\d+(?:\.\d+)+/) {
+ print STDERR "You must specify the release version as a number.\n$usage";
+ exit(1);
+ }
+ $label = $version;
+ $apache_url_suffix = "lucene/java/$version/changes/Changes.html";
+ $maven_url = "http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/$version/lucene-core-$version.pom.asc";
+} else {
+ # path based
+ $apache_url_suffix = $label = $rel_path;
+}
my $previously_selected = select STDOUT;
$| = 1; # turn off buffering of STDOUT, so status is printed immediately
select $previously_selected;
-my $apache_url_suffix = "lucene/java/$version/KEYS";
my $apache_mirrors_list_url = "http://www.apache.org/mirrors/";
-my $maven_url = "http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/$version/lucene-core-$version.pom.asc";
my $agent = LWP::UserAgent->new();
$agent->timeout(2);
-my $maven_available = 0;
+my $maven_available = defined($maven_url) ? 0 : -999;
my @apache_mirrors = ();
@@ -77,7 +99,7 @@ if (defined($apache_mirrors_list_page))
next unless ($mirror_entry =~ m~<TD>\s*ok\s*</TD>\s*$~i); # skip mirrors with problems
if ($mirror_entry =~ m~<A\s+HREF\s*=\s*"([^"]+)"\s*>~i) {
my $mirror_url = $1;
- push @apache_mirrors, "$mirror_url/$apache_url_suffix";
+ push @apache_mirrors, "${mirror_url}${apache_url_suffix}";
}
}
} else {
@@ -95,16 +117,16 @@ while (1) {
print "...\n";
my $start = time();
- $maven_available = (200 == $agent->get($maven_url)->code)
+ $maven_available = (200 == $agent->head($maven_url)->code)
unless ($maven_available);
@apache_mirrors = &check_mirrors;
my $stop = time();
$sleep_interval = $interval - ($stop - $start);
my $num_downloadable_apache_mirrors = $num_apache_mirrors - $#apache_mirrors;
- print "$version is ", ($maven_available ? "" : "not "),
- "downloadable from Maven Central.\n";
- printf "$version is downloadable from %d/%d Apache Mirrors (%0.1f%%)\n",
+ print "$label is ", ($maven_available ? "" : "not "),
+ "downloadable from Maven Central.\n" if defined($maven_url);
+ printf "$label is downloadable from %d/%d Apache Mirrors (%0.1f%%)\n",
$num_downloadable_apache_mirrors, $num_apache_mirrors,
($num_downloadable_apache_mirrors*100/$num_apache_mirrors);
@@ -119,9 +141,14 @@ while (1) {
sub check_mirrors {
my @not_yet_downloadable_apache_mirrors;
for my $mirror (@apache_mirrors) {
- push @not_yet_downloadable_apache_mirrors, $mirror
- unless (200 == $agent->get($mirror)->code);
- print ".";
+
+ ### print "\n$mirror\n";
+ if (200 != $agent->head($mirror)->code) {
+ push @not_yet_downloadable_apache_mirrors, $mirror;
+ print $details ? "\nFAIL: $mirror\n" : "X";
+ } else {
+ print ".";
+ }
}
print "\n";
return @not_yet_downloadable_apache_mirrors;
Modified: lucene/dev/branches/lucene4956/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/dev-tools/scripts/smokeTestRelease.py?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene4956/dev-tools/scripts/smokeTestRelease.py Sun Aug 11 12:19:13 2013
@@ -262,7 +262,7 @@ def checkAllJARs(topDir, project, svnRev
for file in files:
if file.lower().endswith('.jar'):
if project == 'solr':
- if normRoot.endswith('/contrib/dataimporthandler/lib') and (file.startswith('mail-') or file.startswith('activation-')):
+ if (normRoot.endswith('/contrib/dataimporthandler/lib') and (file.startswith('mail-') or file.startswith('activation-'))) or (normRoot.endswith('/test-framework/lib') and file.startswith('jersey-')):
print(' **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))
continue
else:
@@ -970,10 +970,6 @@ def getDistributionsForMavenChecks(tmpDi
print(' unpack %s...' % distribution)
unpackLogFile = '%s/unpack-%s-maven-checks.log' % (tmpDir, distribution)
run('tar xzf %s/%s' % (tmpDir, distribution), unpackLogFile)
- if project == 'solr': # unpack the Solr war
- unpackLogFile = '%s/unpack-solr-war-maven-checks.log' % tmpDir
- print(' unpack Solr war...')
- run('jar xvf */dist/*.war', unpackLogFile)
distributionFiles[project] = []
for root, dirs, files in os.walk(destDir):
distributionFiles[project].extend([os.path.join(root, file) for file in files])
@@ -1309,7 +1305,7 @@ def main():
if len(sys.argv) < 5:
print()
- print('Usage python -u %s BaseURL SvnRevision version tmpDir [ isSigned ] [ -testArgs "-Dwhat=ever [ ... ]" ]'
+ print('Usage python -u %s BaseURL SvnRevision version tmpDir [ isSigned(True|False) ] [ -testArgs "-Dwhat=ever [ ... ]" ]'
% sys.argv[0])
print()
print(' example: python3.2 -u dev-tools/scripts/smokeTestRelease.py http://people.apache.org/~whoever/staging_area/lucene-solr-4.3.0-RC1-rev1469340 1469340 4.3.0 /path/to/a/tmp/dir')
Modified: lucene/dev/branches/lucene4956/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/extra-targets.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/extra-targets.xml (original)
+++ lucene/dev/branches/lucene4956/extra-targets.xml Sun Aug 11 12:19:13 2013
@@ -62,9 +62,23 @@
</mvn>
</target>
- <target xmlns:ivy="antlib:org.apache.ivy.ant" name="-check-svn-working-copy" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
- <ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.6"
- inline="true" conf="default" type="jar" transitive="true" pathid="svnkit.classpath"/>
+ <target name="-check-svn-working-copy" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
+ <svn-checker failonmodifications="false"/>
+ </target>
+
+ <!-- should only be called by jenkins, not precommit! -->
+ <target name="-check-after-regeneration" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
+ <svn-checker failonmodifications="true"/>
+ </target>
+
+ <macrodef xmlns:ivy="antlib:org.apache.ivy.ant" name="svn-checker">
+ <attribute name="failonmodifications" default="true"/> <!-- false if file modifications are allowed -->
+ <sequential>
+ <ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.8"
+ inline="true" conf="default" transitive="true" pathid="svnkit.classpath"/>
+ <local name="svn.checkprops.failed"/>
+ <local name="svn.unversioned.failed"/>
+ <local name="svn.changed.failed"/>
<script language="groovy" taskname="svn">
<classpath>
<path refid="groovy.classpath"/>
@@ -80,10 +94,10 @@
File basedir = new File(project.getProperty('basedir')).getAbsoluteFile();
int baseLen = basedir.toString().length();
def convertRelative = {
- file -> file.getAbsolutePath().substring(baseLen + 1).replace(File.separatorChar, (char)'/');
+ file -> '.' + file.getAbsolutePath().substring(baseLen).replace(File.separatorChar, (char)'/');
}
- Set missingProps = new TreeSet(), unversioned = new TreeSet();
+ Set missingProps = new TreeSet(), unversioned = new TreeSet(), changed = new TreeSet();
self.log('Getting all versioned and unversioned files...');
statusClient.doStatus(basedir, SVNRevision.WORKING, SVNDepth.fromRecurse(true), false, true, false, false, {
@@ -94,6 +108,10 @@
} else if (status.getKind() == SVNNodeKind.FILE && nodeStatus != SVNStatusType.STATUS_DELETED) {
missingProps.add(convertRelative(status.getFile()));
}
+ if (nodeStatus == SVNStatusType.STATUS_MODIFIED || nodeStatus == SVNStatusType.STATUS_REPLACED ||
+ nodeStatus == SVNStatusType.STATUS_DELETED || nodeStatus == SVNStatusType.STATUS_ADDED) {
+ changed.add(convertRelative(status.getFile()));
+ }
} as ISVNStatusHandler, null);
self.log('Filtering files with existing svn:eol-style...');
@@ -115,10 +133,20 @@
};
project.setProperty('svn.checkprops.failed', convertSet2String(missingProps));
project.setProperty('svn.unversioned.failed', convertSet2String(unversioned));
+ project.setProperty('svn.changed.failed', convertSet2String(changed));
]]></script>
<fail if="svn.checkprops.failed"
message="The following files are missing svn:eol-style (or binary svn:mime-type):${line.separator}${svn.checkprops.failed}"/>
<fail if="svn.unversioned.failed"
message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.unversioned.failed}"/>
- </target>
+ <fail message="Source checkout is modified !!! Offending files:${line.separator}${svn.changed.failed}">
+ <condition>
+ <and>
+ <istrue value="@{failonmodifications}"/>
+ <isset property="svn.changed.failed"/>
+ </and>
+ </condition>
+ </fail>
+ </sequential>
+ </macrodef>
</project>
Modified: lucene/dev/branches/lucene4956/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/CHANGES.txt?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene4956/lucene/CHANGES.txt Sun Aug 11 12:19:13 2013
@@ -23,11 +23,27 @@ Changes in backwards compatibility polic
not positioned. This change affects all classes that inherit from
DocIdSetIterator, including DocsEnum and DocsAndPositionsEnum. (Adrien Grand)
+* LUCENE-5127: Reduce RAM usage of FixedGapTermsIndex. Remove
+ IndexWriterConfig.setTermIndexInterval, IndexWriterConfig.setReaderTermsIndexDivisor,
+ and termsIndexDivisor from StandardDirectoryReader. These options have been no-ops
+ with the default codec since Lucene 4.0. If you want to configure the interval for
+ this term index, pass it directly in your codec, where it can also be configured
+ per-field. (Robert Muir)
+
New Features
* LUCENE-4747: Move to Java 7 as minimum Java version.
(Robert Muir, Uwe Schindler)
+* SOLR-3359: Added analyzer attribute/property to SynonymFilterFactory.
+ (Ryo Onodera via Koji Sekiguchi)
+
+Bugs
+
+* LUCENE-5160: Handle the case where reading from a file or FileChannel returns -1, which
+ could happen in rare cases where something happens to the file between the time we start the
+ read loop (where we check the length) and when we actually do the read. (gsingers, yonik, Robert Muir, Uwe Schindler)
+
Optimizations
* LUCENE-4848: Use Java 7 NIO2-FileChannel instead of RandomAccessFile
@@ -35,10 +51,148 @@ Optimizations
on Windows if NIOFSDirectory is used, mmapped files are still locked.
(Michael Poindexter, Robert Muir, Uwe Schindler)
+
+======================= Lucene 4.5.0 =======================
+
+New features
+
+* LUCENE-5084: Added new Elias-Fano encoder, decoder and DocIdSet
+ implementations. (Paul Elschot via Adrien Grand)
+
+* LUCENE-5081: Added WAH8DocIdSet, an in-memory doc id set implementation based
+ on word-aligned hybrid encoding. (Adrien Grand)
+
+* LUCENE-5098: New broadword utility methods in oal.util.BroadWord.
+ (Paul Elschot via Adrien Grand, Dawid Weiss)
+
+* LUCENE-5030: FuzzySuggester now supports optional unicodeAware
+ (default is false). If true then edits are measured in Unicode code
+ points instead of UTF8 bytes. (Artem Lukanin via Mike McCandless)
+
+* LUCENE-5118: SpatialStrategy.makeDistanceValueSource() now has an optional
+ multiplier for scaling degrees to another unit. (David Smiley)
+
+* LUCENE-5091: SpanNotQuery can now be configured with pre and post slop to act
+ as a hypothetical SpanNotNearQuery. (Tim Allison via David Smiley)
+
+* LUCENE-4985: FacetsAccumulator.create() is now able to create a
+ MultiFacetsAccumulator over a mixed set of facet requests. MultiFacetsAccumulator
+ allows wrapping multiple FacetsAccumulators, allowing to easily mix
+ existing and custom ones. TaxonomyFacetsAccumulator supports any
+ FacetRequest which implements createFacetsAggregator and was indexed
+ using the taxonomy index. (Shai Erera)
+
+* LUCENE-5153: AnalyzerWrapper.wrapReader allows wrapping the Reader given to
+ inputReader. (Shai Erera)
+
+* LUCENE-5155: FacetRequest.getValueOf and .getFacetArraysSource replaced by
+ FacetsAggregator.createOrdinalValueResolver. This gives better options for
+ resolving an ordinal's value by FacetAggregators. (Shai Erera)
+
+Bug Fixes
+
+* LUCENE-5116: IndexWriter.addIndexes(IndexReader...) should drop empty (or all
+ deleted) segments. (Robert Muir, Shai Erera)
+
+* LUCENE-4734: Add FastVectorHighlighter support for proximity queries and
+ phrase queries with gaps or overlapping terms. (Ryan Lauck, Adrien Grand)
+
+* LUCENE-5132: Spatial RecursivePrefixTree Contains predicate will throw an NPE
+ when there's no indexed data and maybe in other circumstances too. (David Smiley)
+
+* LUCENE-5146: AnalyzingSuggester sort comparator read part of the input key as the
+ weight that caused the sorter to never sort by weight first since the weight is only
+ considered if the input is equal causing the malformed weight to be identical as well.
+ (Simon Willnauer)
+
+* LUCENE-5151: Associations FacetsAggregators could enter an infinite loop when
+ some result documents were missing category associations. (Shai Erera)
+
+* LUCENE-5152: Fix MemoryPostingsFormat to not modify borrowed BytesRef from FSTEnum
+ seek/lookup which can cause sideeffects if done on a cached FST root arc.
+ (Simon Willnauer)
+
+API Changes
+
+* LUCENE-5094: Add ramBytesUsed() to MultiDocValues.OrdinalMap.
+ (Robert Muir)
+
+* LUCENE-5114: Remove unused boolean useCache parameter from
+ TermsEnum.seekCeil and .seekExact (Mike McCandless)
+
+* LUCENE-5128: IndexSearcher.searchAfter throws IllegalArgumentException if
+ searchAfter exceeds the number of documents in the reader.
+ (Crocket via Shai Erera)
+
+* LUCENE-5129: CategoryAssociationsContainer no longer supports null
+ association values for categories. If you want to index categories without
+ associations, you should add them using FacetFields. (Shai Erera)
+
+* LUCENE-4876: IndexWriter no longer clones the given IndexWriterConfig. If you
+ need to use the same config more than once, e.g. when sharing between multiple
+ writers, make sure to clone it before passing to each writer.
+ (Shai Erera, Mike McCandless)
+
+* LUCENE-5144: StandardFacetsAccumulator renamed to OldFacetsAccumulator, and all
+ associated classes were moved under o.a.l.facet.old. The intention to remove it
+ one day, when the features it covers (complements, partitiona, sampling) will be
+ migrated to the new FacetsAggregator and FacetsAccumulator API. Also,
+ FacetRequest.createAggregator was replaced by OldFacetsAccumulator.createAggregator.
+ (Shai Erera)
+
+* LUCENE-5149: CommonTermsQuery now allows to set the minimum number of terms that
+ should match for its high and low frequent sub-queries. Previously this was only
+ supported on the low frequent terms query. (Simon Willnauer)
+
+* LUCENE-5156: CompressingTermVectors TermsEnum no longer supports ord().
+ (Robert Muir)
+
+Optimizations
+
+* LUCENE-5088: Added TermFilter to filter docs by a specific term.
+ (Martijn van Groningen)
+
+* LUCENE-5119: DiskDV keeps the document-to-ordinal mapping on disk for
+ SortedDocValues. (Robert Muir)
+
+* LUCENE-5145: New AppendingPackedLongBuffer, a new variant of the former
+ AppendingLongBuffer which assumes values are 0-based.
+ (Boaz Leskes via Adrien Grand)
+
+* LUCENE-5145: All Appending*Buffer now support bulk get.
+ (Boaz Leskes via Adrien Grand)
+
+* LUCENE-5140: Fixed a performance regression of span queries caused by
+ LUCENE-4946. (Alan Woodward, Adrien Grand)
+
+* LUCENE-5150: Make WAH8DocIdSet able to inverse its encoding in order to
+ compress dense sets efficiently as well. (Adrien Grand)
+
+* LUCENE-5159: Prefix-code the sorted/sortedset value dictionaries in DiskDV.
+ (Robert Muir)
+
+Documentation
+
+* LUCENE-4894: remove facet userguide as it was outdated. Partially absorbed into
+ package's documentation and classes javadocs. (Shai Erera)
+
+Changes in backwards compatibility policy
+
+* LUCENE-5141: CheckIndex.fixIndex(Status,Codec) is now
+ CheckIndex.fixIndex(Status). If you used to pass a codec to this method, just
+ remove it from the arguments. (Adrien Grand)
+
+* LUCENE-5089, SOLR-5126: Update to Morfologik 1.7.1. MorfologikAnalyzer and MorfologikFilter
+ no longer support multiple "dictionaries" as there is only one dictionary available.
+ (Dawid Weiss)
+
======================= Lucene 4.4.0 =======================
Changes in backwards compatibility policy
+* LUCENE-5085: MorfologikFilter will no longer stem words marked as keywords
+ (Dawid Weiss, Grzegorz Sobczyk)
+
* LUCENE-4955: NGramTokenFilter now emits all n-grams for the same token at the
same position and preserves the position length and the offsets of the
original token. (Simon Willnauer, Adrien Grand)
@@ -47,6 +201,10 @@ Changes in backwards compatibility polic
(a, ab, b, bc, c) instead of (a, b, c, ab, bc) and doesn't trim trailing
whitespaces. (Adrien Grand)
+* LUCENE-5042: The n-gram and edge n-gram tokenizers and filters now correctly
+ handle supplementary characters, and the tokenizers have the ability to
+ pre-tokenize the input stream similarly to CharTokenizer. (Adrien Grand)
+
* LUCENE-4967: NRTManager is replaced by
ControlledRealTimeReopenThread, for controlling which requests must
see which indexing changes, so that it can work with any
@@ -82,8 +240,39 @@ Changes in backwards compatibility polic
QueryParser.setAutoGeneratePhraseQueries(false) (for simple cases) or to
override QueryParser.newFieldQuery. (Adrien Grand, Steve Rowe)
+* LUCENE-5018: CompoundWordTokenFilterBase and its children
+ DictionaryCompoundWordTokenFilter and HyphenationCompoundWordTokenFilter don't
+ update offsets anymore. (Adrien Grand)
+
+* LUCENE-5015: SamplingAccumulator no longer corrects the counts of the sampled
+ categories. You should set TakmiSampleFixer on SamplingParams if required (but
+ notice that this means slower search). (Rob Audenaerde, Gilad Barkai, Shai Erera)
+
+* LUCENE-4933: Replace ExactSimScorer/SloppySimScorer with just SimScorer. Previously
+ there were 2 implementations as a performance hack to support tableization of
+ sqrt(), but this caching is removed, as sqrt is implemented in hardware with modern
+ jvms and its faster not to cache. (Robert Muir)
+
+* LUCENE-5038: MergePolicy now has a default implementation for useCompoundFile based
+ on segment size and noCFSRatio. The default implemantion was pulled up from
+ TieredMergePolicy. (Simon Willnauer)
+
+* LUCENE-5063: FieldCache.get(Bytes|Shorts), SortField.Type.(BYTE|SHORT) and
+ FieldCache.DEFAULT_(BYTE|SHORT|INT|LONG|FLOAT|DOUBLE)_PARSER are now
+ deprecated. These methods/types assume that data is stored as strings although
+ Lucene has much better support for numeric data through (Int|Long)Field,
+ NumericRangeQuery and FieldCache.get(Int|Long)s. (Adrien Grand)
+
+* LUCENE-5078: TfIDFSimilarity lets you encode the norm value as any arbitrary long.
+ As a result, encode/decodeNormValue were made abstract with their signatures changed.
+ The default implementation was moved to DefaultSimilarity, which encodes the norm as
+ a single-byte value. (Shai Erera)
+
Bug Fixes
+* LUCENE-4890: QueryTreeBuilder.getBuilder() only finds interfaces on the
+ most derived class. (Adriano Crestani)
+
* LUCENE-4997: Internal test framework's tests are sensitive to previous
test failures and tests.failfast. (Dawid Weiss, Shai Erera)
@@ -110,6 +299,64 @@ Bug Fixes
for scoringQueries. Instead use QueryValueSource to safely wrap arbitrary
queries and use them with CustomScoreQuery. (John Wang, Robert Muir)
+* LUCENE-5016: SamplingAccumulator returned inconsistent label if asked to
+ aggregate a non-existing category. Also fixed a bug in RangeAccumulator if
+ some readers did not have the requested numeric DV field.
+ (Rob Audenaerde, Shai Erera)
+
+* LUCENE-5028: Remove pointless and confusing doShare option in FST's
+ PositiveIntOutputs (Han Jiang via Mike McCandless)
+
+* LUCENE-5032: Fix IndexOutOfBoundsExc in PostingsHighlighter when
+ multi-valued fields exceed maxLength (Tomás Fernández Löbbe
+ via Mike McCandless)
+
+* LUCENE-4933: SweetSpotSimilarity didn't apply its tf function to some
+ queries (SloppyPhraseQuery, SpanQueries). (Robert Muir)
+
+* LUCENE-5033: SlowFuzzyQuery was accepting too many terms (documents) when
+ provided minSimilarity is an int > 1 (Tim Allison via Mike McCandless)
+
+* LUCENE-5045: DrillSideways.search did not work on an empty index. (Shai Erera)
+
+* LUCENE-4995: CompressingStoredFieldsReader now only reuses an internal buffer
+ when there is no more than 32kb to decompress. This prevents from running
+ into out-of-memory errors when working with large stored fields.
+ (Adrien Grand)
+
+* LUCENE-5048: CategoryPath with a long path could result in hitting
+ NegativeArraySizeException, categories being added multiple times to the
+ taxonomy or drill-down terms silently discarded by the indexer. CategoryPath
+ is now limited to MAX_CATEGORY_PATH_LENGTH characters.
+ (Colton Jamieson, Mike McCandless, Shai Erera)
+
+* LUCENE-5062: If the spatial data for a document was comprised of multiple
+ overlapping or adjacent parts then a CONTAINS predicate query might not match
+ when the sum of those shapes contain the query shape but none do individually.
+ A flag was added to use the original faster algorithm. (David Smiley)
+
+* LUCENE-4971: Fixed NPE in AnalyzingSuggester when there are too many
+ graph expansions. (Alexey Kudinov via Mike McCandless)
+
+* LUCENE-5080: Combined setMaxMergeCount and setMaxThreadCount into one
+ setter in ConcurrentMergePolicy: setMaxMergesAndThreads. Previously these
+ setters would not work unless you invoked them very carefully.
+ (Robert Muir, Shai Erera)
+
+* LUCENE-5068: QueryParserUtil.escape() does not escape forward slash.
+ (Matias Holte via Steve Rowe)
+
+* LUCENE-5103: A join on A single-valued field with deleted docs scored too few
+ docs. (David Smiley)
+
+* LUCENE-5090: Detect mismatched readers passed to
+ SortedSetDocValuesReaderState and SortedSetDocValuesAccumulator.
+ (Robert Muir, Mike McCandless)
+
+* LUCENE-5120: AnalyzingSuggester modifed it's FST's cached root arc if payloads
+ are used and the entire output resided on the root arc on the first access. This
+ caused subsequent suggest calls to fail. (Simon Willnauer)
+
Optimizations
* LUCENE-4936: Improve numeric doc values compression in case all values share
@@ -124,8 +371,27 @@ Optimizations
single snapshots_N file, and no longer requires closing (Mike
McCandless, Shai Erera)
+* LUCENE-5035: Compress addresses in FieldCacheImpl.SortedDocValuesImpl more
+ efficiently. (Adrien Grand, Robert Muir)
+
+* LUCENE-4941: Sort "from" terms only once when using JoinUtil.
+ (Martijn van Groningen)
+
+* LUCENE-5050: Close the stored fields and term vectors index files as soon as
+ the index has been loaded into memory to save file descriptors. (Adrien Grand)
+
+* LUCENE-5086: RamUsageEstimator now uses official Java 7 API or a proprietary
+ Oracle Java 6 API to get Hotspot MX bean, preventing AWT classes to be
+ loaded on MacOSX. (Shay Banon, Dawid Weiss, Uwe Schindler)
+
New Features
+* LUCENE-5085: MorfologikFilter will no longer stem words marked as keywords
+ (Dawid Weiss, Grzegorz Sobczyk)
+
+* LUCENE-5064: Added PagedMutable (internal), a paged extension of
+ PackedInts.Mutable which allows for storing more than 2B values. (Adrien Grand)
+
* LUCENE-4766: Added a PatternCaptureGroupTokenFilter that uses Java regexes to
emit multiple tokens one for each capture group in one or more patterns.
(Simon Willnauer, Clinton Gormley)
@@ -153,18 +419,88 @@ New Features
* LUCENE-4975: Added a new Replicator module which can replicate index
revisions between server and client. (Shai Erera, Mike McCandless)
+* LUCENE-5022: Added FacetResult.mergeHierarchies to merge multiple
+ FacetResult of the same dimension into a single one with the reconstructed
+ hierarchy. (Shai Erera)
+
+* LUCENE-5026: Added PagedGrowableWriter, a new internal packed-ints structure
+ that grows the number of bits per value on demand, can store more than 2B
+ values and supports random write and read access. (Adrien Grand)
+
+* LUCENE-5025: FST's Builder can now handle more than 2.1 billion
+ "tail nodes" while building a minimal FST. (Aaron Binns, Adrien
+ Grand, Mike McCandless)
+
+* LUCENE-5063: FieldCache.DEFAULT.get(Ints|Longs) now uses bit-packing to save
+ memory. (Adrien Grand)
+
+* LUCENE-5079: IndexWriter.hasUncommittedChanges() returns true if there are
+ changes that have not been committed. (yonik, Mike McCandless, Uwe Schindler)
+
+* SOLR-4565: Extend NorwegianLightStemFilter and NorwegianMinimalStemFilter
+ to handle "nynorsk" (Erlend Garåsen, janhoy via Robert Muir)
+
+* LUCENE-5087: Add getMultiValuedSeparator to PostingsHighlighter, for cases
+ where you want a different logical separator between field values. This can
+ be set to e.g. U+2029 PARAGRAPH SEPARATOR if you never want passes to span
+ values. (Mike McCandless, Robert Muir)
+
+* LUCENE-5013: Added ScandinavianFoldingFilterFactory and
+ ScandinavianNormalizationFilterFactory (Karl Wettin via janhoy)
+
+* LUCENE-4845: AnalyzingInfixSuggester finds suggestions based on
+ matches to any tokens in the suggestion, not just based on pure
+ prefix matching. (Mike McCandless, Robert Muir)
+
+API Changes
+
+* LUCENE-5077: Make it easier to use compressed norms. Lucene42NormsFormat takes
+ an overhead parameter, so you can easily pass a different value other than
+ PackedInts.FASTEST from your own codec. (Robert Muir)
+
+* LUCENE-5097: Analyzer now has an additional tokenStream(String fieldName,
+ String text) method, so wrapping by StringReader for common use is no
+ longer needed. This method uses an internal reuseable reader, which was
+ previously only used by the Field class. (Uwe Schindler, Robert Muir)
+
+* LUCENE-4542: HunspellStemFilter's maximum recursion level is now configurable.
+ (Piotr, RafaÅ KuÄ via Adrien Grand)
+
Build
* LUCENE-4987: Upgrade randomized testing to version 2.0.10:
Test framework may fail internally due to overly aggresive J9 optimizations.
(Dawid Weiss, Shai Erera)
+* LUCENE-5043: The eclipse target now uses the containing directory for the
+ project name. This also enforces UTF-8 encoding when files are copied with
+ filtering.
+
+* LUCENE-5055: "rat-sources" target now checks also build.xml, ivy.xml,
+ forbidden-api signatures, and parts of resources folders. (Ryan Ernst,
+ Uwe Schindler)
+
+* LUCENE-5072: Automatically patch javadocs generated by JDK versions
+ before 7u25 to work around the frame injection vulnerability (CVE-2013-1571,
+ VU#225657). (Uwe Schindler)
+
Tests
* LUCENE-4901: TestIndexWriterOnJRECrash should work on any
JRE vendor via Runtime.halt().
(Mike McCandless, Robert Muir, Uwe Schindler, Rodrigo Trujillo, Dawid Weiss)
+Changes in runtime behavior
+
+* LUCENE-5038: New segments written by IndexWriter are now wrapped into CFS
+ by default. DocumentsWriterPerThread doesn't consult MergePolicy anymore
+ to decide if a CFS must be written, instead IndexWriterConfig now has a
+ property to enable / disable CFS for newly created segments. (Simon Willnauer)
+
+* LUCENE-5107: Properties files by Lucene are now written in UTF-8 encoding,
+ Unicode is no longer escaped. Reading of legacy properties files with
+ \u escapes is still possible. (Uwe Schindler, Robert Muir)
+
======================= Lucene 4.3.1 =======================
Bug Fixes
Modified: lucene/dev/branches/lucene4956/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/build.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/build.xml (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/build.xml Sun Aug 11 12:19:13 2013
@@ -139,5 +139,9 @@
<target name="-ecj-javadoc-lint">
<forall-analyzers target="-ecj-javadoc-lint"/>
</target>
+
+ <target name="regenerate">
+ <forall-analyzers target="regenerate"/>
+ </target>
</project>
Modified: lucene/dev/branches/lucene4956/lucene/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/common/build.xml?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/common/build.xml (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/common/build.xml Sun Aug 11 12:19:13 2013
@@ -25,27 +25,27 @@
<!-- some files for testing that do not have license headers -->
<property name="rat.excludes" value="**/*.aff,**/*.dic,**/*.txt,**/charfilter/*.htm*,**/*LuceneResourcesWikiPage.html"/>
+ <property name="rat.additional-includes" value="src/tools/**"/>
<import file="../analysis-module-build.xml"/>
- <target name="compile-core" depends="jflex-notice, common.compile-core"/>
+ <target name="jflex" depends="jflex-check,clean-jflex,-gen-uax29-supp-macros,
+ -jflex-StandardAnalyzer,-jflex-UAX29URLEmailTokenizer,
+ -jflex-wiki-tokenizer,-jflex-HTMLStripCharFilter"/>
- <target name="jflex" depends="jflex-check,clean-jflex,gen-uax29-supp-macros,
- jflex-StandardAnalyzer,jflex-UAX29URLEmailTokenizer,
- jflex-wiki-tokenizer,jflex-HTMLStripCharFilter"/>
-
- <target name="gen-uax29-supp-macros">
+ <target name="-gen-uax29-supp-macros">
<subant target="gen-uax29-supp-macros">
<fileset dir="../icu" includes="build.xml"/>
</subant>
</target>
- <target name="jflex-HTMLStripCharFilter"
+ <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>
+ <!-- this logic below looks duplicated with run-jflex, but its not, the regexp is different! -->
<jflex file="src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex"
outdir="src/java/org/apache/lucene/analysis/charfilter"
nobak="on"/>
@@ -53,6 +53,9 @@
<replaceregexp file="src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java"
match="/\*\*\s*\*\s*Creates a new scanner.*this\(new java\.io\.InputStreamReader\(in\)\);\s*\}"
replace="" flags="sg"/>
+ <replaceregexp file="src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java"
+ match="\/\*\s*The following code was generated by JFlex.*"
+ replace="\/\* The following code was generated by JFlex. \*\/" flags=""/>
</target>
<target name="generate-jflex-html-char-entities">
@@ -66,14 +69,14 @@
<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">
+ <target name="-jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">
<taskdef classname="jflex.anttask.JFlexTask" name="jflex">
<classpath refid="jflex.classpath"/>
</taskdef>
<run-jflex dir="src/java/org/apache/lucene/analysis/wikipedia" name="WikipediaTokenizerImpl"/>
</target>
- <target name="jflex-StandardAnalyzer" depends="init,jflex-check" if="jflex.present">
+ <target name="-jflex-StandardAnalyzer" depends="init,jflex-check" if="jflex.present">
<taskdef classname="jflex.anttask.JFlexTask" name="jflex">
<classpath refid="jflex.classpath"/>
</taskdef>
@@ -81,7 +84,7 @@
<run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="ClassicTokenizerImpl"/>
</target>
- <target name="jflex-UAX29URLEmailTokenizer" depends="jflex-check" if="jflex.present">
+ <target name="-jflex-UAX29URLEmailTokenizer" depends="jflex-check" if="jflex.present">
<taskdef classname="jflex.anttask.JFlexTask" name="jflex">
<classpath refid="jflex.classpath"/>
</taskdef>
@@ -99,6 +102,9 @@
<replaceregexp file="@{dir}/@{name}.java"
match="/\*\*\s*\*\s*Creates a new scanner\..*this\(new java\.io\.InputStreamReader\(in\)\);\s*\}"
replace="" flags="sg"/>
+ <replaceregexp file="@{dir}/@{name}.java"
+ match="\/\*\s*The following code was generated by JFlex.*"
+ replace="\/\* The following code was generated by JFlex. \*\/" flags=""/>
</sequential>
</macrodef>
@@ -142,4 +148,6 @@
</target>
<target name="javadocs" depends="module-build.javadocs"/>
+
+ <target name="regenerate" depends="jflex"/>
</project>
Modified: lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro Sun Aug 11 12:19:13 2013
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-// Generated using ICU4J 49.1.0.0 on Sunday, July 15, 2012 5:42:00 AM UTC
+// Generated using ICU4J 49.1.0.0
// by org.apache.lucene.analysis.icu.GenerateHTMLStripCharFilterSupplementaryMacros
Modified: lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java Sun Aug 11 12:19:13 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/19/12 6:24 PM */
+/* The following code was generated by JFlex. */
package org.apache.lucene.analysis.charfilter;
@@ -31,18 +31,10 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.OpenStringBuilder;
-
/**
* A CharFilter that wraps another Reader and attempts to strip out HTML constructs.
*/
-@SuppressWarnings("fallthrough")
-/**
- * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 9/19/12 6:24 PM from the specification file
- * <tt>C:/svn/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
- */
public final class HTMLStripCharFilter extends BaseCharFilter {
/** This character denotes the end of file */
Modified: lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex?rev=1512909&r1=1512908&r2=1512909&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex Sun Aug 11 12:19:13 2013
@@ -29,11 +29,9 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.OpenStringBuilder;
-
/**
* A CharFilter that wraps another Reader and attempts to strip out HTML constructs.
*/
-@SuppressWarnings("fallthrough")
%%
%unicode 6.1