You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/10/13 16:06:58 UTC
svn commit: r1182862 - in /aries/trunk/jpa: jpa-blueprint-aries/
jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/
jpa-container-context/ jpa-container-eclipselink-adapter/
jpa-container-itest/ jpa-container-testbundle-eclips...
Author: timothyjward
Date: Thu Oct 13 14:06:58 2011
New Revision: 1182862
URL: http://svn.apache.org/viewvc?rev=1182862&view=rev
Log:
ARIES-754: Update JPA import/export versions and dependencies ready for release
Modified:
aries/trunk/jpa/jpa-blueprint-aries/pom.xml
aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Thu Oct 13 14:06:58 2011
@@ -43,8 +43,7 @@
<aries.osgi.export.pkg />
<aries.osgi.import>
javax.persistence;version="[1.0.0,3.0.0)",
- org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
- org.apache.aries.blueprint;version="[0.1.0,1.1.0)",
+ org.apache.aries.*;version="$<range;[==,=+)>",
*
</aries.osgi.import>
<aries.osgi.export.service>
@@ -71,8 +70,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.3</version>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java Thu Oct 13 14:06:58 2011
@@ -37,10 +37,9 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
-import org.apache.aries.blueprint.ExtendedBeanMetadata;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.PassThroughMetadata;
-import org.apache.aries.blueprint.container.Parser;
+import org.apache.aries.blueprint.parser.Parser;
import org.apache.aries.blueprint.reflect.BeanMetadataImpl;
import org.apache.aries.blueprint.reflect.RefMetadataImpl;
import org.apache.aries.blueprint.reflect.ReferenceMetadataImpl;
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Thu Oct 13 14:06:58 2011
@@ -46,9 +46,10 @@
javax.persistence;version="[1.0.0,2.1.0)",
javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
- org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
- org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
- org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+ org.apache.aries.jpa.container.context;version="$<range;[==,=+)>",
+ org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.*;version="$<range;[==,=+)>",
*
</aries.osgi.import>
<aries.osgi.activator>
@@ -89,7 +90,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml Thu Oct 13 14:06:58 2011
@@ -39,6 +39,7 @@
<aries.osgi.import.pkg>
javax.persistence*;version="[1.1,2.1)",
!org.eclipse.persistence.*,
+ org.apache.aries.*;version="$<range;[==,=+)>",
*
</aries.osgi.import.pkg>
<aries.osgi.failok>true</aries.osgi.failok>
@@ -68,20 +69,20 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Thu Oct 13 14:06:58 2011
@@ -85,19 +85,19 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml Thu Oct 13 14:06:58 2011
@@ -71,12 +71,6 @@
<artifactId>org.eclipse.persistence.core</artifactId>
<version>2.1.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1182862&r1=1182861&r2=1182862&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Thu Oct 13 14:06:58 2011
@@ -47,14 +47,13 @@
javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
!javax.transaction,
- org.apache.aries.jpa.container;version="[0.1.0,1.1.0)",
- org.apache.aries.jpa.container.parsing;version="[0.1.0,1.1.0)",
- org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
- org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+ org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.*;version="$<range;[==,=+)>",
org.osgi.framework;version="[1.5,2)",
- org.osgi.framework.hooks.weaving;version="[1,1.1)";resolution:=optional,
- org.osgi.framework.wiring;version="[1,2)";resolution:=optional,
- org.osgi.service.jdbc;version="[1,2)";resolution:=optional,
+ org.osgi.framework.hooks.weaving;resolution:=optional,
+ org.osgi.framework.wiring;resolution:=optional,
+ org.osgi.service.jdbc;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.dynamic>
@@ -96,7 +95,7 @@
<dependency>
<artifactId>org.apache.aries.util</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
<scope>provided</scope>
</dependency>
<dependency>