karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [2/2] karaf git commit: [KARAF-3919] Fixing jta import range for openjpa
Date Mon, 10 Aug 2015 13:20:12 GMT
[KARAF-3919] Fixing jta import range for openjpa


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

Branch: refs/heads/master
Commit: 23847bc53d756f21a1289e37aaa95ed780ec38dd
Parents: f36f47c
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon Aug 10 15:19:51 2015 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon Aug 10 15:19:51 2015 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml  | 8 ++++----
 .../apache/karaf/itests/features/EnterpriseFeaturesTest.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/23847bc5/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 ef172d4..7fea3dd 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -119,7 +119,7 @@
     
     <feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.container.context.version}">
         <details>JPA implementation provided by Apache Aries JPA 1.x. NB: this feature
doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
-        <feature version="[1.1,2)">transaction</feature>
+        <feature version="[1.1,2)">transaction-api</feature>
         <feature version="[2.0.0,2.2.0)">persistence-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.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle>
@@ -133,7 +133,7 @@
 
     <feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}">
         <details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature
doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
-        <feature version="[1.1,2)">transaction</feature>
+        <feature version="[1.1,2)">transaction-api</feature>
         <feature version="[2.0.0,2.2.0)">persistence-api</feature>
         <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
         <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
@@ -147,7 +147,7 @@
 
     <feature name="openjpa" description="Apache OpenJPA 2.2.x persistence engine support"
version="2.2.2">
         <details>Enable Apache OpenJPA as persistence engine.</details>
-        <feature version="[1.1,2)">transaction</feature>
+        <feature version="[1.1,1.2)">transaction-api</feature>
         <feature version="[2.0.0,2.1.0)">persistence-api</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
@@ -166,7 +166,7 @@
 
     <feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support"
version="2.3.0">
         <details>Enable Apache OpenJPA as persistence engine.</details>
-        <feature version="[1.1,2)">transaction</feature>
+        <feature version="[1.1,1.2)">transaction-api</feature>
         <feature version="[2.0.0,2.1.0)">persistence-api</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/23847bc5/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index a17587a..6c5a0cb 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -41,8 +41,8 @@ public class EnterpriseFeaturesTest extends KarafTestSupport {
     }
 
     @Test
-    public void installTransaction110Feature() throws Exception {
-        installAssertAndUninstallFeature("transaction", "1.1.1");
+    public void installTransaction130Feature() throws Exception {
+        installAssertAndUninstallFeature("transaction", "1.3.0");
     }
 
     @Test


Mime
View raw message