Index: api2-legacy/project.xml
===================================================================
--- api2-legacy/project.xml	(revision 714158)
+++ api2-legacy/project.xml	(working copy)
@@ -25,7 +25,7 @@
     <name>JDO2 API Legacy</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api-legacy</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) API legacy</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
Index: api2/project.xml
===================================================================
--- api2/project.xml	(revision 714158)
+++ api2/project.xml	(working copy)
@@ -25,7 +25,7 @@
     <name>JDO2 API</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) API</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
Index: enhancer20/project.xml
===================================================================
--- enhancer20/project.xml	(revision 703016)
+++ enhancer20/project.xml	(working copy)
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Enhancer)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-enhancer</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) Enhancer</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
Index: fostore20/project.xml
===================================================================
--- fostore20/project.xml	(revision 703016)
+++ fostore20/project.xml	(working copy)
@@ -25,7 +25,7 @@
     <!-- ============== -->
     <name>JDO2 Implementation (FOStore)</name>
     <artifactId>jdo2-fostore</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) FOStore</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -38,32 +38,32 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-runtime</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-query</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
Index: model20/project.xml
===================================================================
--- model20/project.xml	(revision 703016)
+++ model20/project.xml	(working copy)
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Model)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-model</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) Model</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
Index: query20/project.xml
===================================================================
--- query20/project.xml	(revision 703016)
+++ query20/project.xml	(working copy)
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Query)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-query</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) Query</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -39,22 +39,22 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-runtime</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
Index: runtime20/project.xml
===================================================================
--- runtime20/project.xml	(revision 714167)
+++ runtime20/project.xml	(working copy)
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Runtime)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-runtime</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) Runtime</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -39,17 +39,17 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
Index: tck2-legacy/project.xml
===================================================================
--- tck2-legacy/project.xml	(revision 703016)
+++ tck2-legacy/project.xml	(working copy)
@@ -24,7 +24,7 @@
     <name>JDO2 Technology Compatibility Kit Legacy</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck-legacy</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Objects 2 (JDO) TCK Legacy</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process. The Legacy version works with Java SE 1.3.
@@ -39,22 +39,22 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api-legacy</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
Index: tck2/project.xml
===================================================================
--- tck2/project.xml	(revision 703016)
+++ tck2/project.xml	(working copy)
@@ -24,7 +24,7 @@
     <name>JDO2 Technology Compatibility Kit</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Objects 2 (JDO) TCK</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request JSR 243 under the auspices of the Java Community Process.
@@ -39,22 +39,22 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
Index: util20/project.xml
===================================================================
--- util20/project.xml	(revision 703016)
+++ util20/project.xml	(working copy)
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Util)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-util</artifactId>
-    <currentVersion>${currentVersion}</currentVersion>
+    <currentVersion>${jdo.currentVersion}</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2 (JDO) Util</shortDescription>
     <description>The Java Data Objects 2 (JDO) API is a standard interface-based 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>${currentVersion}</version>
+            <version>${jdo.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
Index: project.properties
===================================================================
--- project.properties	(revision 714146)
+++ project.properties	(working copy)
@@ -20,7 +20,7 @@
 http://download.java.net/maven/1
 
 # Current version number
-currentVersion = 2.3-SNAPSHOT
+jdo.currentVersion = 2.3-SNAPSHOT
 
 # Make sure the compiled class still work with J2SE 1.3
 maven.compile.source = 1.3