camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: Use c3p0 bundle in Camel-Quartz2 Karaf feature
Date Thu, 01 Jun 2017 06:18:29 GMT
Repository: camel
Updated Branches:
  refs/heads/master c8bdf805e -> 8f3d9ea4d


Use c3p0 bundle in Camel-Quartz2 Karaf feature


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

Branch: refs/heads/master
Commit: 8f3d9ea4dd0d26fd31420b5c68330d384a102238
Parents: c8bdf80
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed May 31 08:16:15 2017 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Thu Jun 1 08:17:24 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8f3d9ea4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 768f2ff..446a75b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,6 +98,7 @@
     <brave-zipkin-version>4.3.3</brave-zipkin-version>
     <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.2</c3p0-version>
+    <c3p0-bundle-version>0.9.5.2_1</c3p0-bundle-version>
     <caffeine-version>2.5.2</caffeine-version>
     <californium-version>1.0.5</californium-version>
     <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>

http://git-wip-us.apache.org/repos/asf/camel/blob/8f3d9ea4/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 773b023..8bf840e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1503,8 +1503,7 @@
     <bundle>mvn:org.apache.camel/camel-quartz/${project.version}</bundle>
   </feature>
   <feature name='camel-quartz2' version='${project.version}' resolver='(obr)' start-level='50'>
-    <bundle dependency='true'>wrap:mvn:com.mchange/c3p0/${c3p0-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:com.mchange/mchange-commons-java/${mchange-commons-java-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>
     <bundle dependency='true'>mvn:com.zaxxer/HikariCP-java6/${hikaricp-version}</bundle>
     <bundle dependency='true'>mvn:org.quartz-scheduler/quartz/${quartz2-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>


Mime
View raw message