You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/09/17 16:06:23 UTC
karaf git commit: [KARAF-3975] Remove start levels for jpa and
persistence providers
Repository: karaf
Updated Branches:
refs/heads/master db6799ad2 -> 205618be7
[KARAF-3975] Remove start levels for jpa and persistence providers
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/205618be
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/205618be
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/205618be
Branch: refs/heads/master
Commit: 205618be71b7571e353e18809e70f8e6d3e55e09
Parents: db6799a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Sep 17 16:06:16 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Sep 17 16:06:16 2015 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 52 ++++++++++----------
1 file changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/205618be/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 33f68d1..2119563 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -46,12 +46,12 @@
aries.transaction.howl.bufferSize = 4
</config>
<feature version="[1.1,2)">transaction-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.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
+ <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
- <bundle start-level="30" dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
+ <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
</conditional>
</feature>
@@ -65,12 +65,12 @@
<feature name="persistence-api" description="Persistence API" version="2.0.0">
<details>Persistence API</details>
- <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
</feature>
<feature name="persistence-api" description="Persistence API" version="2.1.0">
<details>Persistence API</details>
- <bundle start-level="30">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
+ <bundle>mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
</feature>
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.container.context.version}">
@@ -91,13 +91,13 @@
<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-api</feature>
<feature version="[2.0.0,2.2.0)">persistence-api</feature>
- <bundle start-level="30" dependency="true">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>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
+ <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
+ <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
+ <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/${aries.jpa.version}</bundle>
+ <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/${aries.jpa.version}</bundle>
</conditional>
</feature>
@@ -117,7 +117,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<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>
+ <bundle>mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
</feature>
<feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0">
@@ -135,7 +135,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<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/3.16</bundle>
- <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
<requirement>osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement>
</feature>
@@ -155,7 +155,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<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-asm5-shaded/4.3</bundle>
- <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.4.0</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/2.4.0</bundle>
</feature>
<feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}">
@@ -170,10 +170,10 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:net.sourceforge.cglib/com.springsource.net.sf.cglib/${cglib2.version}</bundle>
<bundle dependency="true">mvn:org.jboss.javassist/com.springsource.javassist/${javassist.version}</bundle>
- <bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle>
- <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>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate/${hibernate3.version}</bundle>
</feature>
<feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}">
@@ -190,15 +190,15 @@
<bundle dependency="true">mvn:org.jboss/jandex/1.2.2.Final</bundle>
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
<bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle>
- <bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle>
- <bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle>
- <bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle>
</feature>
<feature name="hibernate-envers" description="Hibernate Envers 4.2.x" version="${hibernate42.version}">
<details>Enable Hibernate Envers 4.2.x</details>
<feature version="${hibernate42.version}">hibernate</feature>
- <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle>
</feature>
<feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}">
@@ -215,15 +215,15 @@
<bundle dependency="true">mvn:org.jboss/jandex/1.2.2.Final</bundle>
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
<bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle>
- <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>
+ <bundle>mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle>
</feature>
<feature name="hibernate-envers" description="Hibernate Envers 4.3.x" version="${hibernate43.version}">
<details>Enable Hibernate Envers 4.3.x</details>
<feature version="${hibernate43.version}">hibernate</feature>
- <bundle start-level="100">mvn:org.hibernate/hibernate-envers/${hibernate43.version}</bundle>
+ <bundle>mvn:org.hibernate/hibernate-envers/${hibernate43.version}</bundle>
</feature>
<feature name="hibernate-validator" description="Hibernate Validator support" version="${hibernate.validator.version}">