Repository: karaf Updated Branches: refs/heads/master c0b4d3eaa -> afb8acc5c
[KARAF-3246] Just maintain the "old" jpa feature waiting for the 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/afb8acc5 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/afb8acc5 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/afb8acc5 Branch: refs/heads/master Commit: afb8acc5ca0d7a2d23b5c2514173d2db34babd3d Parents: c0b4d3e Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Mon Sep 29 12:53:11 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Mon Sep 29 12:53:11 2014 +0200 ---------------------------------------------------------------------- .../enterprise/src/main/feature/feature.xml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/afb8acc5/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 24073ce..b833c19 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -91,7 +91,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"> + <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1"> <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> @@ -103,22 +103,6 @@ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.1</bundle> </conditional> </feature> - <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1"> - <feature>jpa20</feature> - </feature> - - <feature name="jpa21" description="OSGi Persistence Container 2.1" version="${aries.jpa.version}"> - <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.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> - <conditional> - <condition>aries-blueprint</condition> - <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.aries.version}</bundle> - </conditional> - </feature> <feature name="openjpa" description="Apache OpenJPA 2.2.x persistence engine support" version="2.2.2"> <details>Enable Apache OpenJPA as persistence engine.</details>
