Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 58699 invoked from network); 15 Sep 2010 20:33:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Sep 2010 20:33:16 -0000 Received: (qmail 45825 invoked by uid 500); 15 Sep 2010 20:33:16 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 45717 invoked by uid 500); 15 Sep 2010 20:33:15 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 45709 invoked by uid 99); 15 Sep 2010 20:33:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Sep 2010 20:33:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 15 Sep 2010 20:33:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7106A23889E1; Wed, 15 Sep 2010 20:32:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r997485 - in /incubator/aries/trunk/samples: ./ ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/ blog/blog-assembly/ blog/blog-assembly/src/main/filtered-resources/configuration/ blog/blog-itests/ blog/... Date: Wed, 15 Sep 2010 20:32:54 -0000 To: aries-commits@incubator.apache.org From: jbohn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100915203254.7106A23889E1@eris.apache.org> Author: jbohn Date: Wed Sep 15 20:32:53 2010 New Revision: 997485 URL: http://svn.apache.org/viewvc?rev=997485&view=rev Log: ARIES-409 Update AriesTrader to use geronimo-jpa_2.0_spec-1.1.jar and improve version management by adding properties in samples root dependency management Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini incubator/aries/trunk/samples/blog/blog-assembly/pom.xml incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini incubator/aries/trunk/samples/blog/blog-itests/pom.xml incubator/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml incubator/aries/trunk/samples/pom.xml Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original) +++ incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Wed Sep 15 20:32:53 2010 @@ -28,9 +28,9 @@ commons-pool-1.5.4.jar@start,\ org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\ openjpa-${openjpaVersion}.jar@start,\ geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\ -geronimo-jpa_2.0_spec-1.0.jar@start,\ -geronimo-jta_1.1_spec-1.1.1.jar@start,\ -geronimo-transaction-2.1.3.jar@start,\ +geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\ +geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\ +geronimo-transaction-${geronimoTransactionVersion}.jar@start,\ pax-web-jetty-bundle-0.7.2.jar@start,\ pax-web-extender-war-0.7.2.jar@start,\ pax-web-jsp-0.7.2.jar@start,\ Modified: incubator/aries/trunk/samples/blog/blog-assembly/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/blog/blog-assembly/pom.xml (original) +++ incubator/aries/trunk/samples/blog/blog-assembly/pom.xml Wed Sep 15 20:32:53 2010 @@ -85,7 +85,6 @@ org.apache.geronimo.specs geronimo-jpa_2.0_spec - 1.1 Modified: incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original) +++ incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Wed Sep 15 20:32:53 2010 @@ -40,9 +40,9 @@ commons-collections-3.2.1.jar@start,\ commons-lang-2.5.jar@start,\ commons-pool-1.5.4.jar@start,\ geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\ -geronimo-jpa_2.0_spec-1.1.jar@start,\ -geronimo-jta_1.1_spec-1.1.1.jar@start,\ -geronimo-transaction-2.1.3.jar@start,\ +geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\ +geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\ +geronimo-transaction-${geronimoTransactionVersion}.jar@start,\ openjpa-${openjpaVersion}.jar@start,\ org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\ org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\ Modified: incubator/aries/trunk/samples/blog/blog-itests/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/pom.xml?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/blog/blog-itests/pom.xml (original) +++ incubator/aries/trunk/samples/blog/blog-itests/pom.xml Wed Sep 15 20:32:53 2010 @@ -236,7 +236,6 @@ org.apache.geronimo.specs geronimo-jpa_2.0_spec - 1.1 test Modified: incubator/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml (original) +++ incubator/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml Wed Sep 15 20:32:53 2010 @@ -91,7 +91,6 @@ org.apache.geronimo.specs geronimo-jpa_2.0_spec - 1.1 org.apache.geronimo.specs Modified: incubator/aries/trunk/samples/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/pom.xml?rev=997485&r1=997484&r2=997485&view=diff ============================================================================== --- incubator/aries/trunk/samples/pom.xml (original) +++ incubator/aries/trunk/samples/pom.xml Wed Sep 15 20:32:53 2010 @@ -47,6 +47,9 @@ 0.3-incubating-SNAPSHOT 0.3-incubating-SNAPSHOT 2.0.0 + 1.1 + 1.1.1 + 2.1.3 @@ -105,21 +108,19 @@ 1.0.1 - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 + org.apache.geronimo.components + geronimo-transaction + ${geronimoTransactionVersion} - org.apache.geronimo.specs geronimo-jpa_2.0_spec - 1.0 + ${geronimoJpaSpecVersion} javax.servlet