You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2013/11/12 13:07:04 UTC
svn commit: r1541021 - in /aries/trunk/jpa: jpa-api/pom.xml
jpa-container-context/pom.xml jpa-container/pom.xml
Author: mnuttall
Date: Tue Nov 12 12:07:04 2013
New Revision: 1541021
URL: http://svn.apache.org/r1541021
Log:
Aries-1134: Enable JPA 2.1 API and correct inconsistent versioning
Modified:
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Tue Nov 12 12:07:04 2013
@@ -46,8 +46,8 @@
org.apache.aries.jpa.container.context
</aries.osgi.export.pkg>
<aries.osgi.import>
- javax.persistence;version="[1.0.0,2.1.0)",
- javax.persistence.spi;version="[1.0.0,2.1.0)",
+ javax.persistence;version="[1.0.0,3.0.0)",
+ javax.persistence.spi;version="[1.0.0,3.0.0)",
org.osgi.framework;version="[1.5.0,2.0.0)"
</aries.osgi.import>
<aries.osgi.private.pkg />
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Tue Nov 12 12:07:04 2013
@@ -43,9 +43,9 @@
<aries.osgi.export.pkg />
<aries.osgi.import>
- 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,
+ javax.persistence;version="[1.0.0,3.0.0)",
+ javax.persistence.criteria;version="[1.1.0,3.0.0)";resolution:=optional,
+ javax.persistence.metamodel;version="[1.1.0,3.0.0)";resolution:=optional,
org.apache.aries.jpa.container.context;provide:=true,
org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Tue Nov 12 12:07:04 2013
@@ -42,10 +42,10 @@
<aries.osgi.export.pkg />
<aries.osgi.import>
- javax.persistence;version="[1.0.0,2.1.0)",
- javax.persistence.spi;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,
+ javax.persistence;version="[1.0.0,3.0.0)",
+ javax.persistence.spi;version="[1.0.0,3.0.0)",
+ javax.persistence.criteria;version="[1.1.0,3.0.0)";resolution:=optional,
+ javax.persistence.metamodel;version="[1.1.0,3.0.0)";resolution:=optional,
!javax.transaction,
org.apache.aries.jpa.container*;provide:=true,
org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
Re: svn commit: r1541021 - in /aries/trunk/jpa: jpa-api/pom.xml jpa-container-context/pom.xml jpa-container/pom.xml
Posted by Timothy Ward <ti...@apache.org>.
Mark, could you please revert this commit?
I have outlined the issues with the proposed solution in the JIRA item (https://issues.apache.org/jira/browse/ARIES-1134) where the patch was submitted. In brief there are two problems:
The version ranges are wrong. o.a.aries.jpa.container and o.a.aries.jpa.container.context are API providers, and so need a provider version range, not a consumer client range.
The implementations haven't been updated to support the new API methods, which means that the bundles are broken when used with the JPA 2.1 API.
Regards,
Tim
On 12 Nov 2013, at 12:07, mnuttall@apache.org wrote:
> Author: mnuttall
> Date: Tue Nov 12 12:07:04 2013
> New Revision: 1541021
>
> URL: http://svn.apache.org/r1541021
> Log:
> Aries-1134: Enable JPA 2.1 API and correct inconsistent versioning
>
> Modified:
> aries/trunk/jpa/jpa-api/pom.xml
> aries/trunk/jpa/jpa-container-context/pom.xml
> aries/trunk/jpa/jpa-container/pom.xml
>
> Modified: aries/trunk/jpa/jpa-api/pom.xml
> URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
> ==============================================================================
> --- aries/trunk/jpa/jpa-api/pom.xml (original)
> +++ aries/trunk/jpa/jpa-api/pom.xml Tue Nov 12 12:07:04 2013
> @@ -46,8 +46,8 @@
> org.apache.aries.jpa.container.context
> </aries.osgi.export.pkg>
> <aries.osgi.import>
> - javax.persistence;version="[1.0.0,2.1.0)",
> - javax.persistence.spi;version="[1.0.0,2.1.0)",
> + javax.persistence;version="[1.0.0,3.0.0)",
> + javax.persistence.spi;version="[1.0.0,3.0.0)",
> org.osgi.framework;version="[1.5.0,2.0.0)"
> </aries.osgi.import>
> <aries.osgi.private.pkg />
>
> Modified: aries/trunk/jpa/jpa-container-context/pom.xml
> URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
> ==============================================================================
> --- aries/trunk/jpa/jpa-container-context/pom.xml (original)
> +++ aries/trunk/jpa/jpa-container-context/pom.xml Tue Nov 12 12:07:04 2013
> @@ -43,9 +43,9 @@
>
> <aries.osgi.export.pkg />
> <aries.osgi.import>
> - 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,
> + javax.persistence;version="[1.0.0,3.0.0)",
> + javax.persistence.criteria;version="[1.1.0,3.0.0)";resolution:=optional,
> + javax.persistence.metamodel;version="[1.1.0,3.0.0)";resolution:=optional,
> org.apache.aries.jpa.container.context;provide:=true,
> org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
> org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
>
> Modified: aries/trunk/jpa/jpa-container/pom.xml
> URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1541021&r1=1541020&r2=1541021&view=diff
> ==============================================================================
> --- aries/trunk/jpa/jpa-container/pom.xml (original)
> +++ aries/trunk/jpa/jpa-container/pom.xml Tue Nov 12 12:07:04 2013
> @@ -42,10 +42,10 @@
>
> <aries.osgi.export.pkg />
> <aries.osgi.import>
> - javax.persistence;version="[1.0.0,2.1.0)",
> - javax.persistence.spi;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,
> + javax.persistence;version="[1.0.0,3.0.0)",
> + javax.persistence.spi;version="[1.0.0,3.0.0)",
> + javax.persistence.criteria;version="[1.1.0,3.0.0)";resolution:=optional,
> + javax.persistence.metamodel;version="[1.1.0,3.0.0)";resolution:=optional,
> !javax.transaction,
> org.apache.aries.jpa.container*;provide:=true,
> org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
>
>