Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EEA001024A for ; Tue, 12 Nov 2013 12:07:32 +0000 (UTC) Received: (qmail 98972 invoked by uid 500); 12 Nov 2013 12:07:32 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 96623 invoked by uid 500); 12 Nov 2013 12:07:29 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 95053 invoked by uid 99); 12 Nov 2013 12:07:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 12:07:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 12:07:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B9CFE23889E3; Tue, 12 Nov 2013 12:07:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1541021 - in /aries/trunk/jpa: jpa-api/pom.xml jpa-container-context/pom.xml jpa-container/pom.xml Date: Tue, 12 Nov 2013 12:07:04 -0000 To: commits@aries.apache.org From: mnuttall@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131112120704.B9CFE23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 - 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)" 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 @@ - 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 @@ - 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,