Repository: karaf
Updated Branches:
  refs/heads/master 09d47ba57 -> 55bcb232d


[KARAF-3879] jdbc feature should installs pax-jdbc feature


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/71c8bc73
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/71c8bc73
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/71c8bc73

Branch: refs/heads/master
Commit: 71c8bc739345cbd3bcf5622265e2fd089fe664f9
Parents: 025b6fb
Author: Andrea Cosentino <[email protected]>
Authored: Tue Nov 3 14:10:35 2015 +0100
Committer: Andrea Cosentino <[email protected]>
Committed: Tue Nov 3 14:10:35 2015 +0100

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 2 ++
 pom.xml                                                     | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/71c8bc73/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml 
b/assemblies/features/enterprise/src/main/feature/feature.xml
index b7fe0ec..81b0cdd 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -21,6 +21,7 @@
     <!-- NB: this file is not the one really used. This file is used by the 
karaf-maven-plugin to define the start-level of bundles in the generated 
feature.xml -->
 
     
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
+    
<repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository>
     
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
     
     <feature name="transaction-api" version="1.1.0">
@@ -263,6 +264,7 @@
 
     <feature name="jdbc" description="JDBC service and commands" 
version="${project.version}">
         <details>JDBC support providing service, commands, and MBean.</details>
+        <feature>pax-jdbc</feature>
         <bundle 
dependency="true">mvn:org.osgi/org.osgi.service.jdbc/${org.osgi.service.jdbc.version}</bundle>
         
<bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle>
     </feature>

http://git-wip-us.apache.org/repos/asf/karaf/blob/71c8bc73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5c8942..b69d34c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,6 +261,7 @@
         <pax.url.version>2.4.3</pax.url.version>
         <pax.web.version>4.2.2</pax.web.version>
         <pax.tinybundle.version>2.1.1</pax.tinybundle.version>
+        <pax.jdbc.version>0.7.0</pax.jdbc.version>
 
         <portlet-api.version>2.0</portlet-api.version>
         <slf4j.version>1.7.12</slf4j.version>

Reply via email to