incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
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 GMT
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 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<version>1.1</version>
 		</dependency>
 
 		<dependency>

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 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<version>1.1</version>
             <scope>test</scope>
 		</dependency>
 

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 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>

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 @@
         <ariesUtilVersion>0.3-incubating-SNAPSHOT</ariesUtilVersion>
         <ariesWebVersion>0.3-incubating-SNAPSHOT</ariesWebVersion>
         <openjpaVersion>2.0.0</openjpaVersion>
+        <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
+        <geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
+        <geronimoTransactionVersion>2.1.3</geronimoTransactionVersion>
     </properties>
     
     <dependencyManagement>
@@ -105,21 +108,19 @@
                 <version>1.0.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>1.1.1</version>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>${geronimoTransactionVersion}</version>
             </dependency>
-<!--
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                <version>1.1.2</version>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>${geronimoJtaSpecVersion}</version>
             </dependency>
--->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.0</version>
+                <version>${geronimoJpaSpecVersion}</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>



Mime
View raw message