You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/06/29 16:27:30 UTC

[karaf-cellar] branch master updated: [KARAF-6267] Use transaction feature instead of directly the jta spec bundle

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cellar.git


The following commit(s) were added to refs/heads/master by this push:
     new f670b4e  [KARAF-6267] Use transaction feature instead of directly the jta spec bundle
f670b4e is described below

commit f670b4e2ec5c3cb18108357534c31adecfb629cd
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Jun 29 18:26:42 2020 +0200

    [KARAF-6267] Use transaction feature instead of directly the jta spec bundle
---
 assembly/pom.xml                         | 9 +++++++++
 assembly/src/main/resources/features.xml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8ba3a40..337a350 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -49,6 +49,14 @@
             <type>xml</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <version>${karaf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 
@@ -77,6 +85,7 @@
                             <descriptors>
                                 <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
                                 <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index 0479081..d01bddf 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -28,7 +28,7 @@
 
     <feature name="hazelcast" description="In memory data grid" version="${hazelcast.version}">
         <configfile finalname="${karaf.etc}/hazelcast.xml">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/xml/hazelcast</configfile>
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+        <feature>transaction</feature>
         <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.2</bundle>
         <bundle>mvn:com.hazelcast/hazelcast-all/${hazelcast.version}</bundle>
     </feature>