diff options
-rw-r--r-- | .classpath | 14 | ||||
-rw-r--r-- | build.moxie | 2 | ||||
-rw-r--r-- | gitblit.iml | 42 | ||||
-rw-r--r-- | src/main/java/com/gitblit/service/LuceneService.java | 4 |
4 files changed, 31 insertions, 31 deletions
@@ -20,13 +20,13 @@ <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" /> - <classpathentry kind="lib" path="ext/lucene-core-4.8.1.jar" sourcepath="ext/src/lucene-core-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.8.1.jar" sourcepath="ext/src/lucene-analyzers-common-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-highlighter-4.8.1.jar" sourcepath="ext/src/lucene-highlighter-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-memory-4.8.1.jar" sourcepath="ext/src/lucene-memory-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-queries-4.8.1.jar" sourcepath="ext/src/lucene-queries-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-queryparser-4.8.1.jar" sourcepath="ext/src/lucene-queryparser-4.8.1.jar" /> - <classpathentry kind="lib" path="ext/lucene-sandbox-4.8.1.jar" sourcepath="ext/src/lucene-sandbox-4.8.1.jar" /> + <classpathentry kind="lib" path="ext/lucene-core-4.10.0.jar" sourcepath="ext/src/lucene-core-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.0.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-highlighter-4.10.0.jar" sourcepath="ext/src/lucene-highlighter-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-memory-4.10.0.jar" sourcepath="ext/src/lucene-memory-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-queries-4.10.0.jar" sourcepath="ext/src/lucene-queries-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-queryparser-4.10.0.jar" sourcepath="ext/src/lucene-queryparser-4.10.0.jar" /> + <classpathentry kind="lib" path="ext/lucene-sandbox-4.10.0.jar" sourcepath="ext/src/lucene-sandbox-4.10.0.jar" /> <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" /> <classpathentry kind="lib" path="ext/pegdown-1.4.2.jar" sourcepath="ext/src/pegdown-1.4.2.jar" /> <classpathentry kind="lib" path="ext/parboiled-java-1.1.6.jar" sourcepath="ext/src/parboiled-java-1.1.6.jar" /> diff --git a/build.moxie b/build.moxie index cf9037a0..ae220661 100644 --- a/build.moxie +++ b/build.moxie @@ -104,7 +104,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit properties: { jetty.version : 9.2.1.v20140609 wicket.version : 1.4.21 - lucene.version : 4.8.1 + lucene.version : 4.10.0 jgit.version : 3.4.1.201406201815-r groovy.version : 2.3.3 bouncycastle.version : 1.49 diff --git a/gitblit.iml b/gitblit.iml index 02095d97..e432f02b 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -179,79 +179,79 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-core-4.8.1.jar"> + <library name="lucene-core-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-core-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-analyzers-common-4.8.1.jar"> + <library name="lucene-analyzers-common-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-highlighter-4.8.1.jar"> + <library name="lucene-highlighter-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-memory-4.8.1.jar"> + <library name="lucene-memory-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-queries-4.8.1.jar"> + <library name="lucene-queries-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-queryparser-4.8.1.jar"> + <library name="lucene-queryparser-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="lucene-sandbox-4.8.1.jar"> + <library name="lucene-sandbox-4.10.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.0.jar!/" /> </SOURCES> </library> </orderEntry> diff --git a/src/main/java/com/gitblit/service/LuceneService.java b/src/main/java/com/gitblit/service/LuceneService.java index 482be5c6..3f7635f4 100644 --- a/src/main/java/com/gitblit/service/LuceneService.java +++ b/src/main/java/com/gitblit/service/LuceneService.java @@ -105,7 +105,7 @@ import com.gitblit.utils.StringUtils; public class LuceneService implements Runnable {
- private static final int INDEX_VERSION = 5;
+ private static final int INDEX_VERSION = 6;
private static final String FIELD_OBJECT_TYPE = "type";
private static final String FIELD_PATH = "path";
@@ -125,7 +125,7 @@ public class LuceneService implements Runnable { private static final String CONF_ALIAS = "aliases";
private static final String CONF_BRANCH = "branches";
- private static final Version LUCENE_VERSION = Version.LUCENE_46;
+ private static final Version LUCENE_VERSION = Version.LUCENE_4_10_0;
private final Logger logger = LoggerFactory.getLogger(LuceneService.class);
|