Index: tck20/project.properties
===================================================================
--- tck20/project.properties	(revision 369167)
+++ tck20/project.properties	(working copy)
@@ -57,7 +57,7 @@
 jdori.runtck.sysproperties = -Xmx512m
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
 jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox')}
 jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
 bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
@@ -69,8 +69,8 @@
 log4j.jarfile = ${pom.getDependencyPath('log4j')}
 derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
 derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
-core20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
-enhancer20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
+core20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
 xmlparser =
 
 # JDORI enhancer
Index: tck20/maven.xml
===================================================================
--- tck20/maven.xml	(revision 369167)
+++ tck20/maven.xml	(working copy)
@@ -27,7 +27,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="help">
@@ -614,7 +614,7 @@
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->
-        <pathelement location="${jdo.jdoapi.jarfile}"/>
+        <pathelement location="${jdo.api.jarfile}"/>
         <!-- JUnit jar file -->
         <pathelement location="${junit.jarfile}"/>
         <!-- Commons-logging jar file (for compiling pa/pc classes) -->
@@ -626,7 +626,7 @@
        <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->
-        <pathelement location="${jdo.jdoapi.jarfile}"/>
+        <pathelement location="${jdo.api.jarfile}"/>
         <!-- Commons logging jar file  -->
         <pathelement location="${logging.jarfile}"/>
         <pathelement location="${jta.jarfile}" />
Index: tck20/project.xml
===================================================================
--- tck20/project.xml	(revision 369167)
+++ tck20/project.xml	(working copy)
@@ -21,8 +21,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 Technology Compatibility Kit</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Object 2.0 (JDO) TCK</shortDescription>
     <description>The Java Data Objects 2.0 (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.
@@ -36,17 +37,17 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
Index: tck11/project.properties
===================================================================
--- tck11/project.properties	(revision 369167)
+++ tck11/project.properties	(working copy)
@@ -44,9 +44,9 @@
 jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
-jdo.jdori.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-ri')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
+jdo.jdori.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo1-ri')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
Index: tck11/maven.xml
===================================================================
--- tck11/maven.xml	(revision 369167)
+++ tck11/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: fostore20/project.properties
===================================================================
--- fostore20/project.properties	(revision 369167)
+++ fostore20/project.properties	(working copy)
@@ -21,12 +21,12 @@
 maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
-jdo.jdoenhancer.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
-jdo.jdoruntime.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-runtime')}
-jdo.jdoquery.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-query')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
+jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+jdo.jdoenhancer.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
+jdo.jdoruntime.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-runtime')}
+jdo.jdoquery.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-query')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
@@ -48,14 +48,14 @@
 jdo.enhancer.enhanced.dir = ${maven.build.dir}/test-classes
 jdo.enhancer.main = org.apache.jdo.enhancer.Main
 jdo.enhancer.options = -f -d "${jdo.enhancer.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
-jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoapi.jarfile}
-jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.api.jarfile}
+jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 jdo.annotationtest.main = org.apache.jdo.impl.enhancer.util.AnnotationTest
 jdo.annotationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
 jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 
 jdo.pcclasses.pc.classes= \
   org.apache.jdo.pc.PCArrays \
Index: fostore20/maven.xml
===================================================================
--- fostore20/maven.xml	(revision 369167)
+++ fostore20/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
@@ -76,7 +76,7 @@
         <ant target="runtest.list"
              dir="${basedir}/test" antfile="runtest.xml">
             <property name="testlist" value="${jdo.testlist}"/>
-            <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+            <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
             <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -101,7 +101,7 @@
              dir="${basedir}/test" antfile="runtest.xml">
             <property name="policyfile" value="${jdo.security.policy}"/>
             <property name="testlist" value="${jdo.testlist}"/>
-            <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+            <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
             <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -128,7 +128,7 @@
     <goal name="runtest.multiJVMtests" prereqs="pcclasses, testjar.build">
         <ant target="runtest.multiJVMtests" 
              dir="${basedir}/test" antfile="runtest.xml">
-            <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+            <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
             <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
@@ -320,7 +320,7 @@
 
     <goal name="fsuid2.build">
         <ant dir="${basedir}/test/fsuid2" target="build">
-            <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+            <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
             <property name="jdoenhancer" value="${jdo.jdoenhancer.jarfile}"/>
             <property name="logging" value="${logging.jarfile}"/>
Index: fostore20/project.xml
===================================================================
--- fostore20/project.xml	(revision 369167)
+++ fostore20/project.xml	(working copy)
@@ -24,7 +24,7 @@
     <!-- ============== -->
     <name>JDO2 Implementation (FOStore)</name>
     <artifactId>jdo2-fostore</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
@@ -36,40 +36,41 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-runtime</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-query</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-runtime</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo-btree</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jta</artifactId>
             <version>1.0.1B-rc2</version>
@@ -80,6 +81,11 @@
             <version>3.8.1</version>
         </dependency>
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
             <version>2.7.5</version>
Index: enhancer20/project.properties
===================================================================
--- enhancer20/project.properties	(revision 369167)
+++ enhancer20/project.properties	(working copy)
@@ -17,8 +17,8 @@
 maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-api')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
+jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
 logging.jarfile = ${pom.getDependencyPath('commons-logging')}
 xmlparser = 
 
@@ -33,5 +33,5 @@
 jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
 jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 
Index: enhancer20/maven.xml
===================================================================
--- enhancer20/maven.xml	(revision 369167)
+++ enhancer20/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: enhancer20/project.xml
===================================================================
--- enhancer20/project.xml	(revision 369167)
+++ enhancer20/project.xml	(working copy)
@@ -23,8 +23,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 Implementation (Enhancer)</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-enhancer</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Enhancer</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
@@ -36,12 +37,12 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
Index: runtime20/maven.xml
===================================================================
--- runtime20/maven.xml	(revision 369167)
+++ runtime20/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: runtime20/project.xml
===================================================================
--- runtime20/project.xml	(revision 369167)
+++ runtime20/project.xml	(working copy)
@@ -23,8 +23,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 Implementation (Runtime)</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-runtime</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Runtime</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
@@ -36,12 +37,12 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
Index: core20/maven.xml
===================================================================
--- core20/maven.xml	(revision 369167)
+++ core20/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: core20/project.xml
===================================================================
--- core20/project.xml	(revision 369167)
+++ core20/project.xml	(working copy)
@@ -23,8 +23,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 Implementation (Core)</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-core</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
Index: btree/maven.xml
===================================================================
--- btree/maven.xml	(revision 369167)
+++ btree/maven.xml	(working copy)
@@ -28,7 +28,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: btree/project.xml
===================================================================
--- btree/project.xml	(revision 369167)
+++ btree/project.xml	(working copy)
@@ -23,6 +23,7 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>Binary Tree for FOStore JDO</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo-btree</artifactId>
     <currentVersion>1.1</currentVersion>
     <package>org.netbeans.mdr</package>
Index: project.xml
===================================================================
--- project.xml	(revision 369167)
+++ project.xml	(working copy)
@@ -22,7 +22,6 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>Java Data Objects (JDO)</name>
-    <groupId>apache-jdo</groupId>
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org</url>
Index: query20/maven.xml
===================================================================
--- query20/maven.xml	(revision 369167)
+++ query20/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: query20/project.xml
===================================================================
--- query20/project.xml	(revision 369167)
+++ query20/project.xml	(working copy)
@@ -23,8 +23,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 Implementation (Query)</name>
+    <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-query</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
@@ -36,17 +37,17 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
+            <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-runtime</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
Index: api11/maven.xml
===================================================================
--- api11/maven.xml	(revision 369167)
+++ api11/maven.xml	(working copy)
@@ -27,7 +27,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: api11/project.xml
===================================================================
--- api11/project.xml	(revision 369167)
+++ api11/project.xml	(working copy)
@@ -17,7 +17,7 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../project.xml</extend>
+    <groupId>javax.jdo</groupId>
     <!-- ============== -->
     <!-- Identification -->
     <!-- ============== -->
Index: api20/maven.xml
===================================================================
--- api20/maven.xml	(revision 369167)
+++ api20/maven.xml	(working copy)
@@ -25,7 +25,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">
Index: api20/project.xml
===================================================================
--- api20/project.xml	(revision 369167)
+++ api20/project.xml	(working copy)
@@ -22,8 +22,9 @@
     <!-- Identification -->
     <!-- ============== -->
     <name>JDO2 API</name>
+    <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api</artifactId>
-    <currentVersion>2.0-SNAPSHOT</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) API</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
@@ -71,6 +72,12 @@
                     <include>javax/jdo/*.dtd</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>${basedir}/src/dtd</directory>
+                <includes>
+                    <include>javax/jdo/*.xsd</include>
+                </includes>
+            </resource>
         </resources>
     </build>
 </project>
Index: ri11/project.properties
===================================================================
--- ri11/project.properties	(revision 369167)
+++ ri11/project.properties	(working copy)
@@ -27,8 +27,8 @@
 org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.java
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
Index: ri11/maven.xml
===================================================================
--- ri11/maven.xml	(revision 369167)
+++ ri11/maven.xml	(working copy)
@@ -26,7 +26,7 @@
     <!-- ==================== -->
 
     <goal name="default">
-        <attainGoal name="jar:install-snapshot"/>
+        <attainGoal name="jar:install"/>
     </goal>
 
     <goal name="build">