Repository: camel Updated Branches: refs/heads/master cf5a33334 -> d11f34297
[CAMEL-9080] Upgraded Elasticsearch to 1.7.1. Also upgraded Lucene and Solr to 4.10.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d11f3429 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d11f3429 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d11f3429 Branch: refs/heads/master Commit: d11f34297125f2535df94946775ee9bf51868dbf Parents: cf5a333 Author: James Netherton <jamesnether...@gmail.com> Authored: Fri Aug 14 14:30:43 2015 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Sep 15 21:20:54 2015 +0200 ---------------------------------------------------------------------- .../component/lucene/LuceneConfiguration.java | 2 +- .../camel/component/lucene/LuceneConstants.java | 23 ++++++++++++++++++++ .../camel/component/lucene/LuceneIndexer.java | 3 +-- .../camel/component/lucene/LuceneSearcher.java | 2 +- .../solr/conf/collection1/solrconfig.xml | 2 +- parent/pom.xml | 12 +++++----- 6 files changed, 33 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/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 b2a5bea..dd96a3a 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 @@ -33,7 +33,7 @@ import org.apache.lucene.util.Version; public class LuceneConfiguration { private URI uri; private String authority; - private Version luceneVersion = Version.LUCENE_4_10_3; + private Version luceneVersion = LuceneConstants.LUCENE_VERSION; @UriPath @Metadata(required = "true") private String host; http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java new file mode 100644 index 0000000..c4cb57e --- /dev/null +++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java @@ -0,0 +1,23 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.lucene; + +import org.apache.lucene.util.Version; + +public interface LuceneConstants { + Version LUCENE_VERSION = Version.LUCENE_4_10_4; +} http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/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 49a6ee8..98ed88d 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 @@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.NIOFSDirectory; -import org.apache.lucene.util.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -144,7 +143,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_4_10_3, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND); + indexWriterConfig = new IndexWriterConfig(LuceneConstants.LUCENE_VERSION, getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND); indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig); } http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/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 6fda148..6a7f257 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_4_10_3, false); + return search(searchPhrase, maxNumberOfHits, LuceneConstants.LUCENE_VERSION, false); } public Hits search(String searchPhrase, int maxNumberOfHits, Version luceneVersion, boolean returnLuceneDocs) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml ---------------------------------------------------------------------- diff --git a/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml b/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml index 9e4d5d8..5ab95da 100644 --- a/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml +++ b/components/camel-solr/src/test/resources/solr/conf/collection1/solrconfig.xml @@ -35,7 +35,7 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - <luceneMatchVersion>4.8</luceneMatchVersion> + <luceneMatchVersion>4.10.4</luceneMatchVersion> <!-- <lib/> directives can be used to instruct Solr to load an Jars identified and use them to resolve any "plugins" specified in http://git-wip-us.apache.org/repos/asf/camel/blob/d11f3429/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5e6f705..fbb04da 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -144,8 +144,8 @@ <ehcache-version>2.10.0</ehcache-version> <egit-github-core-version>2.1.5</egit-github-core-version> <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> - <elasticsearch-bundle-version>1.4.4_1</elasticsearch-bundle-version> - <elasticsearch-version>1.4.4</elasticsearch-version> + <elasticsearch-bundle-version>1.7.1_1</elasticsearch-bundle-version> + <elasticsearch-version>1.7.1</elasticsearch-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <embedmongo-version>1.50.0</embedmongo-version> <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version> @@ -328,8 +328,8 @@ <logback-version>1.1.3</logback-version> <lucene3-bundle-version>3.6.0_1</lucene3-bundle-version> <lucene3-version>3.6.0</lucene3-version> - <lucene-bundle-version>4.10.3_1</lucene-bundle-version> - <lucene-version>4.10.3</lucene-version> + <lucene-bundle-version>4.10.4_1</lucene-bundle-version> + <lucene-version>4.10.4</lucene-version> <lucene-version-range>[4.5,5)</lucene-version-range> <lightcouch-version>0.1.8</lightcouch-version> <lightcouch-bundle-version>0.1.8_1</lightcouch-bundle-version> @@ -444,8 +444,8 @@ <snakeyaml-version>1.16</snakeyaml-version> <snappy-version>1.1.1.7</snappy-version> <snmp4j-version>2.3.4_1</snmp4j-version> - <solr-bundle-version>4.10.2_1</solr-bundle-version> - <solr-version>4.10.2</solr-version> + <solr-bundle-version>4.10.4_1</solr-bundle-version> + <solr-version>4.10.4</solr-version> <solr-version-range>[4.10,5)</solr-version-range> <spark-rest-version>2.2</spark-rest-version> <spark-rest-bundle-version>2.2_1</spark-rest-bundle-version>