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 2014/01/18 08:33:23 UTC
git commit: Revert jpa feature removing from openjpa and hibernate
ones
Updated Branches:
refs/heads/karaf-2.x 2bcdeefe2 -> b53a09fc5
Revert jpa feature removing from openjpa and hibernate ones
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b53a09fc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b53a09fc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b53a09fc
Branch: refs/heads/karaf-2.x
Commit: b53a09fc5882276e8fd500db964c343237bea8cf
Parents: 2bcdeef
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Jan 18 08:32:55 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Jan 18 08:32:55 2014 +0100
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/resources/features.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b53a09fc/assemblies/features/enterprise/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml
index ad4ada0..8385337 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -63,6 +63,7 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2</bundle>
<bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0" resolver="(obr)">
@@ -81,6 +82,7 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
<bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}" resolver="(obr)">
@@ -98,6 +100,7 @@
<bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate/${hibernate3.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}" resolver="(obr)">
@@ -118,6 +121,7 @@
<bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}" resolver="(obr)">
@@ -138,6 +142,7 @@
<bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle>
<bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)">