Repository: camel Updated Branches: refs/heads/master 29a3d25f9 -> 4fbc9c7d0
Upgrade JGit to version 4.5.0.201609210915-r Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4fbc9c7d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fbc9c7d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fbc9c7d Branch: refs/heads/master Commit: 4fbc9c7d0278ca70cff49040d204f44dcd5e8b06 Parents: 29a3d25 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Sep 23 08:17:18 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Sep 23 08:19:30 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4fbc9c7d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6577f8b..744a909 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -327,7 +327,7 @@ <jetty-plugin-version>${jetty-version}</jetty-plugin-version> <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId> <jettison-version>1.3.8</jettison-version> - <jgit-version>4.4.1.201607150455-r</jgit-version> + <jgit-version>4.5.0.201609210915-r</jgit-version> <jgroups-version>3.6.10.Final</jgroups-version> <libthrift-version>0.9.3</libthrift-version> <jibx-version>1.2.6</jibx-version> http://git-wip-us.apache.org/repos/asf/camel/blob/4fbc9c7d/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 3f7d859..abdfd6b 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -570,7 +570,8 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.eclipse.jgit/org.eclipse.jgit/${jgit-version}</bundle> <bundle dependency='true'>mvn:com.googlecode.javaewah/JavaEWAH/${java-ewah-version}</bundle> - <bundle dependency="true">wrap:mvn:com.jcraft/jsch/${jsch-version}$Bundle-SymbolicName=com.jcraft.jsch&Bundle-Version=${jsch-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle>mvn:org.apache.camel/camel-git/${project.version}</bundle>
