Index: .classpath
===================================================================
--- .classpath	(revision 8574)
+++ .classpath	(working copy)
@@ -56,7 +56,7 @@
 	<classpathentry kind="src" path="jdo-extensions-it/src/test/resources"/>
 	<classpathentry kind="src" path="jdo-extensions-it/target/generated-sources/castor"/>
 	<classpathentry kind="src" path="jpa-extensions-it/src/main/java"/>
-	<classpathentry kind="src" path="jpa-extensions-it/src/test/java"/>
+	<classpathentry kind="src" output="jpa-extensions-it/target" path="jpa-extensions-it/src/test/java"/>
 	<classpathentry kind="src" path="jpa-extensions-it/src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
@@ -70,20 +70,22 @@
 	<classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.5.4/spring-aop-2.5.4.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.2.RELEASE/spring-aop-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.5/spring-beans-2.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.5/spring-core-2.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/2.5.4/spring-orm-2.5.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.5/spring-context-2.5.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/2.5.4/spring-tx-2.5.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.5.4/spring-jdbc-2.5.4.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.2.RELEASE/spring-expression-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.2.RELEASE/spring-asm-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.2.RELEASE/spring-beans-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.2.RELEASE/spring-core-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.2.RELEASE/spring-orm-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.2.RELEASE/spring-context-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.2.RELEASE/spring-tx-3.0.2.RELEASE.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.2.RELEASE/spring-jdbc-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/dbunit/dbunit/2.2.3/dbunit-2.2.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-nop/1.4.3/slf4j-nop-1.4.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.4/easymock-2.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/edu/umd/cs/mtc/multithreadedtc/1.01/multithreadedtc-1.01.jar"/>
@@ -91,7 +93,7 @@
 	<classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/2.5.2/spring-test-2.5.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.2.RELEASE/spring-test-3.0.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.5.3.0_1/derby-10.5.3.0_1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/>
 	<classpathentry kind="output" path="eclipse"/>
Index: pom.xml
===================================================================
--- pom.xml	(revision 8574)
+++ pom.xml	(working copy)
@@ -1,738 +1,722 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.codehaus.castor</groupId>
-    <artifactId>castor</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    
-    <modules>
-        <module>core</module>
-        <module>xml</module>
-        <module>schema</module>
-        <module>codegen</module>
-        <module>ddlgen</module>
-        <module>anttask</module>
-        <module>cpa</module>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.codehaus.castor</groupId>
+	<artifactId>castor</artifactId>
+	<version>1.3.2-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
-        <module>diff</module>
-        <module>xmlctf-framework</module>
-        
-        <module>maven-plugins</module>
-        
-        <!-- <module>cpa-testcase-archetype</module> -->
-        <!-- <module>codegen-testcase-archetype</module> -->
+	<modules>
+		<module>core</module>
+		<module>xml</module>
+		<module>schema</module>
+		<module>codegen</module>
+		<module>ddlgen</module>
+		<module>anttask</module>
+		<module>cpa</module>
 
+		<module>diff</module>
+		<module>xmlctf-framework</module>
+
+		<module>maven-plugins</module>
+
+		<!-- <module>cpa-testcase-archetype</module> -->
+		<!-- <module>codegen-testcase-archetype</module> -->
+
 		<!-- integration test suites -->
-        <module>cpactf</module>
-        <module>jdo-extensions-it</module>
-        <module>jpa-extensions-it</module>
-	    <!-- re-enable once issues have been sorted -->
-        <!-- <module>xmlctf</module>  -->
+		<module>cpactf</module>
+		<module>jdo-extensions-it</module>
+		<module>jpa-extensions-it</module>
+		<!-- re-enable once issues have been sorted -->
+		<!-- <module>xmlctf</module>  -->
 
-        <!-- re-enable once properly integrated  -->        
-        <!-- module>fragmentmapper</module> -->
-    </modules>
-     
-    <name>Castor</name>
-    <url>http://castor.org</url>
+		<!-- re-enable once properly integrated  -->
+		<!-- module>fragmentmapper</module> -->
+	</modules>
 
-    <issueManagement>
-        <system>Jira</system>
-        <url>http://jira.codehaus.org/browse/CASTOR</url>
-    </issueManagement>
+	<name>Castor</name>
+	<url>http://castor.org</url>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-install-plugin</artifactId>
-                  <version>2.3</version>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-site-plugin</artifactId>
-                  <version>2.1</version>
-               </plugin>
-               <plugin>
-                   <groupId>org.apache.maven.plugins</groupId>
-                   <artifactId>maven-compiler-plugin</artifactId>
-                   <version>2.1</version>
-                   <configuration>
-                       <source>1.5</source>
-                       <target>1.5</target>
-                   </configuration>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-deploy-plugin</artifactId>
-                  <version>2.5</version>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-clean-plugin</artifactId>
-                  <version>2.3</version>
-               </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-jar-plugin</artifactId>
-	               <version>2.3</version>
-    	       </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-source-plugin</artifactId>
-	               <version>2.1.1</version>
-    	       </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-surefire-plugin</artifactId>
-	               <version>2.4.3</version>
-    	       </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-resources-plugin</artifactId>
-	               <version>2.4.1</version>
-				   <configuration>
-			          <encoding>UTF-8</encoding>
-        		   </configuration>
-    	       </plugin>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>castor-maven-plugin</artifactId>
-                  <version>2.1-SNAPSHOT</version>
-               </plugin>
-	            <plugin>
-	                  <groupId>org.apache.maven.plugins</groupId>
-	                  <artifactId>maven-checkstyle-plugin</artifactId>
-	                  <version>2.4</version>
-	            </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-changes-plugin</artifactId>
-	               <version>2.3</version>
-    	       </plugin>
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-javadoc-plugin</artifactId>
-	               <version>2.6.1</version>
-    	       </plugin>
-<!--     	       
-	           <plugin>
-	               <groupId>org.apache.maven.plugins</groupId>
-	               <artifactId>maven-plugin-plugin</artifactId>
-	               <version>2.5.1</version>
-    	       </plugin>
--->    	       
-               
-<!--                
-			   <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-dependency-plugin</artifactId>
-		            <configuration>
-		              <outputDirectory>newLib</outputDirectory>
-		              <excludeGroupIds>org.codehaus.castor</excludeGroupIds>
-		            </configuration> 
-		        <executions>
-		          <execution>
-		            <id>copy-dependencies</id>
-		            <phase>generate</phase>
-		            <goals>
-		              <goal>copy-dependencies</goal>
-		            </goals>
-		          </execution>
-		        </executions>
-               </plugin>
--->		        
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
+	<issueManagement>
+		<system>Jira</system>
+		<url>http://jira.codehaus.org/browse/CASTOR</url>
+	</issueManagement>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.1</version>
+					<configuration>
+						<source>1.5</source>
+						<target>1.5</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>2.1.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.4.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.4.1</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>castor-maven-plugin</artifactId>
+					<version>2.1-SNAPSHOT</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<version>2.4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-changes-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.6.1</version>
+				</plugin>
+				<!--
+					<plugin> <groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-plugin-plugin</artifactId>
+					<version>2.5.1</version> </plugin>
+				-->
 
-<!--
-               <plugin>
-                <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-clover2-plugin</artifactId>
-                <version>2.6.1</version>
-                <configuration>
-                  <cloverDatabase>target/clover-db</cloverDatabase>
-                  <licenseLocation>${basedir}/src/etc/CLOVER.LICENSE</licenseLocation>
-                </configuration> 
-                <executions>
-                    <execution>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                </executions>
-               </plugin>
--->
+				<!--
+					<plugin> <groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId> <configuration>
+					<outputDirectory>newLib</outputDirectory>
+					<excludeGroupIds>org.codehaus.castor</excludeGroupIds>
+					</configuration> <executions> <execution>
+					<id>copy-dependencies</id> <phase>generate</phase> <goals>
+					<goal>copy-dependencies</goal> </goals> </execution> </executions>
+					</plugin>
+				-->
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 
-        </plugins>
+			<!--
+				<plugin> <groupId>com.atlassian.maven.plugins</groupId>
+				<artifactId>maven-clover2-plugin</artifactId>
+				<version>2.6.1</version> <configuration>
+				<cloverDatabase>target/clover-db</cloverDatabase>
+				<licenseLocation>${basedir}/src/etc/CLOVER.LICENSE</licenseLocation>
+				</configuration> <executions> <execution> <phase>pre-site</phase>
+				<goals> <goal>instrument</goal> </goals> </execution> </executions>
+				</plugin>
+			-->
 
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-webdav</artifactId>
-                <version>1.0-beta-2</version>
-            </extension>
-        </extensions>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
-    </build>
+		</plugins>
 
-    <developers>
-        <developer>
-            <id>wguttmn</id>
-            <name>Werner Guttmann</name>
-            <email>wguttmn@codehaus.org</email>
-            <organization>Indoqa</organization>
-            <organizationUrl>http://www.indoqa.com</organizationUrl>
-            <roles>
-                <role>Castor XML Lead</role>
-                <role>Castor JPA Lead</role>
-                <role>Castor JDO committer</role>
-            </roles>
-            <timezone>+1</timezone>
-        </developer>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav</artifactId>
+				<version>1.0-beta-2</version>
+			</extension>
+		</extensions>
 
-        <developer>
-            <name>Ralf Joachim</name>
-            <email>ralf.joachim@syscon.eu</email>
-            <organization>Syscon</organization>
-            <roles>
-                <role>Castor JDO Lead</role>
-                <role>Castor JDO committer</role>
-            </roles>
-            <timezone>+1</timezone>
-        </developer>
+	</build>
 
-        <developer>
-            <name>Keith Visco</name>
-            <email>kvisco@intalio.com</email>
-            <organization>Intalio</organization>
-            <roles>
-                <role>Committer</role>
-            </roles>
-            <timezone>-5</timezone>
-        </developer>
+	<developers>
+		<developer>
+			<id>wguttmn</id>
+			<name>Werner Guttmann</name>
+			<email>wguttmn@codehaus.org</email>
+			<organization>Indoqa</organization>
+			<organizationUrl>http://www.indoqa.com</organizationUrl>
+			<roles>
+				<role>Castor XML Lead</role>
+				<role>Castor JPA Lead</role>
+				<role>Castor JDO committer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 
-        <developer>
-            <name>Bruce Snyder</name>
-            <email>ferret@frii.com</email>
-            <organization>Jailey Solutions</organization>
-            <roles>
-                <role>Committer</role>
-            </roles>
-            <timezone>-6</timezone>
-        </developer>
+		<developer>
+			<name>Ralf Joachim</name>
+			<email>ralf.joachim@syscon.eu</email>
+			<organization>Syscon</organization>
+			<roles>
+				<role>Castor JDO Lead</role>
+				<role>Castor JDO committer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 
-        <developer>
-            <name>Edward Kuns</name>
-            <email>edward.kuns@aspect.com</email>
-            <organization>N/A</organization>
-            <roles>
-                <role>Committer</role>
-            </roles>
-            <timezone>-6</timezone>
-        </developer>
-        
-        <developer>
-            <name>Lukas Lang</name>
-            <email>lukas.lang@inode.at</email>
-            <organization>N/A</organization>
-            <roles>
-                <role>Committer</role>
-            </roles>
-            <timezone>+1</timezone>
-        </developer>
-        
-    </developers>
+		<developer>
+			<name>Keith Visco</name>
+			<email>kvisco@intalio.com</email>
+			<organization>Intalio</organization>
+			<roles>
+				<role>Committer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
 
-    <mailingLists>
-        <mailingList>
-            <name>User mailing list</name>
-            <subscribe>user-subscribe@castor.codehaus.org</subscribe>
-            <unsubscribe>user-unsubscribe@castor.codehaus.org</unsubscribe>
-            <post>user@castor.codehaus.org</post>
-            <archive>http://archive.castor.codehaus.org/user</archive>
-        </mailingList>
-        <mailingList>
-            <name>Development mailing list</name>
-            <subscribe>dev-subscribe@castor.codehaus.org</subscribe>
-            <unsubscribe>dev-unsubscribe@castor.codehaus.org</unsubscribe>
-            <post>dev@castor.codehaus.org</post>
-            <archive>http://archive.castor.codehaus.org/dev</archive>
-        </mailingList>
-        <mailingList>
-            <name>Announcement mailing list</name>
-            <subscribe>announce-subscribe@castor.codehaus.org</subscribe>
-            <unsubscribe>announce-unsubscribe@castor.codehaus.org</unsubscribe>
-            <post>announce@castor.codehaus.org</post>
-            <archive>http://archive.castor.codehaus.org/announce</archive>
-        </mailingList>
-    </mailingLists>
+		<developer>
+			<name>Bruce Snyder</name>
+			<email>ferret@frii.com</email>
+			<organization>Jailey Solutions</organization>
+			<roles>
+				<role>Committer</role>
+			</roles>
+			<timezone>-6</timezone>
+		</developer>
 
-    <scm>
-       <connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk</connection>
-       <developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk</developerConnection>
-       <url>http://svn.castor.codehaus.org/browse/castor/castor/trunk</url>
-    </scm>
+		<developer>
+			<name>Edward Kuns</name>
+			<email>edward.kuns@aspect.com</email>
+			<organization>N/A</organization>
+			<roles>
+				<role>Committer</role>
+			</roles>
+			<timezone>-6</timezone>
+		</developer>
 
-    <distributionManagement>
-        <repository>
-          <id>codehaus.org</id>
-          <name>Castor Central Distribution Repository</name>
-          <url>dav:https://dav.codehaus.org/repository/castor/</url>
-        </repository>
-        <snapshotRepository>
-          <id>codehaus.org</id>
-          <name>Castor Central Development Repository</name>
-          <url>dav:https://dav.codehaus.org/snapshots.repository/castor/</url>
-        </snapshotRepository>
-        <site>
-          <id>codehaus.org</id>
-          <url>dav:https://dav.codehaus.org/castor/</url>
-        </site>
-    </distributionManagement>
+		<developer>
+			<name>Lukas Lang</name>
+			<email>lukas.lang@inode.at</email>
+			<organization>N/A</organization>
+			<roles>
+				<role>Committer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-    
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>1.6</version>
-                <!--  Joachim: this must not be test otherwise subproject anttask wont even compile!
-                <scope>test</scope>
-                -->
-            </dependency>
+	</developers>
 
-            <dependency>
-            	<groupId>org.codehaus.castor</groupId>
-            	<artifactId>spring-orm</artifactId>
-            	<version>1.5-SNAPSHOT</version>
-            	<scope>test</scope>
-            </dependency>
+	<mailingLists>
+		<mailingList>
+			<name>User mailing list</name>
+			<subscribe>user-subscribe@castor.codehaus.org</subscribe>
+			<unsubscribe>user-unsubscribe@castor.codehaus.org</unsubscribe>
+			<post>user@castor.codehaus.org</post>
+			<archive>http://archive.castor.codehaus.org/user</archive>
+		</mailingList>
+		<mailingList>
+			<name>Development mailing list</name>
+			<subscribe>dev-subscribe@castor.codehaus.org</subscribe>
+			<unsubscribe>dev-unsubscribe@castor.codehaus.org</unsubscribe>
+			<post>dev@castor.codehaus.org</post>
+			<archive>http://archive.castor.codehaus.org/dev</archive>
+		</mailingList>
+		<mailingList>
+			<name>Announcement mailing list</name>
+			<subscribe>announce-subscribe@castor.codehaus.org</subscribe>
+			<unsubscribe>announce-unsubscribe@castor.codehaus.org</unsubscribe>
+			<post>announce@castor.codehaus.org</post>
+			<archive>http://archive.castor.codehaus.org/announce</archive>
+		</mailingList>
+	</mailingLists>
 
-            <dependency>
-            	<groupId>org.springframework</groupId>
-            	<artifactId>spring-beans</artifactId>
-            	<version>2.5.5</version>
-            	<scope>test</scope>
-            </dependency>
+	<scm>
+		<connection>scm:svn:http://svn.codehaus.org/castor/castor/trunk</connection>
+		<developerConnection>scm:svn:https://svn.codehaus.org/castor/castor/trunk</developerConnection>
+		<url>http://svn.castor.codehaus.org/browse/castor/castor/trunk</url>
+	</scm>
 
-            <dependency>
-            	<groupId>org.springframework</groupId>
-            	<artifactId>spring-context</artifactId>
-            	<version>2.5.5</version>
-            	<scope>test</scope>
-            </dependency>
-            
-            <dependency>
-            	<groupId>org.springframework</groupId>
-            	<artifactId>spring-test</artifactId>
-            	<version>2.5.5</version>
-            	<scope>test</scope>
-            </dependency>
-            
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.4</version>
-                <!--  Joachim: this must not be test otherwise subproject xmlctf-framework wont even compile!
-                <scope>test</scope>
-                -->
-            </dependency>
-    
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
-                <scope>test</scope>
-            </dependency>
-    
-            <!-- temp. removed as src/tests is not on the test compilation path -->
-            <!--
-                <dependency>
-                <groupId>org.mockejb</groupId>
-                <artifactId>mockejb</artifactId>
-                <version>0.5</version>
-                <optional>true</optional>
-                </dependency>
-            -->
+	<distributionManagement>
+		<repository>
+			<id>codehaus.org</id>
+			<name>Castor Central Distribution Repository</name>
+			<url>dav:https://dav.codehaus.org/repository/castor/</url>
+		</repository>
+		<snapshotRepository>
+			<id>codehaus.org</id>
+			<name>Castor Central Development Repository</name>
+			<url>dav:https://dav.codehaus.org/snapshots.repository/castor/</url>
+		</snapshotRepository>
+		<site>
+			<id>codehaus.org</id>
+			<url>dav:https://dav.codehaus.org/castor/</url>
+		</site>
+	</distributionManagement>
 
-            <dependency>
-                <groupId>edu.umd.cs.mtc</groupId>
-                <artifactId>multithreadedtc</artifactId>
-                <version>1.01</version>
-                <scope>test</scope>
-            </dependency>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>1.1.1</version>
+			</dependency>
 
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>2.4</version>
-                <scope>test</scope>
-            </dependency>
-    
-            <dependency>
-                <groupId>oro</groupId>
-                <artifactId>oro</artifactId>
-                <version>2.0.8</version>
-                <optional>true</optional>
-            </dependency>
-    
-            <dependency>
-                <groupId>jakarta-regexp</groupId>
-                <artifactId>jakarta-regexp</artifactId>
-                <version>1.4</version>
-                <optional>true</optional>
-            </dependency>
-    
-            <dependency>
-                <groupId>ldapsdk</groupId>
-                <artifactId>ldapsdk</artifactId>
-                <version>4.1</version>
-                <optional>true</optional>
-            </dependency>
-            
-            <dependency>
-               <groupId>org.apache.derby</groupId>
-               <artifactId>derby</artifactId>
-               <version>10.5.3.0_1</version>
-               <scope>test</scope>
-            </dependency>
+			<dependency>
+				<groupId>ant</groupId>
+				<artifactId>ant</artifactId>
+				<version>1.6</version>
+				<!--
+					Joachim: this must not be test otherwise subproject anttask wont
+					even compile! <scope>test</scope>
+				-->
+			</dependency>
 
-            <dependency>
-                <groupId>velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>1.5</version>
-                <optional>true</optional>
-            </dependency>
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>spring-orm</artifactId>
+				<version>1.5-SNAPSHOT</version>
+				<scope>test</scope>
+			</dependency>
 
-	        <dependency>
-	            <groupId>javax.persistence</groupId>
-	            <artifactId>persistence-api</artifactId>
-	            <version>1.0</version>
-	        </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-beans</artifactId>
+				<version>${org.springframework.version}</version>
+				<scope>test</scope>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.6</version>
-            </dependency>
-            
 			<dependency>
-			    <groupId>commons-cli</groupId>
-			    <artifactId>commons-cli</artifactId>
-			    <version>1.2</version>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>${org.springframework.version}</version>
+				<scope>test</scope>
 			</dependency>
 
-            <!--  module dependencies -->            
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-xml</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-test</artifactId>
+				<version>${org.springframework.version}</version>
+				<scope>test</scope>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-xml-schema</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.asm</artifactId>
+				<version>${org.springframework.version}</version>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-codegen</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.expression</artifactId>
+				<version>${org.springframework.version}</version>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-ddlgen</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.8.1</version>
+				<!--
+					Joachim: this must not be test otherwise subproject
+					xmlctf-framework wont even compile! <scope>test</scope>
+				-->
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-core</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.13</version>
+				<scope>test</scope>
+			</dependency>
 
-            <dependency>
-            	<groupId>org.codehaus.castor</groupId>
-            	<artifactId>castor-tests</artifactId>
-            	<version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<!-- temp. removed as src/tests is not on the test compilation path -->
+			<!--
+				<dependency> <groupId>org.mockejb</groupId>
+				<artifactId>mockejb</artifactId> <version>0.5</version>
+				<optional>true</optional> </dependency>
+			-->
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-jdo</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>edu.umd.cs.mtc</groupId>
+				<artifactId>multithreadedtc</artifactId>
+				<version>1.01</version>
+				<scope>test</scope>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-testsuite-xml-framework</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
+			<dependency>
+				<groupId>org.easymock</groupId>
+				<artifactId>easymock</artifactId>
+				<version>2.4</version>
+				<scope>test</scope>
+			</dependency>
 
-            <dependency>
-                <groupId>org.codehaus.castor</groupId>
-                <artifactId>castor-xml-diff</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
-            </dependency>
-            
-        </dependencies>
-    </dependencyManagement>
+			<dependency>
+				<groupId>oro</groupId>
+				<artifactId>oro</artifactId>
+				<version>2.0.8</version>
+				<optional>true</optional>
+			</dependency>
 
-    <repositories>
-        <repository>
-            <id>codehaus-snapshots</id>
-            <name>Maven Codehaus Snapshots</name>
-            <url>
+			<dependency>
+				<groupId>jakarta-regexp</groupId>
+				<artifactId>jakarta-regexp</artifactId>
+				<version>1.4</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>ldapsdk</groupId>
+				<artifactId>ldapsdk</artifactId>
+				<version>4.1</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.derby</groupId>
+				<artifactId>derby</artifactId>
+				<version>10.5.3.0_1</version>
+				<scope>test</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>velocity</groupId>
+				<artifactId>velocity</artifactId>
+				<version>1.5</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.persistence</groupId>
+				<artifactId>persistence-api</artifactId>
+				<version>1.0</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>javacc-maven-plugin</artifactId>
+				<version>2.6</version>
+			</dependency>
+
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.2</version>
+			</dependency>
+
+			<!--  module dependencies -->
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-xml</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-xml-schema</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-codegen</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-ddlgen</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-core</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-tests</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-jdo</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-testsuite-xml-framework</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-xml-diff</artifactId>
+				<version>1.3.2-SNAPSHOT</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>codehaus-snapshots</id>
+			<name>Maven Codehaus Snapshots</name>
+			<url>
                 http://snapshots.repository.codehaus.org
             </url>
-        </repository>
-    </repositories>
+		</repository>
+	</repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>Maven Codehaus Snapshots</id>
-            <url>http://snapshots.maven.codehaus.org/maven2/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>Maven Codehaus Snapshots</id>
+			<url>http://snapshots.maven.codehaus.org/maven2/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
 
-    <reporting>
-        <plugins>
-        <!-- 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
- -->
-             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/castor/tools/log4j/TestCastorAppender.java</exclude>
-                        <exclude>org/castor/cache/simple/TestTimeLimited.java</exclude>
-                        <exclude>org/exolab/castor/jdo/oql/LexTest.java</exclude>
-                        <exclude>org/exolab/castor/jdo/oql/ParseTest.java</exclude>
-                        <exclude>org/exolab/castor/jdo/drivers/TestConnectionProxies.java</exclude>
-                        <exclude>org/castor/cache/TestCacheFactoryRegistry.java</exclude>
-                        <exclude>**/TestAll.java</exclude>
-                        <exclude>xml/**/*.java</exclude>
-                        <exclude>harness/**</exclude>
-                        <exclude>soak/**</exclude>
-                        <exclude>jdo/**</exclude>
-                        <exclude>ctf/**</exclude>
-                        <!-- test harness -->
-                        <exclude>org/exolab/castor/tests/framework/**</exclude>
-                    </excludes>
-                    <includes>
-                        <include>org/exolab/castor/**/Test*.java</include>
-                        <include>org/castor/**/Test*.java</include>
-                        <include>org/exolab/castor/**/*Test.java</include>
-                        <include>org/castor/**/*Test.java</include>
+	<reporting>
+		<plugins>
+			<!--
+				<plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version>
+				</plugin>
+			-->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jxr-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>org/castor/tools/log4j/TestCastorAppender.java</exclude>
+						<exclude>org/castor/cache/simple/TestTimeLimited.java</exclude>
+						<exclude>org/exolab/castor/jdo/oql/LexTest.java</exclude>
+						<exclude>org/exolab/castor/jdo/oql/ParseTest.java</exclude>
+						<exclude>org/exolab/castor/jdo/drivers/TestConnectionProxies.java</exclude>
+						<exclude>org/castor/cache/TestCacheFactoryRegistry.java</exclude>
+						<exclude>**/TestAll.java</exclude>
+						<exclude>xml/**/*.java</exclude>
+						<exclude>harness/**</exclude>
+						<exclude>soak/**</exclude>
+						<exclude>jdo/**</exclude>
+						<exclude>ctf/**</exclude>
+						<!-- test harness -->
+						<exclude>org/exolab/castor/tests/framework/**</exclude>
+					</excludes>
+					<includes>
+						<include>org/exolab/castor/**/Test*.java</include>
+						<include>org/castor/**/Test*.java</include>
+						<include>org/exolab/castor/**/*Test.java</include>
+						<include>org/castor/**/*Test.java</include>
 
-                        <!-- JDO test suite -->
-                        <include>Main.java</include>
-                    </includes>
-                    <systemProperties>
-                      <property>
-                        <name>test.category</name>
-                        <value>castor.mysql</value>
-                      </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
+						<!-- JDO test suite -->
+						<include>Main.java</include>
+					</includes>
+					<systemProperties>
+						<property>
+							<name>test.category</name>
+							<value>castor.mysql</value>
+						</property>
+					</systemProperties>
+				</configuration>
+			</plugin>
 
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-surefire-report-plugin</artifactId>
-               <version>2.4.3</version>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.4.3</version>
+			</plugin>
 
-            <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
 
-<!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <targetjdk>1.4</targetjdk>
-                    <rulesets>
-                        <ruleset>/rulesets/basic.xml</ruleset>
-                        <ruleset>/rulesets/controversial.xml</ruleset>
-                    </rulesets>
-                    <format>xml</format>
-                    <linkXref>true</linkXref>
-                        <sourceEncoding>utf-8</sourceEncoding>
-                        <minimumTokens>100</minimumTokens>
-                </configuration>
-            </plugin>
+			<!--
+				<plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId> <configuration>
+				<targetjdk>1.4</targetjdk> <rulesets>
+				<ruleset>/rulesets/basic.xml</ruleset>
+				<ruleset>/rulesets/controversial.xml</ruleset> </rulesets>
+				<format>xml</format> <linkXref>true</linkXref>
+				<sourceEncoding>utf-8</sourceEncoding>
+				<minimumTokens>100</minimumTokens> </configuration> </plugin>
+			-->
+			<plugin>
+				<artifactId>maven-changes-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>changes-report</report>
+							<!--<report>jira-report</report>-->
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
 
--->
-            <plugin>
-                <artifactId>maven-changes-plugin</artifactId>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>changes-report</report>
-                            <!--<report>jira-report</report>-->
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.4</version>
+			</plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
+			<plugin>
+				<groupId>com.atlassian.maven.plugins</groupId>
+				<artifactId>maven-clover2-plugin</artifactId>
+				<version>2.6.3</version>
+				<configuration>
+					<cloverDatabase>target/clover-db</cloverDatabase>
+					<licenseLocation>${basedir}/src/etc/CLOVER.LICENSE</licenseLocation>
+				</configuration>
+			</plugin>
 
-            <plugin>
-                <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-clover2-plugin</artifactId>
-                <version>2.6.3</version>
-                <configuration>
-                    <cloverDatabase>target/clover-db</cloverDatabase>
-                    <licenseLocation>${basedir}/src/etc/CLOVER.LICENSE</licenseLocation>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jdepend-maven-plugin</artifactId>
+				<version>2.0-beta-2</version>
+			</plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-            </plugin>
+			<plugin>
+				<groupId>com.googlecode.maven-overview-plugin</groupId>
+				<artifactId>maven-overview-plugin</artifactId>
+				<version>1.6</version>
+			</plugin>
 
-            <plugin>
-                <groupId>com.googlecode.maven-overview-plugin</groupId>
-                <artifactId>maven-overview-plugin</artifactId>
-                <version>1.6</version>
-            </plugin>
-            
-        </plugins>
-    </reporting>
-    
-    <ciManagement>
-        <system>bamboo</system>
-        <url>http://bamboo.ci.codehaus.org/browse/CASTOR</url>
-    </ciManagement>
-    
-    <profiles>
-        <!-- profile for executing all integration suite tests -->
-        <profile>
-            <id>it</id>
-            <modules>
-               <module>cpactf</module>
-               <module>jdo-extensions-it</module>
-               <module>jpa-extensions-it</module>
-                <!-- re-enable once issues have been sorted -->
-               <!-- <module>xmlctf</module>  -->
-            </modules>            
-        </profile>
-        <!-- profile for executing all XML integration suite tests -->
-        <profile>
-            <id>xmltests</id>
-            <modules>
-                <module>xmlctf-framework</module>
-                <module>maven-plugins</module>
-                <!-- re-enable once issues have been sorted -->
-                <!-- <module>xmlctf</module>  -->
-            </modules>            
-        </profile>
-        <!-- profile for executing all CPA integration suite tests -->
-        <profile>
-            <id>cpatests</id>
-            <modules>
-                <module>cpactf</module>
-            </modules>            
-        </profile>
-        <!-- profile for executing all CPA performance suite tests -->
-        <profile>
-            <id>cpaptftests</id>
-            <modules>
-                <module>cpaptf</module>
-            </modules>            
-        </profile>
-        <!-- profile for building and testing examples project -->
-        <profile>
-            <id>examples</id>
-            <modules>
-                <module>examples</module>
-            </modules>            
-        </profile>
-        <profile>
-            <id>javadoc</id>
-            <build>
-                <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-javadoc-plugin</artifactId>
-                      <configuration>
-                          <aggregate>true</aggregate>
-                      </configuration>
-                      <executions>
-                          <execution>
-                              <id>attach-javadocs</id>
-                              <goals>
-                                  <goal>jar</goal>
-                              </goals>
-                          </execution>
-                      </executions>
-                  </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    
+		</plugins>
+	</reporting>
+
+	<ciManagement>
+		<system>bamboo</system>
+		<url>http://bamboo.ci.codehaus.org/browse/CASTOR</url>
+	</ciManagement>
+
+	<profiles>
+		<!-- profile for executing all integration suite tests -->
+		<profile>
+			<id>it</id>
+			<modules>
+				<module>cpactf</module>
+				<module>jdo-extensions-it</module>
+				<module>jpa-extensions-it</module>
+				<!-- re-enable once issues have been sorted -->
+				<!-- <module>xmlctf</module>  -->
+			</modules>
+		</profile>
+		<!-- profile for executing all XML integration suite tests -->
+		<profile>
+			<id>xmltests</id>
+			<modules>
+				<module>xmlctf-framework</module>
+				<module>maven-plugins</module>
+				<!-- re-enable once issues have been sorted -->
+				<!-- <module>xmlctf</module>  -->
+			</modules>
+		</profile>
+		<!-- profile for executing all CPA integration suite tests -->
+		<profile>
+			<id>cpatests</id>
+			<modules>
+				<module>cpactf</module>
+			</modules>
+		</profile>
+		<!-- profile for executing all CPA performance suite tests -->
+		<profile>
+			<id>cpaptftests</id>
+			<modules>
+				<module>cpaptf</module>
+			</modules>
+		</profile>
+		<!-- profile for building and testing examples project -->
+		<profile>
+			<id>examples</id>
+			<modules>
+				<module>examples</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>javadoc</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<aggregate>true</aggregate>
+						</configuration>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<properties>
+		<org.springframework.version>3.0.2.RELEASE</org.springframework.version>
+	</properties>
 </project>
Index: jdo-extensions-it/pom.xml
===================================================================
--- jdo-extensions-it/pom.xml	(revision 8574)
+++ jdo-extensions-it/pom.xml	(working copy)
@@ -118,11 +118,13 @@
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-beans</artifactId>
+         <version>${org.springframework.version}</version>
          <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.springframework</groupId>
          <artifactId>spring-context</artifactId>
+         <version>${org.springframework.version}</version>
          <scope>test</scope>
       </dependency>
       <dependency>