You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/04/08 19:33:25 UTC
svn commit: r932023 - in /incubator/aries/trunk/samples: ./
ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/
blog/blog-assembly/src/main/filtered-resources/configuration/
blog/blog-standalone-platform-assembly/src/...
Author: jbohn
Date: Thu Apr 8 17:33:25 2010
New Revision: 932023
URL: http://svn.apache.org/viewvc?rev=932023&view=rev
Log:
ARIES-173 update config.ini references to openjpa version - use property to prevent future problems - we should consider doing the same for every version specified in the config.ini files
Modified:
incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
incubator/aries/trunk/samples/blog/blog-standalone-platform-assembly/src/main/filtered-resources/configuration/config.ini
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=932023&r1=932022&r2=932023&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 Thu Apr 8 17:33:25 2010
@@ -26,7 +26,7 @@ commons-collections-3.2.1.jar@start,\
commons-lang-2.5.jar@start,\
commons-pool-1.5.4.jar@start,\
org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
-openjpa-2.0.0-beta2.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,\
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=932023&r1=932022&r2=932023&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 Thu Apr 8 17:33:25 2010
@@ -41,7 +41,7 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
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,\
-openjpa-2.0.0-beta2.jar@start,\
+openjpa-${openjpaVersion}.jar@start,\
org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
Modified: incubator/aries/trunk/samples/blog/blog-standalone-platform-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-standalone-platform-assembly/src/main/filtered-resources/configuration/config.ini?rev=932023&r1=932022&r2=932023&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-standalone-platform-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/blog/blog-standalone-platform-assembly/src/main/filtered-resources/configuration/config.ini Thu Apr 8 17:33:25 2010
@@ -41,7 +41,7 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
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,\
-openjpa-2.0.0-beta2.jar@start,\
+openjpa-${openjpaVersion}.jar@start,\
org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
Modified: incubator/aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/pom.xml?rev=932023&r1=932022&r2=932023&view=diff
==============================================================================
--- incubator/aries/trunk/samples/pom.xml (original)
+++ incubator/aries/trunk/samples/pom.xml Thu Apr 8 17:33:25 2010
@@ -46,6 +46,7 @@
<ariesTransactionVersion>0.1-incubating-SNAPSHOT</ariesTransactionVersion>
<ariesUtilVersion>0.1-incubating-SNAPSHOT</ariesUtilVersion>
<ariesWebVersion>0.1-incubating-SNAPSHOT</ariesWebVersion>
+ <openjpaVersion>2.0.0-beta3</openjpaVersion>
</properties>
<dependencyManagement>
@@ -133,7 +134,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.0.0-beta3</version>
+ <version>${openjpaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>