Repository: karaf Updated Branches: refs/heads/master 2f237e064 -> 31a42fc97
[KARAF-3120] Upgrade to Aries JPA 1.0.2 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/31a42fc9 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/31a42fc9 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/31a42fc9 Branch: refs/heads/master Commit: 31a42fc972de0f7042162339c3168c64c489b964 Parents: 2f237e0 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Jul 19 22:32:55 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Jul 19 22:32:55 2014 +0200 ---------------------------------------------------------------------- .../features/enterprise/src/main/feature/feature.xml | 10 +++++----- pom.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/31a42fc9/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 23d7f06..67c0df8 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -133,7 +133,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 version="[1.0.1,1.0.2)">jpa</feature> <requirement>osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement> </feature> @@ -153,7 +153,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/3.16</bundle> <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle> - <feature>jpa</feature> + <feature version="[1.0.1,1.0.2)">jpa</feature> <requirement>osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement> </feature> @@ -172,7 +172,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 version="[1.0.1,1.0.2)">jpa</feature> </feature> <feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}"> @@ -193,7 +193,7 @@ <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> - <feature>jpa</feature> + <feature version="[1.0.1,1.0.2)">jpa</feature> </feature> <feature name="hibernate-envers" description="Hibernate Envers 4.2.x" version="${hibernate42.version}"> @@ -221,7 +221,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 version="[1.0.2,1.1)">jpa</feature> </feature> <feature name="hibernate-envers" description="Hibernate Envers 4.3.x" version="${hibernate43.version}"> http://git-wip-us.apache.org/repos/asf/karaf/blob/31a42fc9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f4d039d..35cbaf5 100644 --- a/pom.xml +++ b/pom.xml @@ -192,11 +192,11 @@ <aries.jmx.blueprint.api.version>1.1.0</aries.jmx.blueprint.api.version> <aries.jmx.blueprint.core.version>1.1.0</aries.jmx.blueprint.core.version> <aries.jmx.whiteboard.version>1.0.0</aries.jmx.whiteboard.version> - <aries.jpa.version>1.0.2-SNAPSHOT</aries.jpa.version> - <aries.jpa.blueprint.aries.version>1.0.2-SNAPSHOT</aries.jpa.blueprint.aries.version> - <aries.jpa.api.version>1.0.1-SNAPSHOT</aries.jpa.api.version> - <aries.jpa.container.version>1.0.1-SNAPSHOT</aries.jpa.container.version> - <aries.jpa.container.context.version>1.0.2-SNAPSHOT</aries.jpa.container.context.version> + <aries.jpa.version>1.0.2</aries.jpa.version> + <aries.jpa.blueprint.aries.version>1.0.2</aries.jpa.blueprint.aries.version> + <aries.jpa.api.version>1.0.1</aries.jpa.api.version> + <aries.jpa.container.version>1.0.1</aries.jpa.container.version> + <aries.jpa.container.context.version>1.0.2</aries.jpa.container.context.version> <aries.jndi.version>1.0.0</aries.jndi.version> <aries.jndi.api.version>1.0.0</aries.jndi.api.version> <aries.jndi.url.version>1.1.0-SNAPSHOT</aries.jndi.url.version>
