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 2013/11/10 19:02:01 UTC
git commit: Upgraded to Lucene & Solr 4.5.1.
Updated Branches:
refs/heads/master 0be0da583 -> e66523f89
Upgraded to Lucene & Solr 4.5.1.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e66523f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e66523f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e66523f8
Branch: refs/heads/master
Commit: e66523f894d247f6f864ad2ac73a11ab8313bb2f
Parents: 0be0da5
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Nov 10 19:01:52 2013 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Nov 10 19:01:52 2013 +0100
----------------------------------------------------------------------
.../apache/camel/component/lucene/LuceneConfiguration.java | 2 +-
.../org/apache/camel/component/lucene/LuceneIndexer.java | 2 +-
.../org/apache/camel/component/lucene/LuceneSearcher.java | 2 +-
.../component/lucene/LuceneIndexAndQueryProducerTest.java | 6 +++---
.../camel/processor/lucene/LuceneQueryProcessorTest.java | 4 ++--
parent/pom.xml | 8 ++++----
6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/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 5a1a660..375132d 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_44;
+ private Version luceneVersion = Version.LUCENE_45;
public LuceneConfiguration() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/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 d5e793c..c7831ce 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_44, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
+ indexWriterConfig = new IndexWriterConfig(Version.LUCENE_45, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/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 b4f2884..33a38de 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_44);
+ return search(searchPhrase, maxNumberOfHits, Version.LUCENE_45);
}
public Hits search(String searchPhrase, int maxNumberOfHits, Version luenceVersion) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/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 7e64e33..fcd1d42 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_44));
+ registry.bind("stdAnalyzer", new StandardAnalyzer(Version.LUCENE_45));
registry.bind("simple", new File("target/simpleindexDir"));
- registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_44));
+ registry.bind("simpleAnalyzer", new SimpleAnalyzer(Version.LUCENE_45));
registry.bind("whitespace", new File("target/whitespaceindexDir"));
- registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_44));
+ registry.bind("whitespaceAnalyzer", new WhitespaceAnalyzer(Version.LUCENE_45));
return registry;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/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 d6433e2..66b4413 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_44);
+ final StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_45);
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_44);
+ final WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_45);
MockEndpoint mockSearchEndpoint = getMockEndpoint("mock:searchResult");
context.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/e66523f8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 090554e..57c688f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -253,8 +253,8 @@
<leveldbjni-version>1.8</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
<!-- we await upgrade for lucene 4.x to sync -->
- <lucene-bundle-version>4.4.0_1</lucene-bundle-version>
- <lucene-version>4.4.0</lucene-version>
+ <lucene-bundle-version>4.5.1_1</lucene-bundle-version>
+ <lucene-version>4.5.1</lucene-version>
<lightcouch-version>0.0.6</lightcouch-version>
<lightcouch-bundle-version>0.0.5_1</lightcouch-bundle-version>
<!-- needed from tooling/archetypes -->
@@ -359,8 +359,8 @@
<smack-version>3.2.1</smack-version>
<snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
<snmp4j-version>2.2.2_1</snmp4j-version>
- <solr-bundle-version>4.4.0_1</solr-bundle-version>
- <solr-version>4.4.0</solr-version>
+ <solr-bundle-version>4.5.1_1</solr-bundle-version>
+ <solr-version>4.5.1</solr-version>
<splunk-version>1.2.0_1</splunk-version>
<spring-batch-version>2.2.2.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>