Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 6f57a3518 -> e9cf3d8a3
[KARAF-3246] Keep the "old" jpa feature waiting for the JPA 2.0 fix in Aries Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e9cf3d8a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e9cf3d8a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e9cf3d8a Branch: refs/heads/karaf-3.0.x Commit: e9cf3d8a30d29a1ff93812e005057d9457979a83 Parents: 6f57a35 Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Mon Sep 29 12:54:38 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Mon Sep 29 12:54:38 2014 +0200 ---------------------------------------------------------------------- .../features/enterprise/src/main/feature/feature.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e9cf3d8a/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 a325671..6d23cc4 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -85,7 +85,7 @@ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle> </feature> - <feature name="jpa20" description="OSGi Persistence Container 2.0" version="1.0.1" resolver="(obr)"> + <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1" resolver="(obr)"> <details>JPA 2.0 implementation provided by Apache Aries JPA 1.0.1. NB: this feature doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> @@ -94,19 +94,6 @@ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.0</bundle> <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.1</bundle> </feature> - <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1" resolver="(obr)"> - <feature>jpa20</feature> - </feature> - - <feature name="jpa21" description="OSGi Persistence Container 2.1" version="${aries.jpa.version}" resolver="(obr)"> - <details>JPA 2.1 implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> - <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> - <bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> - <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.aries.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.container.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle> - </feature> <feature name="openjpa" description="Apache OpenJPA 2.2.x persistence engine support" version="2.2.2" resolver="(obr)"> <details>Enable Apache OpenJPA as persistence engine.</details>
