lucene 6.0.1, bcel upgrade

Author: tarzanek

lib/bcel-5.2.jar

@@ -1,3 +1,5 @@
+file.reference.bcel-6.0-20150726.222224-123.jar=lib/bcel-6.0-20150726.222224-123.jar
+javac.external.vm=false
 #Fri Nov 06 11:03:18 CET 2015
 jnlp.offline-allowed=false
 javadoc.splitindex=true
@@ -10,8 +12,10 @@ file.reference.lucene-core.jar=lib/${lucene-core.jar}
 dist.war=${dist.dir}/source.war
 javac.target=1.8
 build.generated.dir=${build.dir}/generated
-run.classpath=${javac.classpath}\:${build.classes.dir}
-lucene.version=6.0.0
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+lucene.version=6.0.1
 lucene-core.jar=lucene-core-${lucene.version}.jar
 file.reference.opengrok-dev-test=test
 debug.test.classpath=${run.test.classpath}
@@ -41,7 +45,15 @@ javac.source=1.8
 run.jvmargs=-ea -enableassertions\:org.opensolaris.opengrok...
 manifest.custom.permissions=
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}\:lib/derby.jar\:${file.reference.opengrok-dev-test}\:${jacoco.home}/lib\:${emma.home}\:lib/jacoco/lib\:lib/emma
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}:\
+    lib/derby.jar:\
+    ${file.reference.opengrok-dev-test}:\
+    ${jacoco.home}/lib:\
+    ${emma.home}:\
+    lib/jacoco/lib:\
+    lib/emma
 file.reference.servlet-api.jar=lib/${servlet-api.jar}
 build.generated.sources.dir=${build.dir}/generated-sources
 ant.library.dir=${ant.home}/lib
@@ -59,11 +71,20 @@ lucene-suggest.jar=lucene-suggest-${lucene.version}.jar
 lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar
 javadoc.additionalparam=
 auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-javac.classpath=${file.reference.ant.jar}\:${file.reference.bcel-5.2.jar}\:${file.reference.jrcs.jar}\:${file.reference.json-simple-1.1.1.jar}\:${file.reference.lucene-analyzers-common.jar}\:${file.reference.lucene-core.jar}\:${file.reference.lucene-queryparser.jar}\:${file.reference.lucene-suggest.jar}\:${file.reference.servlet-api.jar}\:${file.reference.swing-layout-0.9.jar}
+javac.classpath=\
+    ${file.reference.ant.jar}:\
+    ${file.reference.jrcs.jar}:\
+    ${file.reference.bcel-6.0-20150726.222224-123.jar}:\
+    ${file.reference.json-simple-1.1.1.jar}:\
+    ${file.reference.lucene-analyzers-common.jar}:\
+    ${file.reference.lucene-core.jar}:\
+    ${file.reference.lucene-queryparser.jar}:\
+    ${file.reference.lucene-suggest.jar}:\
+    ${file.reference.servlet-api.jar}:\
+    ${file.reference.swing-layout-0.9.jar}
 javadoc.noindex=false
 manifest.custom.codebase=
 annotation.processing.enabled.in.editor=false
-file.reference.bcel-5.2.jar=lib/bcel-5.2.jar
 javadoc.private=false
 javadoc.encoding=${source.encoding}
 build.test.classes.dir=${build.dir}/test/classes
@@ -78,7 +99,8 @@ excludes=
 application.title=OpenGrok
 jnlp.codebase.type=local
 servlet-api.version=2.5
-javac.processorpath=${javac.classpath}
+javac.processorpath=\
+    ${javac.classpath}
 build.test.results.dir=${build.dir}/test/results
 file.reference.swing-layout-0.9.jar=lib/swing-layout-0.9.jar
 file.reference.lucene-queryparser.jar=lib/${lucene-queryparser.jar}

lib/bcel-6.0-20150726.222224-123.jar

@@ -987,8 +987,8 @@ exists or setup the property manually. For example like this:
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.ant.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.swing-layout-0.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.bcel-5.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jrcs.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.bcel-6.0-20150726.222224-123.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.opengrok.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.lucene-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.lucene-analyzers-common.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1001,8 +1001,8 @@ exists or setup the property manually. For example like this:
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${file.reference.ant.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.swing-layout-0.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.bcel-5.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jrcs.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.bcel-6.0-20150726.222224-123.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.opengrok.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.lucene-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.lucene-analyzers-common.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

nbproject/project.properties

@@ -32,9 +32,10 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
+file.reference.bcel-6.0-20150726.222224-123.jar=../lib/bcel-6.0-20150726.222224-123.jar
 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.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-jni.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=6.0.0
+lucene.version=6.0.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
@@ -44,7 +45,6 @@ file.reference.lucene-analyzers-common.jar=../lib/${lucene-analyzers-common.jar}
 file.reference.lucene-queryparser.jar=../lib/${lucene-queryparser.jar}
 file.reference.lucene-suggest.jar=../lib/${lucene-suggest.jar}
 file.reference.ant.jar=${ant.library.dir}/ant.jar
-file.reference.bcel-5.2.jar=../lib/bcel-5.2.jar
 file.reference.jrcs.jar=../lib/jrcs.jar
 file.reference.opengrok-generatedsrc=../generatedsrc
 file.reference.opengrok-src=../src
@@ -62,8 +62,8 @@ java.source.based=true
 javac.classpath=\
     ${file.reference.ant.jar}:\
     ${file.reference.swing-layout-0.9.jar}:\
-    ${file.reference.bcel-5.2.jar}:\
     ${file.reference.jrcs.jar}:\
+    ${file.reference.bcel-6.0-20150726.222224-123.jar}:\
     ${reference.opengrok.jar}:\
     ${file.reference.lucene-core.jar}:\
     ${file.reference.lucene-analyzers-common.jar}:\

opengrok-web-nbproject/nbproject/build-impl.xml

@@ -15,11 +15,11 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.bcel-5.2.jar}</file>
+                    <file>${file.reference.jrcs.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jrcs.jar}</file>
+                    <file>${file.reference.bcel-6.0-20150726.222224-123.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">

opengrok-web-nbproject/nbproject/project.properties

@@ -209,7 +209,7 @@ PKG pkgsend add file doc/ctags.config mode=0444 owner=root group=sys path=/usr/o
 
 
 # install libs
-LV=6.0.0
+LV=6.0.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 \

opengrok-web-nbproject/nbproject/project.xml

@@ -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-6.0.0.jar=lib/lucene-core-6.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-analyzers-common-6.0.0.jar=lib/lucene-analyzers-common-6.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-queryparser-6.0.0.jar=lib/lucene-queryparser-6.0.0.jar 0444 root bin
-f none usr/opengrok/lib/lucene-suggest-6.0.0.jar=lib/lucene-suggest-6.0.0.jar 0444 root bin
+f none usr/opengrok/lib/lucene-core-6.0.1.jar=lib/lucene-core-6.0.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-analyzers-common-6.0.1.jar=lib/lucene-analyzers-common-6.0.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-queryparser-6.0.1.jar=lib/lucene-queryparser-6.0.1.jar 0444 root bin
+f none usr/opengrok/lib/lucene-suggest-6.0.1.jar=lib/lucene-suggest-6.0.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/json-simple-1.1.1.jar=lib/json-simple-1.1.1.jar 0444 root bin

platform/solaris/ips/create.sh

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