Merge pull request #2072 from tarzanek/master

lucene 7.3

Author: tarzanek

nbproject/project.properties

@@ -21,7 +21,7 @@ build.generated.dir=${build.dir}/generated
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
-lucene.version=7.2.1
+lucene.version=7.3.0
 lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-highlighter.jar=lucene-highlighter-${lucene.version}.jar
 lucene-join.jar=lucene-join-${lucene.version}.jar

opengrok-web-nbproject/nbproject/project.properties

@@ -37,7 +37,7 @@ bcel.jar=bcel-${bcel.version}.jar
 file.reference.bcel.jar=../lib/${bcel.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.6.3.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/jaspic-api.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=7.2.1
+lucene.version=7.3.0
 lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
 lucene-highlighter.jar=lucene-highlighter-${lucene.version}.jar

pom.xml

@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
     </modules>
 
     <properties>
-	<lucene.version>7.2.1</lucene.version>
+	<lucene.version>7.3.0</lucene.version>
 	<mavenjavadocplugin.version>2.10.4</mavenjavadocplugin.version>
         <compileSource>1.8</compileSource>
         <compileTarget>1.8</compileTarget>

test/org/opensolaris/opengrok/search/context/ContextFormatterTest.java

@@ -61,7 +61,7 @@ public void testLineMatchFormatted() {
         Passage p = new Passage();
         p.setStartOffset(woff);
         p.setEndOffset(woff + WORD.length());
-        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD));
+        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         // First, test with contextCount==0
@@ -103,7 +103,7 @@ public void testLinesSpanningMatchFormatted() {
         Passage p = new Passage();
         p.setStartOffset(0);
         p.setEndOffset(DOC2.length());
-        p.addMatch(0, p.getEndOffset(), new BytesRef(DOC2));
+        p.addMatch(0, p.getEndOffset(), new BytesRef(DOC2),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         /**
@@ -136,7 +136,7 @@ public void testElidedMatchFormatted() {
         Passage p = new Passage();
         p.setStartOffset(woff);
         p.setEndOffset(woff + WORD.length());
-        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD));
+        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         // First, test with contextCount==0

test/org/opensolaris/opengrok/search/context/PassageConverterTest.java

@@ -74,7 +74,7 @@ public void testOneWord() {
         Passage p = new Passage();
         p.setStartOffset(woff);
         p.setEndOffset(woff + WORD.length());
-        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD));
+        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         PassageConverter cvt = getConverter((short)0);
@@ -106,7 +106,7 @@ public void testOneWordElided() {
         Passage p = new Passage();
         p.setStartOffset(woff);
         p.setEndOffset(woff + WORD.length());
-        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD));
+        p.addMatch(woff, p.getEndOffset(), new BytesRef(WORD),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         PassageConverter cvt = getConverter((short)0);
@@ -140,7 +140,7 @@ public void testLineSpanningMatch() {
         Passage p = new Passage();
         p.setStartOffset(poff);
         p.setEndOffset(poff + PHRASE.length());
-        p.addMatch(poff, p.getEndOffset(), new BytesRef(PHRASE));
+        p.addMatch(poff, p.getEndOffset(), new BytesRef(PHRASE),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         PassageConverter cvt = getConverter((short)0);
@@ -180,7 +180,7 @@ public void testLinesSpanningMatch() {
         Passage p = new Passage();
         p.setStartOffset(0);
         p.setEndOffset(DOC2.length());
-        p.addMatch(0, p.getEndOffset(), new BytesRef(DOC2));
+        p.addMatch(0, p.getEndOffset(), new BytesRef(DOC2),1);
         assertEquals("getNumMatches()", 1, p.getNumMatches());
 
         PassageConverter cvt = getConverter((short)0);