Skip to content

lucene 4.5 #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2013
Merged

lucene 4.5 #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jnlp.mixed.code=default
jnlp.signing=
jnlp.signing.alias=
jnlp.signing.keystore=
lucene.version=4.4.0
lucene.version=4.5.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
Expand Down
2 changes: 1 addition & 1 deletion opengrok-web-nbproject/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ 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.4.0
lucene.version=4.5.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
Expand Down
2 changes: 1 addition & 1 deletion platform/solaris/ips/create.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ PKGSEND add file doc/ctags.config mode=0444 owner=root group=sys path=/usr/openg


# install libs
LV=4.4.0
LV=4.5.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 \
Expand Down
8 changes: 4 additions & 4 deletions platform/solaris/pkgdef/prototype
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0.jar=lib/lucene-core-4.4.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-analyzers-common-4.4.0.jar=lib/lucene-analyzers-common-4.4.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-queryparser-4.4.0.jar=lib/lucene-queryparser-4.4.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-suggest-4.4.0.jar=lib/lucene-suggest-4.4.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-core-4.5.0.jar=lib/lucene-core-4.5.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-analyzers-common-4.5.0.jar=lib/lucene-analyzers-common-4.5.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-queryparser-4.5.0.jar=lib/lucene-queryparser-4.5.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-suggest-4.5.0.jar=lib/lucene-suggest-4.5.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/ogindexd=platform/solaris/smf/ogindexd 0555 root bin
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-suggest</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/org/opensolaris/opengrok/analysis/CompatibleAnalyser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
public class CompatibleAnalyser extends Analyzer {

public CompatibleAnalyser() {
super(new Analyzer.PerFieldReuseStrategy());
super(Analyzer.PER_FIELD_REUSE_STRATEGY);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/org/opensolaris/opengrok/analysis/FileAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public Genre getGenre() {

/** Creates a new instance of FileAnalyzer */
public FileAnalyzer(FileAnalyzerFactory factory) {
super(new Analyzer.PerFieldReuseStrategy());
super(Analyzer.PER_FIELD_REUSE_STRATEGY);
this.factory = factory;

}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opensolaris/opengrok/analysis/HistoryAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public HistoryAnalyzer() {
* Builds an analyzer which removes words in the provided array.
*/
public HistoryAnalyzer(String[] stopWords) {
super(new Analyzer.PerFieldReuseStrategy());
super(Analyzer.PER_FIELD_REUSE_STRATEGY);
this.stopWords = StopFilter.makeStopSet(SearchEngine.LUCENE_VERSION, stopWords);
}

Expand Down
4 changes: 2 additions & 2 deletions src/org/opensolaris/opengrok/analysis/JFlexTokenizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/**
*
* Generally this is a "template" for all new Tokenizers, so be carefull when
* Generally this is a "template" for all new Tokenizers, so be careful when
* changing it, it will impact almost ALL symbol tokenizers in OpenGrok ...
*
* Created on August 24, 2009
Expand All @@ -41,7 +41,7 @@
*/
public abstract class JFlexTokenizer extends Tokenizer {

protected Stack<Integer> stack = new Stack<Integer>();
protected Stack<Integer> stack = new Stack<>();

// default jflex scanner methods and variables
abstract public boolean yylex() throws IOException;
Expand Down
3 changes: 2 additions & 1 deletion src/org/opensolaris/opengrok/analysis/PathTokenizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ public final boolean incrementToken() throws IOException {
}

@Override
public final void end() {
public final void end() throws IOException {
super.end();
// set final offset
int finalOffset = correctOffset(charsRead);
offsetAtt.setOffset(finalOffset, finalOffset);
Expand Down
2 changes: 1 addition & 1 deletion src/org/opensolaris/opengrok/search/SearchEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class SearchEngine {
/**
* version of lucene index common for whole app
*/
public static final Version LUCENE_VERSION = Version.LUCENE_44;
public static final Version LUCENE_VERSION = Version.LUCENE_45;
/**
* Holds value of property definition.
*/
Expand Down