You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/07/25 16:27:28 UTC

svn commit: r1365600 - in /karaf/trunk: assemblies/features/enterprise/src/main/feature/feature.xml pom.xml

Author: pieber
Date: Wed Jul 25 14:27:28 2012
New Revision: 1365600

URL: http://svn.apache.org/viewvc?rev=1365600&view=rev
Log:
[KARAF-1649] Upgrade to JPA final

Signed-off-by: Andreas Pieber <an...@gmail.com>

Modified:
    karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml?rev=1365600&r1=1365599&r2=1365600&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Wed Jul 25 14:27:28 2012
@@ -36,7 +36,7 @@
         <bundle dependency='true' start-level='30'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
         <bundle start-level='30'>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</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.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.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.container.context/${aries.jpa.version}</bundle>
     </feature>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1365600&r1=1365599&r2=1365600&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Jul 25 14:27:28 2012
@@ -177,7 +177,8 @@
         <aries.blueprint.jexl.evaluator.version>1.0.0-SNAPSHOT</aries.blueprint.jexl.evaluator.version>
         <aries.jmx.version>1.0.0</aries.jmx.version>
         <aries.jpa.api.version>1.0.0</aries.jpa.api.version>
-        <aries.jpa.version>1.0.0-SNAPSHOT</aries.jpa.version>
+        <aries.jpa.version>1.0.0</aries.jpa.version>
+        <aries.jpa.blueprint.version>1.0.0-SNAPSHOT</aries.jpa.blueprint.version>
         <aries.jndi.version>1.0.0</aries.jndi.version>
         <aries.jndi.url.version>1.0.0-SNAPSHOT</aries.jndi.url.version>
         <aries.proxy.version>1.0.0</aries.proxy.version>
@@ -1647,7 +1648,7 @@
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
-                <version>${aries.jpa.version}</version>
+                <version>${aries.jpa.blueprint.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>