lucene 5.1

Author: tarzanek

nbproject/project.properties

@@ -45,7 +45,7 @@ jnlp.mixed.code=default
 jnlp.signing=
 jnlp.signing.alias=
 jnlp.signing.keystore=
-lucene.version=5.0.0
+lucene.version=5.1.0
 lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
 lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar

opengrok-web-nbproject/nbproject/project.properties

@@ -34,7 +34,7 @@ endorsed.classpath=
 excludes=
 file.reference.json-simple-1.1.1.jar=../lib/json-simple-1.1.1.jar
 j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.1.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
-lucene.version=5.0.0
+lucene.version=5.1.0
 lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
 lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar

platform/solaris/ips/create.sh

@@ -209,7 +209,7 @@ PKG pkgsend add file doc/ctags.config mode=0444 owner=root group=sys path=/usr/o
 
 
 # install libs
-LV=5.0.0
+LV=5.1.0
 for file in ant.jar bcel-5.2.jar \
             lucene-analyzers-common-${LV}.jar lucene-core-${LV}.jar lucene-queryparser-${LV}.jar lucene-suggest-${LV}.jar \
             jrcs.jar \

platform/solaris/pkgdef/prototype

@@ -60,10 +60,10 @@ f none usr/opengrok/doc/opengrok-agent.properties=platform/solaris/default/openg
 f none usr/opengrok/lib/opengrok.jar=dist/opengrok.jar 0444 root bin
 f none usr/opengrok/lib/ant.jar=dist/lib/ant.jar 0444 root bin
 f none usr/opengrok/lib/bcel-5.2.jar=lib/bcel-5.2.jar 0444 root bin
-f none usr/opengrok/lib/lucene-core-5.0.0.jar=lib/lucene-core-5.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-analyzers-common-5.0.0.jar=lib/lucene-analyzers-common-5.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-queryparser-5.0.0.jar=lib/lucene-queryparser-5.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-suggest-5.0.0.jar=lib/lucene-suggest-5.0.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-core-5.1.0.jar=lib/lucene-core-5.1.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-analyzers-common-5.1.0.jar=lib/lucene-analyzers-common-5.1.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-queryparser-5.1.0.jar=lib/lucene-queryparser-5.1.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-suggest-5.1.0.jar=lib/lucene-suggest-5.1.0.jar 0444 root bin
 f none usr/opengrok/lib/jrcs.jar=lib/jrcs.jar 0444 root bin
 f none usr/opengrok/lib/swing-layout-0.9.jar=lib/swing-layout-0.9.jar 0444 root bin
 f none usr/opengrok/lib/json-simple-1.1.1.jar=lib/json-simple-1.1.1.jar 0444 root bin

pom.xml

@@ -57,7 +57,7 @@ Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
     </modules>
 
     <properties>
-	<lucene.version>5.0.0</lucene.version>
+	<lucene.version>5.1.0</lucene.version>
 	<mavenjavadocplugin.version>2.9.1</mavenjavadocplugin.version>
         <compileSource>1.8</compileSource>
         <compileTarget>1.8</compileTarget>

src/org/opensolaris/opengrok/history/DirectoryHistoryReader.java

@@ -110,8 +110,8 @@ public DirectoryHistoryReader(String path) throws IOException {
             try {
                 // Get files under given directory by searching the index.
                 query = qparser.parse(path);
-                TopFieldDocs fdocs = searcher.search(query, null, hitsPerPage * cachePages, sort);
-                fdocs = searcher.search(query, null, fdocs.totalHits, sort);
+                TopFieldDocs fdocs = searcher.search(query, hitsPerPage * cachePages, sort);
+                fdocs = searcher.search(query, fdocs.totalHits, sort);
                 hits = fdocs.scoreDocs;
             } catch (ParseException e) {
                 OpenGrokLogger.getLogger().log(Level.WARNING,

src/org/opensolaris/opengrok/web/SearchHelper.java

@@ -310,7 +310,7 @@ public SearchHelper executeQuery() {
             return this;
         }
         try {
-            TopFieldDocs fdocs = searcher.search(query, null, start + maxItems, sort);
+            TopFieldDocs fdocs = searcher.search(query, start + maxItems, sort);
             totalHits = fdocs.totalHits;
             hits = fdocs.scoreDocs;
             // Bug #3900: Check if this is a search for a single term, and that