camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: CAMEL-9797: camel-elastichsearch - Tests fails since recent upgrade
Date Sat, 02 Apr 2016 09:13:09 GMT
Repository: camel
Updated Branches:
  refs/heads/master 099270ed9 -> 7f3cd61a4


CAMEL-9797: camel-elastichsearch - Tests fails since recent upgrade


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f3cd61a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f3cd61a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f3cd61a

Branch: refs/heads/master
Commit: 7f3cd61a40e4c3004243b7e65e7e3feaaa49940e
Parents: 099270e
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Sat Apr 2 11:11:19 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Sat Apr 2 11:12:15 2016 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/lucene/LuceneConstants.java   | 2 +-
 parent/pom.xml                                               | 8 ++++----
 platforms/karaf/features/src/main/resources/features.xml     | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7f3cd61a/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
index 84a5400..74cea7f 100644
--- 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
@@ -19,5 +19,5 @@ package org.apache.camel.component.lucene;
 import org.apache.lucene.util.Version;
 
 public interface LuceneConstants {
-    Version LUCENE_VERSION = Version.LUCENE_5_5_0;
+    Version LUCENE_VERSION = Version.LUCENE_5_4_1;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7f3cd61a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a6e0a4..20ec26b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -368,8 +368,8 @@
     <logback-version>1.1.5</logback-version>
     <lucene3-bundle-version>3.6.0_1</lucene3-bundle-version>
     <lucene3-version>3.6.0</lucene3-version>
-    <lucene-bundle-version>5.5.0_1</lucene-bundle-version>
-    <lucene-version>5.5.0</lucene-version>
+    <lucene-bundle-version>5.4.1_1</lucene-bundle-version>
+    <lucene-version>5.4.1</lucene-version>
     <lucene-version-range>[5,6)</lucene-version-range>
     <lightcouch-version>0.1.8</lightcouch-version>
     <lightcouch-gson-version>2.3.1</lightcouch-gson-version>
@@ -492,8 +492,8 @@
     <snakeyaml-version>1.17</snakeyaml-version>
     <snappy-version>1.1.2.4</snappy-version>
     <snmp4j-version>2.3.4_1</snmp4j-version>
-    <solr-bundle-version>5.5.0_1</solr-bundle-version>
-    <solr-version>5.5.0</solr-version>
+    <solr-bundle-version>5.4.1_1</solr-bundle-version>
+    <solr-version>5.4.1</solr-version>
     <solr-version-range>[5,6)</solr-version-range>
     <spark-version>1.6.1</spark-version>
     <spark-rest-version>2.3</spark-rest-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/7f3cd61a/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index fb7a2f1..dd084e9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1058,11 +1058,10 @@
     <bundle>mvn:org.apache.camel/camel-leveldb/${project.version}</bundle>
   </feature>
   <feature name='camel-lucene' version='${project.version}' resolver='(obr)' start-level='50'>
-    <details>camel-lucene currently do not work in OSGi</details>  <!-- https://issues.apache.org/jira/browse/SM-2899
-->
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-analyzers-common/${lucene-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queryparser/${lucene-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-analyzers-common/5.4.1_2</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queryparser/5.4.1_2</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-queries/${lucene-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene-sandbox/${lucene-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}</bundle>


Mime
View raw message