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/05/11 09:19:20 UTC

[1/2] camel git commit: Add explicit jetty6 version to Camel-hdfs karaf feature

Repository: camel
Updated Branches:
  refs/heads/master 2bedc52ea -> 4848c819f


Add explicit jetty6 version to Camel-hdfs karaf feature


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

Branch: refs/heads/master
Commit: 4848c819fef8721a3f5861bef33e248d681e83cb
Parents: 76e823d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed May 11 11:17:45 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed May 11 11:18:57 2016 +0200

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4848c819/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 c8a5624..4492e55 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -650,7 +650,7 @@
     <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/6.1.26_4</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-hdfs/${project.version}</bundle>
     <!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration, to have resolution=:option on packages that are optional -->

[2/2] camel git commit: Upgrade Univocity Parsers to version 2.1.1

Posted by ac...@apache.org.
Upgrade Univocity Parsers to version 2.1.1


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

Branch: refs/heads/master
Commit: 76e823debe7f276a81e69b97990e010c00e92283
Parents: 2bedc52
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed May 11 09:48:24 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed May 11 11:18:57 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/76e823de/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a5c596..f056cc2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,7 +561,7 @@
     <twitter4j-bundle-version>4.0.4_1</twitter4j-bundle-version>
     <twitter4j-version>4.0.4</twitter4j-version>
     <undertow-version>1.3.22.Final</undertow-version>
-    <univocity-parsers-version>2.0.2</univocity-parsers-version>
+    <univocity-parsers-version>2.1.1</univocity-parsers-version>
     <unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version>
     <unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
     <urlrewritefilter-version>4.0.4</urlrewritefilter-version>