You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/11/02 23:09:48 UTC
svn commit: r470545 - in /db/jdo/trunk: ./ api11/ api20/ fostore20/ ri11/
runtime20/ tck11/ tck20/ util20/
Author: mbo
Date: Thu Nov 2 14:09:47 2006
New Revision: 470545
URL: http://svn.apache.org/viewvc?view=rev&rev=470545
Log:
JDO-440: Upgrade dependencies in JDO *11 and *20 projects
Modified:
db/jdo/trunk/api11/project.xml
db/jdo/trunk/api20/project.xml
db/jdo/trunk/fostore20/project.properties
db/jdo/trunk/fostore20/project.xml
db/jdo/trunk/project.properties
db/jdo/trunk/ri11/project.properties
db/jdo/trunk/ri11/project.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?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Thu Nov 2 14:09:47 2006
@@ -35,9 +35,9 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
</dependencies>
<!-- =================== -->
Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Thu Nov 2 14:09:47 2006
@@ -35,19 +35,19 @@
<!-- ============ -->
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
+ <version>1.3.03</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: db/jdo/trunk/fostore20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.properties?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/fostore20/project.properties (original)
+++ db/jdo/trunk/fostore20/project.properties Thu Nov 2 14:09:47 2006
@@ -33,7 +33,7 @@
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('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
+jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
xmlparser =
Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Thu Nov 2 14:09:47 2006
@@ -70,9 +70,9 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: db/jdo/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.properties?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/project.properties (original)
+++ db/jdo/trunk/project.properties Thu Nov 2 14:09:47 2006
@@ -14,6 +14,8 @@
# limitations under the License.
#
+maven.repo.remote = http://www.ibiblio.org/maven,https://maven-repository.dev.java.net/nonav/repository
+
# Make sure the compiled class still work with J2SE 1.3
maven.compile.source = 1.3
maven.compile.target = 1.3
Modified: db/jdo/trunk/ri11/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.properties?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/ri11/project.properties (original)
+++ db/jdo/trunk/ri11/project.properties Thu Nov 2 14:09:47 2006
@@ -34,7 +34,7 @@
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('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
+jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
xmlparser =
Modified: db/jdo/trunk/ri11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/ri11/project.xml (original)
+++ db/jdo/trunk/ri11/project.xml Thu Nov 2 14:09:47 2006
@@ -47,9 +47,9 @@
<version>3.8.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Thu Nov 2 14:09:47 2006
@@ -56,9 +56,9 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
</dependencies>
<!-- =================== -->
Modified: db/jdo/trunk/tck11/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.properties?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/tck11/project.properties (original)
+++ db/jdo/trunk/tck11/project.properties Thu Nov 2 14:09:47 2006
@@ -52,9 +52,9 @@
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('org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec')}
-springcore.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
-springbeans.jarfile = ${pom.getDependencyPath('springframework:spring-beans')}
+jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
+springcore.jarfile = ${pom.getDependencyPath('org.springframework:spring-core')}
+springbeans.jarfile = ${pom.getDependencyPath('org.springframework:spring-beans')}
logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
xmlparser =
Modified: db/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/tck11/project.xml (original)
+++ db/jdo/trunk/tck11/project.xml Thu Nov 2 14:09:47 2006
@@ -59,9 +59,9 @@
<version>3.8.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>javax.jdo</groupId>
@@ -84,14 +84,14 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.5</version>
+ <version>1.2.8</version>
</dependency>
</dependencies>
Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.properties?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Thu Nov 2 14:09:47 2006
@@ -20,7 +20,7 @@
jdo.tck.excludelist = ${basedir}/src/conf/exclude.list
# Maven repository
-maven.repo.remote = http://www.ibiblio.org/maven, http://www.jpox.org/downloads/maven
+maven.repo.remote = http://www.ibiblio.org/maven,http://www.jpox.org/downloads/maven,https://maven-repository.dev.java.net/nonav/repository
maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
# iut properties file
@@ -56,9 +56,9 @@
jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
bcel.jarfile = ${pom.getDependencyPath('bcel:bcel')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
-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')}
+jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
+springcore.jarfile = ${pom.getDependencyPath('org.springframework:spring-core')}
+springbeans.jarfile = ${pom.getDependencyPath('org.springframework:spring-beans')}
logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Thu Nov 2 14:09:47 2006
@@ -70,12 +70,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
+ <version>10.2.1.6</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>10.1.1.0</version>
+ <version>10.2.1.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.13</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -99,19 +99,19 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>transaction-api</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.8</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.5</version>
+ <version>1.2.8</version>
</dependency>
<!-- dependencies for connection pooling -->
<dependency>
@@ -129,8 +129,8 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.0</version>
- <url>http://prdownloads.sourceforge.net/c3p0/c3p0-0.9.0.bin.zip?use_mirror=unc</url>
+ <version>0.9.0.2</version>
+ <url>http://prdownloads.sourceforge.net/c3p0/c3p0-0.9.0.2.bin.zip</url>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -140,12 +140,12 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</dependency>
</dependencies>
<!-- =================== -->
Modified: db/jdo/trunk/util20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/project.xml?view=diff&rev=470545&r1=470544&r2=470545
==============================================================================
--- db/jdo/trunk/util20/project.xml (original)
+++ db/jdo/trunk/util20/project.xml Thu Nov 2 14:09:47 2006
@@ -46,9 +46,9 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>1.0.1</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>
<!-- =================== -->