You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/03/31 08:30:11 UTC

[1/3] camel git commit: Upgrade Mustache bundle to version 0.9.1

Repository: camel
Updated Branches:
  refs/heads/master 4bc86ae76 -> 98e4b5a8f


Upgrade Mustache bundle to version 0.9.1


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

Branch: refs/heads/master
Commit: 740c1db9f57993edb8699136623c1c28dd08f73b
Parents: 4bc86ae
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 31 08:11:39 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 31 08:18:44 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/740c1db9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2fa7dc2..13f550b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -412,8 +412,7 @@
     <msv-version>2013.6.1</msv-version>
     <mustache-java-version>0.9.1</mustache-java-version>
     <mustache-guava-version>16.0</mustache-guava-version>
-    <!-- 0.9.x is not working: https://issues.apache.org/jira/browse/SM-2898 -->
-    <mustache-bundle-version>0.8.18_1</mustache-bundle-version>
+    <mustache-bundle-version>0.9.1_2</mustache-bundle-version>
     <mvel-version>2.2.7.Final</mvel-version>
     <mybatis-version>3.3.1</mybatis-version>
     <neethi-bundle-version>3.0.1</neethi-bundle-version>


[2/3] camel git commit: Upgrade Lucene/Solr and related bundle to version 5.5.0

Posted by ac...@apache.org.
Upgrade Lucene/Solr and related bundle to version 5.5.0


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

Branch: refs/heads/master
Commit: 404a554104d0d084a1409a326c0440d6811d2f8d
Parents: 740c1db
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 31 08:24:36 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 31 08:24:36 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml                                               | 8 ++++----
 .../java/org/apache/camel/itest/karaf/CamelLuceneTest.java   | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/404a5541/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 13f550b..e213d52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -367,8 +367,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.4.1_1</lucene-bundle-version>
-    <lucene-version>5.4.1</lucene-version>
+    <lucene-bundle-version>5.5.0_1</lucene-bundle-version>
+    <lucene-version>5.5.0</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>
@@ -491,8 +491,8 @@
     <snakeyaml-version>1.17</snakeyaml-version>
     <snappy-version>1.1.2.1</snappy-version>
     <snmp4j-version>2.3.4_1</snmp4j-version>
-    <solr-bundle-version>5.3.1_1</solr-bundle-version>
-    <solr-version>5.3.1</solr-version>
+    <solr-bundle-version>5.5.0_1</solr-bundle-version>
+    <solr-version>5.5.0</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/404a5541/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
index c8f8040..7483eab 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-@Ignore("Need new version of lucene bundle")
 public class CamelLuceneTest extends AbstractFeatureTest {
 
     public static final String COMPONENT = extractName(CamelLuceneTest.class);
@@ -33,4 +32,4 @@ public class CamelLuceneTest extends AbstractFeatureTest {
         testComponent(COMPONENT);
     }
 
-}
\ No newline at end of file
+}


[3/3] camel git commit: Upgrade Xstream and related bundle to version 1.4.9

Posted by ac...@apache.org.
Upgrade Xstream and related bundle to version 1.4.9


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

Branch: refs/heads/master
Commit: 98e4b5a8f9d499fc4bbbb7fb84f76eb4d6bd3e35
Parents: 404a554
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 31 08:29:30 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 31 08:29:30 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/98e4b5a8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e213d52..c759441 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -591,8 +591,8 @@
     <xpp3-bundle-version>1.1.4c_7</xpp3-bundle-version>
     <xpp3-version>1.1.4c</xpp3-version>
     <xsdlib-version>2013.2</xsdlib-version>
-    <xstream-bundle-version>1.4.8_1</xstream-bundle-version>
-    <xstream-version>1.4.8</xstream-version>
+    <xstream-bundle-version>1.4.9_1</xstream-bundle-version>
+    <xstream-version>1.4.9</xstream-version>
     <xom-version>1.2.5</xom-version>
     <yammer-metrics-version>2.2.0</yammer-metrics-version>
     <zkclient-version>0.8</zkclient-version>