karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject karaf git commit: [KARAF-3891] Add JTA 1.2 feature
Date Tue, 28 Jul 2015 09:20:03 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 0cad2acc3 -> 6cffc600b


[KARAF-3891] Add JTA 1.2 feature


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

Branch: refs/heads/master
Commit: 6cffc600bb3b5ee870f230572b14cc6d46e51293
Parents: 0cad2ac
Author: Christian Schneider <chris@die-schneider.net>
Authored: Tue Jul 28 11:19:24 2015 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Tue Jul 28 11:19:55 2015 +0200

----------------------------------------------------------------------
 .../enterprise/src/main/feature/feature.xml       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/6cffc600/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 702866b..7c09a0b 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -22,6 +22,18 @@
 
     <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
     <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
+    
+    <feature name="transaction-api" version="1.1.0">
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+    </feature>
+    
+    <feature name="transaction-api" version="1.2.0">
+        <bundle>mvn:javax.interceptor/javax.interceptor-api/1.2</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
+        <bundle>mvn:javax.el/javax.el-api/3.0.0</bundle>
+        <bundle>mvn:javax.enterprise/cdi-api/1.2</bundle>
+        <bundle>mvn:javax.transaction/javax.transaction-api/1.2</bundle>
+    </feature>
 
     <feature name="transaction" description="OSGi Transaction Manager" version="1.0.0">
         <details>JTA implementation provided by Apache Aries Transaction 1.0.0</details>
@@ -33,7 +45,7 @@
             aries.transaction.howl.maxBlocksPerFile = 512
             aries.transaction.howl.bufferSize = 4
         </config>
-        <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <feature version="[1.1,2)">transaction-api</feature>
         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.0</bundle>
         <conditional>
@@ -52,7 +64,7 @@
             aries.transaction.howl.maxBlocksPerFile = 512
             aries.transaction.howl.bufferSize = 4
         </config>
-        <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <feature version="[1.1,2)">transaction-api</feature>
         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
         <conditional>
@@ -71,7 +83,7 @@
             aries.transaction.howl.maxBlocksPerFile = 512
             aries.transaction.howl.bufferSize = 4
         </config>
-        <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <feature version="[1.1,2)">transaction-api</feature>
         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle>
         <conditional>


Mime
View raw message