You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ha...@apache.org on 2013/07/16 19:00:18 UTC
svn commit: r1503797 [2/19] - in /lucene/dev/branches/lucene3069: ./
dev-tools/ dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/suggest/
dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/core/src/test/ dev-tools/maven/ dev-tools/...
Modified: lucene/dev/branches/lucene3069/.gitignore
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/.gitignore?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/.gitignore (original)
+++ lucene/dev/branches/lucene3069/.gitignore Tue Jul 16 17:00:05 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/lucene3069/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/build.xml?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/build.xml (original)
+++ lucene/dev/branches/lucene3069/build.xml Tue Jul 16 17:00:05 2013
@@ -205,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">
@@ -287,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" />
Modified: lucene/dev/branches/lucene3069/dev-tools/idea/lucene/suggest/suggest.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/lucene/suggest/suggest.iml?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/lucene/suggest/suggest.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/lucene/suggest/suggest.iml Tue Jul 16 17:00:05 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/lucene3069/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Tue Jul 16 17:00:05 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/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml Tue Jul 16 17:00:05 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/lucene3069/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -95,8 +95,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/benchmark/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -141,8 +141,7 @@
<!-- <bundledSignature>jdk-system-out</bundledSignature> -->
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/core/src/java/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/core/src/java/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -86,8 +86,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/demo/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/demo/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -112,8 +112,7 @@
<!-- <bundledSignature>jdk-system-out</bundledSignature> -->
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/facet/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/facet/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -97,8 +97,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/misc/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/misc/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -85,8 +85,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -77,8 +77,7 @@
<bundledSignature>jdk-system-out</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -96,8 +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/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/queryparser/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -100,8 +100,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/lucene/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/suggest/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/suggest/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/suggest/pom.xml.template Tue Jul 16 17:00:05 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/lucene3069/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/lucene/test-framework/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -104,9 +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>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template Tue Jul 16 17:00:05 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>
@@ -364,7 +412,7 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
- <version>1.5.5</version>
+ <version>1.6.0</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/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template Tue Jul 16 17:00:05 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,9 +391,8 @@
<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>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template Tue Jul 16 17:00:05 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,9 +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>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -127,6 +127,7 @@
<configuration>
<systemPropertyVariables>
<tests.jettyConnector>${tests.jettyConnector}</tests.jettyConnector>
+ <tests.disableHdfs>${tests.disableHdfs}</tests.disableHdfs>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -147,8 +148,7 @@
<bundledSignature>jdk-deprecated</bundledSignature>
</bundledSignatures>
<signaturesFiles>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -168,8 +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/chars.txt</signaturesFile>
+ <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
@@ -189,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/lucene3069/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/java/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -154,8 +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/chars.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/lucene3069/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/solrj/src/test/pom.xml.template Tue Jul 16 17:00:05 2013
@@ -140,9 +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>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/test-framework/pom.xml.template Tue Jul 16 17:00:05 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,10 +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>
- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
</signaturesFiles>
</configuration>
<goals>
Modified: lucene/dev/branches/lucene3069/dev-tools/scripts/poll-mirrors.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/scripts/poll-mirrors.pl?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/scripts/poll-mirrors.pl (original)
+++ lucene/dev/branches/lucene3069/dev-tools/scripts/poll-mirrors.pl Tue Jul 16 17:00:05 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/lucene3069/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/scripts/smokeTestRelease.py?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene3069/dev-tools/scripts/smokeTestRelease.py Tue Jul 16 17:00:05 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:
Modified: lucene/dev/branches/lucene3069/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/extra-targets.xml?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/extra-targets.xml (original)
+++ lucene/dev/branches/lucene3069/extra-targets.xml Tue Jul 16 17:00:05 2013
@@ -63,8 +63,8 @@
</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"/>
+ <ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.8"
+ inline="true" conf="default" transitive="true" pathid="svnkit.classpath"/>
<script language="groovy" taskname="svn">
<classpath>
<path refid="groovy.classpath"/>
Modified: lucene/dev/branches/lucene3069/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/CHANGES.txt?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3069/lucene/CHANGES.txt Tue Jul 16 17:00:05 2013
@@ -23,11 +23,19 @@ Changes in backwards compatibility polic
not positioned. This change affects all classes that inherit from
DocIdSetIterator, including DocsEnum and DocsAndPositionsEnum. (Adrien Grand)
+* LUCENE-5089: Update to Morfologik 1.6.0. MorfologikAnalyzer and MorfologikFilter
+ no longer support multiple "dictionaries" as there is only one dictionary available.
+ (Dawid Weiss)
+
New Features
* LUCENE-4747: Move to Java 7 as minimum Java version.
(Robert Muir, Uwe Schindler)
+* LUCENE-5089: Update to Morfologik 1.6.0. MorfologikAnalyzer and MorfologikFilter
+ no longer support multiple "dictionaries" as there is only one dictionary available.
+ (Dawid Weiss)
+
Optimizations
* LUCENE-4848: Use Java 7 NIO2-FileChannel instead of RandomAccessFile
@@ -35,10 +43,32 @@ 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)
+
+API Changes
+
+* LUCENE-5094: Add ramBytesUsed() to MultiDocValues.OrdinalMap.
+ (Robert Muir)
+
======================= 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)
@@ -103,8 +133,22 @@ Changes in backwards compatibility polic
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)
@@ -162,6 +206,29 @@ Bug Fixes
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)
+
Optimizations
* LUCENE-4936: Improve numeric doc values compression in case all values share
@@ -185,8 +252,18 @@ Optimizations
* 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)
@@ -225,6 +302,38 @@ New Features
* 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)
Build
@@ -240,6 +349,10 @@ Build
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
@@ -253,6 +366,10 @@ Changes in runtime behavior
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/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java Tue Jul 16 17:00:05 2013
@@ -378,17 +378,14 @@ public class HunspellDictionary {
wordForm = new HunspellWord(flagParsingStrategy.parseFlags(flagPart));
Arrays.sort(wordForm.getFlags());
entry = line.substring(0, flagSep);
- if(ignoreCase) {
- entry = entry.toLowerCase(Locale.ROOT);
- }
}
-
- List<HunspellWord> entries = words.get(entry);
- if (entries == null) {
- entries = new ArrayList<HunspellWord>();
- words.put(entry, entries);
+ if(ignoreCase) {
+ entry = entry.toLowerCase(Locale.ROOT);
}
+
+ List<HunspellWord> entries = new ArrayList<HunspellWord>();
entries.add(wordForm);
+ words.put(entry, entries);
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java Tue Jul 16 17:00:05 2013
@@ -35,12 +35,26 @@ import org.apache.lucene.analysis.tokena
* </p>
*/
public final class NorwegianLightStemFilter extends TokenFilter {
- private final NorwegianLightStemmer stemmer = new NorwegianLightStemmer();
+ private final NorwegianLightStemmer stemmer;
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final KeywordAttribute keywordAttr = addAttribute(KeywordAttribute.class);
-
+
+ /**
+ * Calls {@link #NorwegianLightStemFilter(TokenStream, int)
+ * NorwegianLightStemFilter(input, BOKMAAL)}
+ */
public NorwegianLightStemFilter(TokenStream input) {
+ this(input, NorwegianLightStemmer.BOKMAAL);
+ }
+
+ /**
+ * Creates a new NorwegianLightStemFilter
+ * @param flags set to {@link NorwegianLightStemmer#BOKMAAL},
+ * {@link NorwegianLightStemmer#NYNORSK}, or both.
+ */
+ public NorwegianLightStemFilter(TokenStream input, int flags) {
super(input);
+ stemmer = new NorwegianLightStemmer(flags);
}
@Override
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java Tue Jul 16 17:00:05 2013
@@ -23,6 +23,9 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.no.NorwegianLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK;
+
/**
* Factory for {@link NorwegianLightStemFilter}.
* <pre class="prettyprint">
@@ -30,15 +33,27 @@ import org.apache.lucene.analysis.util.T
* <analyzer>
* <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.LowerCaseFilterFactory"/>
- * <filter class="solr.NorwegianLightStemFilterFactory"/>
+ * <filter class="solr.NorwegianLightStemFilterFactory" variant="nb"/>
* </analyzer>
* </fieldType></pre>
*/
public class NorwegianLightStemFilterFactory extends TokenFilterFactory {
+ private final int flags;
+
/** Creates a new NorwegianLightStemFilterFactory */
public NorwegianLightStemFilterFactory(Map<String,String> args) {
super(args);
+ String variant = get(args, "variant");
+ if (variant == null || "nb".equals(variant)) {
+ flags = BOKMAAL;
+ } else if ("nn".equals(variant)) {
+ flags = NYNORSK;
+ } else if ("no".equals(variant)) {
+ flags = BOKMAAL | NYNORSK;
+ } else {
+ throw new IllegalArgumentException("invalid variant: " + variant);
+ }
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
}
@@ -46,6 +61,6 @@ public class NorwegianLightStemFilterFac
@Override
public TokenStream create(TokenStream input) {
- return new NorwegianLightStemFilter(input);
+ return new NorwegianLightStemFilter(input, flags);
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java Tue Jul 16 17:00:05 2013
@@ -62,50 +62,106 @@ import static org.apache.lucene.analysis
* corpus to validate against whereas the Norwegian one is hand crafted.
*/
public class NorwegianLightStemmer {
+ /** Constant to remove Bokmål-specific endings */
+ public static final int BOKMAAL = 1;
+ /** Constant to remove Nynorsk-specific endings */
+ public static final int NYNORSK = 2;
+ final boolean useBokmaal;
+ final boolean useNynorsk;
+
+ /**
+ * Creates a new NorwegianLightStemmer
+ * @param flags set to {@link #BOKMAAL}, {@link #NYNORSK}, or both.
+ */
+ public NorwegianLightStemmer(int flags) {
+ if (flags <= 0 || flags > BOKMAAL + NYNORSK) {
+ throw new IllegalArgumentException("invalid flags");
+ }
+ useBokmaal = (flags & BOKMAAL) != 0;
+ useNynorsk = (flags & NYNORSK) != 0;
+ }
+
public int stem(char s[], int len) {
// Remove posessive -s (bilens -> bilen) and continue checking
if (len > 4 && s[len-1] == 's')
len--;
// Remove common endings, single-pass
- if (len > 7 &&
- (endsWith(s, len, "heter") || // general ending (hemmelig-heter -> hemmelig)
- endsWith(s, len, "heten"))) // general ending (hemmelig-heten -> hemmelig)
+ if (len > 7 &&
+ ((endsWith(s, len, "heter") &&
+ useBokmaal) || // general ending (hemmelig-heter -> hemmelig)
+ (endsWith(s, len, "heten") &&
+ useBokmaal) || // general ending (hemmelig-heten -> hemmelig)
+ (endsWith(s, len, "heita") &&
+ useNynorsk))) // general ending (hemmeleg-heita -> hemmeleg)
return len - 5;
+
+ // Remove Nynorsk common endings, single-pass
+ if (len > 8 && useNynorsk &&
+ (endsWith(s, len, "heiter") || // general ending (hemmeleg-heiter -> hemmeleg)
+ endsWith(s, len, "leiken") || // general ending (trygg-leiken -> trygg)
+ endsWith(s, len, "leikar"))) // general ending (trygg-leikar -> trygg)
+ return len - 6;
if (len > 5 &&
- (endsWith(s, len, "dom") || // general ending (kristen-dom -> kristen)
- endsWith(s, len, "het"))) // general ending (hemmelig-het -> hemmelig)
+ (endsWith(s, len, "dom") || // general ending (kristen-dom -> kristen)
+ (endsWith(s, len, "het") &&
+ useBokmaal))) // general ending (hemmelig-het -> hemmelig)
return len - 3;
+ if (len > 6 && useNynorsk &&
+ (endsWith(s, len, "heit") || // general ending (hemmeleg-heit -> hemmeleg)
+ endsWith(s, len, "semd") || // general ending (verk-semd -> verk)
+ endsWith(s, len, "leik"))) // general ending (trygg-leik -> trygg)
+ return len - 4;
+
if (len > 7 &&
(endsWith(s, len, "elser") || // general ending (føl-elser -> føl)
endsWith(s, len, "elsen"))) // general ending (føl-elsen -> føl)
return len - 5;
if (len > 6 &&
- (endsWith(s, len, "ende") || // (sov-ende -> sov)
+ ((endsWith(s, len, "ende") &&
+ useBokmaal) || // (sov-ende -> sov)
+ (endsWith(s, len, "ande") &&
+ useNynorsk) || // (sov-ande -> sov)
endsWith(s, len, "else") || // general ending (føl-else -> føl)
- endsWith(s, len, "este") || // adj (fin-este -> fin)
- endsWith(s, len, "eren"))) // masc
+ (endsWith(s, len, "este") &&
+ useBokmaal) || // adj (fin-este -> fin)
+ (endsWith(s, len, "aste") &&
+ useNynorsk) || // adj (fin-aste -> fin)
+ (endsWith(s, len, "eren") &&
+ useBokmaal) || // masc
+ (endsWith(s, len, "aren") &&
+ useNynorsk))) // masc
return len - 4;
if (len > 5 &&
- (endsWith(s, len, "ere") || // adj (fin-ere -> fin)
- endsWith(s, len, "est") || // adj (fin-est -> fin)
- endsWith(s, len, "ene") // masc/fem/neutr pl definite (hus-ene)
- ))
+ ((endsWith(s, len, "ere") &&
+ useBokmaal) || // adj (fin-ere -> fin)
+ (endsWith(s, len, "are") &&
+ useNynorsk) || // adj (fin-are -> fin)
+ (endsWith(s, len, "est") &&
+ useBokmaal) || // adj (fin-est -> fin)
+ (endsWith(s, len, "ast") &&
+ useNynorsk) || // adj (fin-ast -> fin)
+ endsWith(s, len, "ene") || // masc/fem/neutr pl definite (hus-ene)
+ (endsWith(s, len, "ane") &&
+ useNynorsk))) // masc pl definite (gut-ane)
return len - 3;
if (len > 4 &&
(endsWith(s, len, "er") || // masc/fem indefinite
endsWith(s, len, "en") || // masc/fem definite
endsWith(s, len, "et") || // neutr definite
- endsWith(s, len, "st") || // adj (billig-st -> billig)
+ (endsWith(s, len, "ar") &&
+ useNynorsk) || // masc pl indefinite
+ (endsWith(s, len, "st") &&
+ useBokmaal) || // adj (billig-st -> billig)
endsWith(s, len, "te")))
return len - 2;
-
+
if (len > 3)
switch(s[len-1]) {
case 'a': // fem definite
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java Tue Jul 16 17:00:05 2013
@@ -35,12 +35,26 @@ import org.apache.lucene.analysis.tokena
* </p>
*/
public final class NorwegianMinimalStemFilter extends TokenFilter {
- private final NorwegianMinimalStemmer stemmer = new NorwegianMinimalStemmer();
+ private final NorwegianMinimalStemmer stemmer;
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final KeywordAttribute keywordAttr = addAttribute(KeywordAttribute.class);
+ /**
+ * Calls {@link #NorwegianMinimalStemFilter(TokenStream, int)
+ * NorwegianMinimalStemFilter(input, BOKMAAL)}
+ */
public NorwegianMinimalStemFilter(TokenStream input) {
+ this(input, NorwegianLightStemmer.BOKMAAL);
+ }
+
+ /**
+ * Creates a new NorwegianLightStemFilter
+ * @param flags set to {@link NorwegianLightStemmer#BOKMAAL},
+ * {@link NorwegianLightStemmer#NYNORSK}, or both.
+ */
+ public NorwegianMinimalStemFilter(TokenStream input, int flags) {
super(input);
+ this.stemmer = new NorwegianMinimalStemmer(flags);
}
@Override
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java Tue Jul 16 17:00:05 2013
@@ -23,6 +23,9 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK;
+
/**
* Factory for {@link NorwegianMinimalStemFilter}.
* <pre class="prettyprint">
@@ -30,15 +33,27 @@ import org.apache.lucene.analysis.util.T
* <analyzer>
* <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.LowerCaseFilterFactory"/>
- * <filter class="solr.NorwegianMinimalStemFilterFactory"/>
+ * <filter class="solr.NorwegianMinimalStemFilterFactory" variant="nb"/>
* </analyzer>
* </fieldType></pre>
*/
public class NorwegianMinimalStemFilterFactory extends TokenFilterFactory {
+ private final int flags;
+
/** Creates a new NorwegianMinimalStemFilterFactory */
public NorwegianMinimalStemFilterFactory(Map<String,String> args) {
super(args);
+ String variant = get(args, "variant");
+ if (variant == null || "nb".equals(variant)) {
+ flags = BOKMAAL;
+ } else if ("nn".equals(variant)) {
+ flags = NYNORSK;
+ } else if ("no".equals(variant)) {
+ flags = BOKMAAL | NYNORSK;
+ } else {
+ throw new IllegalArgumentException("invalid variant: " + variant);
+ }
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
}
@@ -46,6 +61,6 @@ public class NorwegianMinimalStemFilterF
@Override
public TokenStream create(TokenStream input) {
- return new NorwegianMinimalStemFilter(input);
+ return new NorwegianMinimalStemFilter(input, flags);
}
}
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java Tue Jul 16 17:00:05 2013
@@ -53,31 +53,52 @@ package org.apache.lucene.analysis.no;
*/
import static org.apache.lucene.analysis.util.StemmerUtil.*;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL;
+import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK;
/**
- * Minimal Stemmer for Norwegian bokmål (no-nb)
+ * Minimal Stemmer for Norwegian Bokmål (no-nb) and Nynorsk (no-nn)
* <p>
* Stems known plural forms for Norwegian nouns only, together with genitiv -s
*/
public class NorwegianMinimalStemmer {
+ final boolean useBokmaal;
+ final boolean useNynorsk;
- public int stem(char s[], int len) {
+ /**
+ * Creates a new NorwegianMinimalStemmer
+ * @param flags set to {@link NorwegianLightStemmer#BOKMAAL},
+ * {@link NorwegianLightStemmer#NYNORSK}, or both.
+ */
+ public NorwegianMinimalStemmer(int flags) {
+ if (flags <= 0 || flags > BOKMAAL + NYNORSK) {
+ throw new IllegalArgumentException("invalid flags");
+ }
+ useBokmaal = (flags & BOKMAAL) != 0;
+ useNynorsk = (flags & NYNORSK) != 0;
+ }
+
+ public int stem(char s[], int len) {
// Remove genitiv s
if (len > 4 && s[len-1] == 's')
len--;
if (len > 5 &&
- endsWith(s, len, "ene") // masc/fem/neutr pl definite (hus-ene)
- )
+ (endsWith(s, len, "ene") || // masc/fem/neutr pl definite (hus-ene)
+ (endsWith(s, len, "ane") &&
+ useNynorsk // masc pl definite (gut-ane)
+ )))
return len - 3;
-
+
if (len > 4 &&
- (endsWith(s, len, "er") || // masc/fem indefinite
- endsWith(s, len, "en") || // masc/fem definite
- endsWith(s, len, "et") // neutr definite
- ))
+ (endsWith(s, len, "er") || // masc/fem indefinite
+ endsWith(s, len, "en") || // masc/fem definite
+ endsWith(s, len, "et") || // neutr definite
+ (endsWith(s, len, "ar") &&
+ useNynorsk // masc pl indefinite
+ )))
return len - 2;
-
+
if (len > 3)
switch(s[len-1]) {
case 'a': // fem definite
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java Tue Jul 16 17:00:05 2013
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.synon
*/
import java.io.IOException;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -112,7 +111,7 @@ public class SynonymMap {
* separates by {@link SynonymMap#WORD_SEPARATOR}.
* reuse and its chars must not be null. */
public static CharsRef analyze(Analyzer analyzer, String text, CharsRef reuse) throws IOException {
- TokenStream ts = analyzer.tokenStream("", new StringReader(text));
+ TokenStream ts = analyzer.tokenStream("", text);
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
PositionIncrementAttribute posIncAtt = ts.addAttribute(PositionIncrementAttribute.class);
ts.reset();
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory Tue Jul 16 17:00:05 2013
@@ -66,6 +66,8 @@ org.apache.lucene.analysis.miscellaneous
org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilterFactory
org.apache.lucene.analysis.miscellaneous.TrimFilterFactory
org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory
+org.apache.lucene.analysis.miscellaneous.ScandinavianFoldingFilterFactory
+org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilterFactory
org.apache.lucene.analysis.ngram.EdgeNGramFilterFactory
org.apache.lucene.analysis.ngram.NGramFilterFactory
org.apache.lucene.analysis.no.NorwegianLightStemFilterFactory
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java Tue Jul 16 17:00:05 2013
@@ -24,7 +24,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.util.Version;
-import java.io.StringReader;
import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
@@ -47,8 +46,7 @@ public class TestStopAnalyzer extends Ba
public void testDefaults() throws IOException {
assertTrue(stop != null);
- StringReader reader = new StringReader("This is a test of the english stop analyzer");
- TokenStream stream = stop.tokenStream("test", reader);
+ TokenStream stream = stop.tokenStream("test", "This is a test of the english stop analyzer");
assertTrue(stream != null);
CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
stream.reset();
@@ -61,8 +59,7 @@ public class TestStopAnalyzer extends Ba
public void testStopList() throws IOException {
CharArraySet stopWordsSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("good", "test", "analyzer"), false);
StopAnalyzer newStop = new StopAnalyzer(Version.LUCENE_40, stopWordsSet);
- StringReader reader = new StringReader("This is a good test of the english stop analyzer");
- TokenStream stream = newStop.tokenStream("test", reader);
+ TokenStream stream = newStop.tokenStream("test", "This is a good test of the english stop analyzer");
assertNotNull(stream);
CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
@@ -76,9 +73,9 @@ public class TestStopAnalyzer extends Ba
public void testStopListPositions() throws IOException {
CharArraySet stopWordsSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("good", "test", "analyzer"), false);
StopAnalyzer newStop = new StopAnalyzer(TEST_VERSION_CURRENT, stopWordsSet);
- StringReader reader = new StringReader("This is a good test of the english stop analyzer with positions");
- int expectedIncr[] = { 1, 1, 1, 3, 1, 1, 1, 2, 1};
- TokenStream stream = newStop.tokenStream("test", reader);
+ String s = "This is a good test of the english stop analyzer with positions";
+ int expectedIncr[] = { 1, 1, 1, 3, 1, 1, 1, 2, 1};
+ TokenStream stream = newStop.tokenStream("test", s);
assertNotNull(stream);
int i = 0;
CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellDictionaryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellDictionaryTest.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellDictionaryTest.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellDictionaryTest.java Tue Jul 16 17:00:05 2013
@@ -20,7 +20,9 @@ package org.apache.lucene.analysis.hunsp
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Assert;
@@ -131,12 +133,30 @@ public class HunspellDictionaryTest exte
assertEquals(3, dictionary.lookupSuffix(new char[]{'e'}, 0, 1).size());
assertEquals(1, dictionary.lookupPrefix(new char[]{'s'}, 0, 1).size());
assertEquals(1, dictionary.lookupWord(new char[]{'o', 'l', 'r'}, 0, 3).size());
-
+ assertEquals("Wrong number of flags for lucen", 1, dictionary.lookupWord(new char[]{'l', 'u', 'c', 'e', 'n'}, 0, 5).get(0).getFlags().length);
+
affixStream.close();
dictStream.close();
}
@Test
+ public void testHunspellDictionary_multipleDictWithOverride() throws IOException, ParseException {
+ InputStream affixStream = getClass().getResourceAsStream("test.aff");
+ List<InputStream> dictStreams = new ArrayList<InputStream>();
+ dictStreams.add(getClass().getResourceAsStream("test.dic"));
+ dictStreams.add(getClass().getResourceAsStream("testOverride.dic"));
+
+ HunspellDictionary dictionary = new HunspellDictionary(affixStream, dictStreams, TEST_VERSION_CURRENT, false);
+ assertEquals("Wrong number of flags for lucen", 3, dictionary.lookupWord(new char[]{'l', 'u', 'c', 'e', 'n'}, 0, 5).get(0).getFlags().length);
+ assertEquals("Wrong number of flags for bar", 1, dictionary.lookupWord(new char[]{'b', 'a', 'r'}, 0, 3).get(0).getFlags().length);
+
+ affixStream.close();
+ for(InputStream dstream : dictStreams) {
+ dstream.close();
+ }
+ }
+
+ @Test
public void testCompressedHunspellDictionary_loadDicAff() throws IOException, ParseException {
InputStream affixStream = getClass().getResourceAsStream("testCompressed.aff");
InputStream dictStream = getClass().getResourceAsStream("testCompressed.dic");
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemmerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemmerTest.java?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemmerTest.java (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemmerTest.java Tue Jul 16 17:00:05 2013
@@ -94,17 +94,21 @@ public class HunspellStemmerTest extends
assertEquals(1, stems.size());
assertEquals("foo", stems.get(0).getStemString());
- stems = stemmer.stem("food");
+ stems = stemmer.stem("mood");
assertEquals(1, stems.size());
- assertEquals("foo", stems.get(0).getStemString());
+ assertEquals("moo", stems.get(0).getStemString());
stems = stemmer.stem("Foos");
assertEquals(1, stems.size());
assertEquals("foo", stems.get(0).getStemString());
-
+
+ // The "Foo" rule gets overridden by the "foo" rule, and we don't merge
stems = stemmer.stem("Food");
+ assertEquals(0, stems.size());
+
+ stems = stemmer.stem("Mood");
assertEquals(1, stems.size());
- assertEquals("foo", stems.get(0).getStemString());
+ assertEquals("moo", stems.get(0).getStemString());
}
@Test
Modified: lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/test.dic
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/test.dic?rev=1503797&r1=1503796&r2=1503797&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/test.dic (original)
+++ lucene/dev/branches/lucene3069/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/test.dic Tue Jul 16 17:00:05 2013
@@ -1,9 +1,10 @@
-6
+9
lucen/A
lucene
mahout/A
olr/B
ab/C
Apach/A
+Foo/E
foo/D
-Foo/E
\ No newline at end of file
+Moo/E
\ No newline at end of file