Index: util20/project.xml
===================================================================
--- util20/project.xml	(Revision 422773)
+++ util20/project.xml	(Arbeitskopie)
@@ -36,8 +36,9 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
     </dependencies>
     <!-- =================== -->
Index: tck20/project.properties
===================================================================
--- tck20/project.properties	(Revision 422773)
+++ tck20/project.properties	(Arbeitskopie)
@@ -56,10 +56,10 @@
 jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
 bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
-jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
+jta.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
 springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
 springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
 log4j.jarfile = ${pom.getDependencyPath('log4j')}
 derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
 derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
Index: tck20/project.xml
===================================================================
--- tck20/project.xml	(Revision 422773)
+++ tck20/project.xml	(Arbeitskopie)
@@ -96,12 +96,12 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>springframework</groupId>
Index: tck11/project.properties
===================================================================
--- tck11/project.properties	(Revision 422773)
+++ tck11/project.properties	(Arbeitskopie)
@@ -52,10 +52,10 @@
 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')}
+jta.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
 springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
 springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
 xmlparser =
 
 # JDORI enhancer
Index: tck11/project.xml
===================================================================
--- tck11/project.xml	(Revision 422773)
+++ tck11/project.xml	(Arbeitskopie)
@@ -59,9 +59,9 @@
             <version>3.8.1</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>javax.jdo</groupId>
@@ -79,8 +79,9 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>springframework</groupId>
Index: fostore20/test/runtest.xml
===================================================================
--- fostore20/test/runtest.xml	(Revision 422773)
+++ fostore20/test/runtest.xml	(Arbeitskopie)
@@ -57,7 +57,7 @@
 
 <!-- external libs -->
 <property name="junit" value="${user.home}/.maven/repository/junit/jars/junit-3.8.1.jar"/>
-<property name="jta" value="${user.home}/.maven/repository/geronimo-spec/jars/geronimo-spec-jta-1.0.1B-rc2.jar"/>
+<property name="jta" value="${user.home}/.maven/repository/org.apache.geronimo.specs/jars/geronimo-jta_1.0.1B_spec-1.0.jar"/>
 <property name="antlr" value="${user.home}/.maven/repository/antlr/jars/antlr-2.7.3.jar"/>
 <property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.1.jar"/>
 <property name="xmlparser" value=""/>
Index: fostore20/test/conf/JDO20Policy
===================================================================
--- fostore20/test/conf/JDO20Policy	(Revision 422773)
+++ fostore20/test/conf/JDO20Policy	(Arbeitskopie)
@@ -174,6 +174,8 @@
        };
 
 grant codeBase "file:${logging}" {
+	// Allow apache commons logging classes to read system properties
+	permission java.util.PropertyPermission "org.apache.commons.logging.LogFactory.HashtableImpl", "read";
 	// Allow the apache commons logging classes to read logging properties files
 	permission java.io.FilePermission "${jdoritests}", "read";
        };
Index: fostore20/project.properties
===================================================================
--- fostore20/project.properties	(Revision 422773)
+++ fostore20/project.properties	(Arbeitskopie)
@@ -33,8 +33,8 @@
 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')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+jta.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
 xmlparser = 
 
 # jndi dependencies
Index: fostore20/project.xml
===================================================================
--- fostore20/project.xml	(Revision 422773)
+++ fostore20/project.xml	(Arbeitskopie)
@@ -70,9 +70,9 @@
             <version>1.1</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>
Index: runtime20/project.xml
===================================================================
--- runtime20/project.xml	(Revision 422773)
+++ runtime20/project.xml	(Arbeitskopie)
@@ -51,13 +51,14 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
     </dependencies>
     <!-- =================== -->
Index: enhancer20/project.properties
===================================================================
--- enhancer20/project.properties	(Revision 422773)
+++ enhancer20/project.properties	(Arbeitskopie)
@@ -20,7 +20,7 @@
 jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
 jdo.jdoutil.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
 jdo.jdomodel.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
 xmlparser = 
 
 # enhancer 
Index: enhancer20/project.xml
===================================================================
--- enhancer20/project.xml	(Revision 422773)
+++ enhancer20/project.xml	(Arbeitskopie)
@@ -51,8 +51,9 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
     </dependencies>
     <!-- =================== -->
Index: model20/project.xml
===================================================================
--- model20/project.xml	(Revision 422773)
+++ model20/project.xml	(Arbeitskopie)
@@ -41,8 +41,9 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
     </dependencies>
     <!-- =================== -->
Index: query20/project.xml
===================================================================
--- query20/project.xml	(Revision 422773)
+++ query20/project.xml	(Arbeitskopie)
@@ -56,8 +56,9 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>
Index: api11/project.xml
===================================================================
--- api11/project.xml	(Revision 422773)
+++ api11/project.xml	(Arbeitskopie)
@@ -35,9 +35,9 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version> 
         </dependency>
     </dependencies>
     <!-- =================== -->
Index: api20/project.xml
===================================================================
--- api20/project.xml	(Revision 422773)
+++ api20/project.xml	(Arbeitskopie)
@@ -35,9 +35,9 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
Index: ri11/test/runtest.xml
===================================================================
--- ri11/test/runtest.xml	(Revision 422773)
+++ ri11/test/runtest.xml	(Arbeitskopie)
@@ -52,9 +52,9 @@
 
 <!-- external libs -->
 <property name="junit" value="${user.home}/.maven/repository/junit/jars/junit-3.8.1.jar"/>
-<property name="jta" value="${user.home}/.maven/repository/geronimo-spec/jars/geronimo-spec-jta-1.0.1B-rc2.jar"/>
+<property name="jta" value="${user.home}/.maven/repository/org.apache.geronimo.specs/jars/geronimo-jta_1.0.1B_spec-1.0.jar"/>
 <property name="antlr" value="${user.home}/.maven/repository/antlr/jars/antlr-2.7.3.jar"/>
-<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar"/>
+<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.1.jar"/>
 <property name="xmlparser" value=""/>
 <!-- jndi implementation jars, needs to be consistent with jndi.properties -->
 <property name="jndi" value="${basedir}/fscontext.jar:${basedir}/providerutil.jar"/>
Index: ri11/test/conf/JDO11Policy
===================================================================
--- ri11/test/conf/JDO11Policy	(Revision 422773)
+++ ri11/test/conf/JDO11Policy	(Arbeitskopie)
@@ -122,6 +122,8 @@
        };
 
 grant codeBase "file:${logging}" {
+	// Allow apache commons logging classes to read system properties
+	permission java.util.PropertyPermission "org.apache.commons.logging.LogFactory.HashtableImpl", "read";
 	// Allow the apache commons logging classes to read logging properties files
 	permission java.io.FilePermission "${jdoritests}", "read";
        };
Index: ri11/project.properties
===================================================================
--- ri11/project.properties	(Revision 422773)
+++ ri11/project.properties	(Arbeitskopie)
@@ -34,8 +34,8 @@
 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')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+jta.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
 xmlparser =
 
 # jndi dependencies
Index: ri11/project.xml
===================================================================
--- ri11/project.xml	(Revision 422773)
+++ ri11/project.xml	(Arbeitskopie)
@@ -47,13 +47,14 @@
             <version>3.8.1</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>1.0.1B-rc2</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
-            <version>1.0.4</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>javax.jdo</groupId>