db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r422888 - in /db/jdo/trunk: api11/ api20/ enhancer20/ fostore20/ fostore20/test/ fostore20/test/conf/ model20/ query20/ ri11/ ri11/test/ ri11/test/conf/ runtime20/ tck11/ tck20/ util20/
Date Mon, 17 Jul 2006 21:42:53 GMT
Author: mbo
Date: Mon Jul 17 14:42:52 2006
New Revision: 422888

URL: http://svn.apache.org/viewvc?rev=422888&view=rev
Log:
JDO-393 JDO-360 upgrade dependencies:
- commons-logging to version 1.1
- jta to version geronimo-jta_1.0.1B_spec

Modified:
    db/jdo/trunk/api11/project.xml
    db/jdo/trunk/api20/project.xml
    db/jdo/trunk/enhancer20/project.properties
    db/jdo/trunk/enhancer20/project.xml
    db/jdo/trunk/fostore20/project.properties
    db/jdo/trunk/fostore20/project.xml
    db/jdo/trunk/fostore20/test/conf/JDO20Policy
    db/jdo/trunk/fostore20/test/runtest.xml
    db/jdo/trunk/model20/project.xml
    db/jdo/trunk/query20/project.xml
    db/jdo/trunk/ri11/project.properties
    db/jdo/trunk/ri11/project.xml
    db/jdo/trunk/ri11/test/conf/JDO11Policy
    db/jdo/trunk/ri11/test/runtest.xml
    db/jdo/trunk/runtime20/project.xml
    db/jdo/trunk/tck11/project.properties
    db/jdo/trunk/tck11/project.xml
    db/jdo/trunk/tck20/project.properties
    db/jdo/trunk/tck20/project.xml
    db/jdo/trunk/util20/project.xml

Modified: db/jdo/trunk/api11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api11/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Mon Jul 17 14:42:52 2006
@@ -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>
     <!-- =================== -->

Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/enhancer20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.properties?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.properties (original)
+++ db/jdo/trunk/enhancer20/project.properties Mon Jul 17 14:42:52 2006
@@ -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 

Modified: db/jdo/trunk/enhancer20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.xml (original)
+++ db/jdo/trunk/enhancer20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>
     <!-- =================== -->

Modified: db/jdo/trunk/fostore20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.properties?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.properties (original)
+++ db/jdo/trunk/fostore20/project.properties Mon Jul 17 14:42:52 2006
@@ -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

Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/fostore20/test/conf/JDO20Policy
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/conf/JDO20Policy?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/conf/JDO20Policy (original)
+++ db/jdo/trunk/fostore20/test/conf/JDO20Policy Mon Jul 17 14:42:52 2006
@@ -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";
        };

Modified: db/jdo/trunk/fostore20/test/runtest.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/runtest.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/runtest.xml (original)
+++ db/jdo/trunk/fostore20/test/runtest.xml Mon Jul 17 14:42:52 2006
@@ -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=""/>

Modified: db/jdo/trunk/model20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/model20/project.xml (original)
+++ db/jdo/trunk/model20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>
     <!-- =================== -->

Modified: db/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.xml (original)
+++ db/jdo/trunk/query20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/ri11/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.properties?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.properties (original)
+++ db/jdo/trunk/ri11/project.properties Mon Jul 17 14:42:52 2006
@@ -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

Modified: db/jdo/trunk/ri11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.xml (original)
+++ db/jdo/trunk/ri11/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/ri11/test/conf/JDO11Policy
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/test/conf/JDO11Policy?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/ri11/test/conf/JDO11Policy (original)
+++ db/jdo/trunk/ri11/test/conf/JDO11Policy Mon Jul 17 14:42:52 2006
@@ -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";
        };

Modified: db/jdo/trunk/ri11/test/runtest.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/test/runtest.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/ri11/test/runtest.xml (original)
+++ db/jdo/trunk/ri11/test/runtest.xml Mon Jul 17 14:42:52 2006
@@ -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"/>

Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>
     <!-- =================== -->

Modified: db/jdo/trunk/tck11/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.properties?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.properties (original)
+++ db/jdo/trunk/tck11/project.properties Mon Jul 17 14:42:52 2006
@@ -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

Modified: db/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.xml (original)
+++ db/jdo/trunk/tck11/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.properties?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Mon Jul 17 14:42:52 2006
@@ -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')}

Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>

Modified: db/jdo/trunk/util20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/project.xml?rev=422888&r1=422887&r2=422888&view=diff
==============================================================================
--- db/jdo/trunk/util20/project.xml (original)
+++ db/jdo/trunk/util20/project.xml Mon Jul 17 14:42:52 2006
@@ -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>
     <!-- =================== -->



Mime
View raw message