lucene 4.7.1 + nb 8.0

Author: Lubos Kosco

nbproject/project.properties

@@ -44,7 +44,7 @@ jnlp.mixed.code=default
 jnlp.signing=
 jnlp.signing.alias=
 jnlp.signing.keystore=
-lucene.version=4.7.0
+lucene.version=4.7.1
 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/build-impl.xml

@@ -1346,7 +1346,7 @@ exists or setup the property manually. For example like this:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-post-compile-test,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
                 
                 TEST EXECUTION SECTION
@@ -1355,7 +1355,7 @@ exists or setup the property manually. For example like this:
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <webproject2:test testincludes="**/*Test.java"/>
+        <webproject2:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>

opengrok-web-nbproject/nbproject/project.properties

@@ -25,8 +25,8 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
-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-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.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-util.jar
-lucene.version=4.7.0
+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-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.3.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-util.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
+lucene.version=4.7.1
 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=4.7.0
+LV=4.7.1
 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-4.7.0.jar=lib/lucene-core-4.7.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-analyzers-common-4.7.0.jar=lib/lucene-analyzers-common-4.7.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-queryparser-4.7.0.jar=lib/lucene-queryparser-4.7.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-suggest-4.7.0.jar=lib/lucene-suggest-4.7.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-core-4.7.1.jar=lib/lucene-core-4.7.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-analyzers-common-4.7.1.jar=lib/lucene-analyzers-common-4.7.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-queryparser-4.7.1.jar=lib/lucene-queryparser-4.7.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-suggest-4.7.1.jar=lib/lucene-suggest-4.7.1.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/ogindexd=platform/solaris/smf/ogindexd 0555 root bin

pom.xml

@@ -35,7 +35,7 @@
     </modules>
 
     <properties>
-        <lucene.version>4.7.0</lucene.version>
+        <lucene.version>4.7.1</lucene.version>
         <compileSource>1.7</compileSource>
         <compileTarget>1.7</compileTarget>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

web/help.jsp

@@ -189,7 +189,7 @@ the term (phrases) can be boosted (making it more relevant) using a caret
 </p>
 
 <p>Opengrok search is powered by <a href="http://lucene.apache.org/"
->lucene</a>, for more detail on query syntax refer to <a href="http://lucene.apache.org/core/4_5_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package_description">lucene docs</a>.<br>
+>lucene</a>, for more detail on query syntax refer to <a href="http://lucene.apache.org/core/4_7_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package_description">lucene docs</a>.<br>
 </p>
         </div>
 <%