You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/02/18 20:00:35 UTC
git commit: CAMEL-7221: Upgrade to Lucene 4.6.1
Repository: camel
Updated Branches:
refs/heads/master fdf9871fb -> 9fefab66c
CAMEL-7221: Upgrade to Lucene 4.6.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fefab66
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fefab66
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fefab66
Branch: refs/heads/master
Commit: 9fefab66c55ce7f5635965fa90dadb139257edd6
Parents: fdf9871
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Feb 18 20:00:24 2014 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Feb 18 20:00:24 2014 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/lucene/LuceneConfiguration.java | 2 +-
.../java/org/apache/camel/component/lucene/LuceneIndexer.java | 2 +-
.../java/org/apache/camel/component/lucene/LuceneSearcher.java | 2 +-
.../component/lucene/LuceneIndexAndQueryProducerTest.java | 6 +++---
.../camel/processor/lucene/LuceneQueryProcessorTest.java | 4 ++--
parent/pom.xml | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index 375132d..d76a6ee 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -35,7 +35,7 @@ public class LuceneConfiguration {
private File indexDirectory;
private Analyzer analyzer;
private int maxHits;
- private Version luceneVersion = Version.LUCENE_45;
+ private Version luceneVersion = Version.LUCENE_46;
public LuceneConfiguration() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index c7831ce..561758d 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -144,7 +144,7 @@ public class LuceneIndexer {
private void openIndexWriter() throws IOException {
IndexWriterConfig indexWriterConfig;
// use create or append so we can reuse existing index if already exists
- indexWriterConfig = new IndexWriterConfig(Version.LUCENE_45, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_46, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index 33a38de..4232a21 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -59,7 +59,7 @@ public class LuceneSearcher {
}
public Hits search(String searchPhrase, int maxNumberOfHits) throws Exception {
- return search(searchPhrase, maxNumberOfHits, Version.LUCENE_45);
+ return search(searchPhrase, maxNumberOfHits, Version.LUCENE_46);
}
public Hits search(String searchPhrase, int maxNumberOfHits, Version luenceVersion) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
index fcd1d42..591c1c9 100644
--- a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
+++ b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
@@ -53,11 +53,11 @@ public class LuceneIndexAndQueryProducerTest extends CamelTestSupport {
JndiRegistry registry = new JndiRegistry(createJndiContext());
registry.bind("std", new File("target/stdindexDir"));
registry.bind("load_dir", new File("src/test/resources/sources"));
- registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_45));
+ registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_46));
registry.bind("simple", new File("target/simpleindexDir"));
- registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_45));
+ registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_46));
registry.bind("whitespace", new File("target/whitespaceindexDir"));
- registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_45));
+ registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_46));
return registry;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
index 66b4413..657ab30 100644
--- a/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
+++ b/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
@@ -53,7 +53,7 @@ public class LuceneQueryProcessorTest extends CamelTestSupport {
@Test
public void testPhraseSearcher() throws Exception {
- final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_45);
+ final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_46);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
@@ -97,7 +97,7 @@ public class LuceneQueryProcessorTest extends CamelTestSupport {
@Test
public void testWildcardSearcher() throws Exception {
- final WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_45);
+ final WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_46);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a09ee0f..3dc9a01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -259,8 +259,8 @@
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
- <lucene-bundle-version>4.5.1_1</lucene-bundle-version>
- <lucene-version>4.5.1</lucene-version>
+ <lucene-bundle-version>4.6.1_1</lucene-bundle-version>
+ <lucene-version>4.6.1</lucene-version>
<lucene-version-range>[4.5,5)</lucene-version-range>
<lightcouch-version>0.0.6</lightcouch-version>
<lightcouch-bundle-version>0.0.5_1</lightcouch-bundle-version>