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 2021/09/01 19:29:10 UTC
[karaf] branch main updated: [KARAF-7106] Add aries-tx-control
services bundles in transaction feature
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new c664255 [KARAF-7106] Add aries-tx-control services bundles in transaction feature
new 0a7476f Merge pull request #1429 from jbonofre/KARAF-7106
c664255 is described below
commit c664255e7b2d6db97760845b5ad50ba48d4ac0a6
Author: Jean-Baptiste Onofré <jb...@MacBookPro.local>
AuthorDate: Wed Sep 1 21:06:36 2021 +0200
[KARAF-7106] Add aries-tx-control services bundles in transaction feature
---
assemblies/features/enterprise/src/main/feature/feature.xml | 2 ++
.../java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 2706c50..06a0686 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -145,6 +145,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
<requirement>
transaction-manager
</requirement>
+ <bundle>mvn:org.apache.aries.tx-control/tx-control-service-local/1.0.1</bundle>
+ <bundle>mvn:org.apache.aries.tx-control/tx-control-service-xa/1.0.1</bundle>
<conditional>
<condition>aries-blueprint</condition>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index d181031..dfd283b 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -51,13 +51,14 @@ public class EnterpriseFeaturesTest extends BaseTest {
"mvn:org.apache.karaf.features/spring/" + version + "/xml/features, " +
"mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features, " +
"mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/specs/" + version + "/xml/features, " +
"mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
return result.toArray(new Option[result.size()]);
}
@Test
public void installTransaction20Feature() throws Exception {
- installAssertAndUninstallFeature("transaction", "2.0.0");
+ installAssertAndUninstallFeature("transaction", "2.0");
}
@Test