You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2005/09/30 09:34:37 UTC
svn commit: r292659 - in /incubator/jdo/trunk: tck11/maven.xml
tck11/project.properties tck11/project.xml tck20/maven.xml
tck20/project.properties tck20/project.xml
Author: mbo
Date: Fri Sep 30 00:34:30 2005
New Revision: 292659
URL: http://svn.apache.org/viewcvs?rev=292659&view=rev
Log:
JDO-153 Upgrade springframework version used in tck20/tck11 to 1.2.5
Modified:
incubator/jdo/trunk/tck11/maven.xml
incubator/jdo/trunk/tck11/project.properties
incubator/jdo/trunk/tck11/project.xml
incubator/jdo/trunk/tck20/maven.xml
incubator/jdo/trunk/tck20/project.properties
incubator/jdo/trunk/tck20/project.xml
Modified: incubator/jdo/trunk/tck11/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/maven.xml?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/maven.xml (original)
+++ incubator/jdo/trunk/tck11/maven.xml Fri Sep 30 00:34:30 2005
@@ -317,7 +317,8 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Spring jar files -->
- <pathelement location="${spring.jarfile}"/>
+ <pathelement location="${springcore.jarfile}"/>
+ <pathelement location="${springbeans.jarfile}"/>
<pathelement location="${logging.jarfile}"/>
<!-- Jar files for the reference implementation -->
<pathelement location="${jdo.jdori.jarfile}" />
@@ -337,7 +338,8 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Spring jar files -->
- <pathelement location="${spring.jarfile}"/>
+ <pathelement location="${springcore.jarfile}"/>
+ <pathelement location="${springbeans.jarfile}"/>
<pathelement location="${logging.jarfile}"/>
<!-- Jar files for the reference implementation -->
<pathelement location="${jdo.jdori.jarfile}" />
Modified: incubator/jdo/trunk/tck11/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.properties?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/project.properties (original)
+++ incubator/jdo/trunk/tck11/project.properties Fri Sep 30 00:34:30 2005
@@ -50,7 +50,8 @@
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
-spring.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
logging.jarfile = ${pom.getDependencyPath('commons-logging')}
xmlparser =
Modified: incubator/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.xml?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/project.xml (original)
+++ incubator/jdo/trunk/tck11/project.xml Fri Sep 30 00:34:30 2005
@@ -82,11 +82,15 @@
<id>commons-logging</id>
<version>1.0.4</version>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.1.3</version>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.5</version>
</dependency>
</dependencies>
Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Fri Sep 30 00:34:30 2005
@@ -535,7 +535,8 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Spring jar files -->
- <pathelement location="${spring.jarfile}"/>
+ <pathelement location="${springcore.jarfile}"/>
+ <pathelement location="${springbeans.jarfile}"/>
<pathelement location="${logging.jarfile}"/>
<!-- Jar files for the reference implementation -->
<pathelement location="${jpox.jdori.jarfile}" />
@@ -576,7 +577,8 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Spring jar files -->
- <pathelement location="${spring.jarfile}"/>
+ <pathelement location="${springcore.jarfile}"/>
+ <pathelement location="${springbeans.jarfile}"/>
<pathelement location="${logging.jarfile}"/>
<!-- Jar files for the reference implementation -->
<pathelement location="${jpox.jdori.jarfile}" />
Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Fri Sep 30 00:34:30 2005
@@ -64,7 +64,8 @@
bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
-spring.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
logging.jarfile = ${pom.getDependencyPath('commons-logging')}
log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
Modified: incubator/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?rev=292659&r1=292658&r2=292659&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Fri Sep 30 00:34:30 2005
@@ -101,7 +101,12 @@
<dependency>
<groupId>springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.1.3</version>
+ <version>1.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.5</version>
</dependency>
<!-- dependencies for connection pooling -->
<dependency>