henning 2004/08/16 15:32:25
Modified: . Tag: TORQUE_3_1_BRANCH project.xml
src/java/org/apache/torque Tag: TORQUE_3_1_BRANCH
TorqueInstance.java
src/maven-plugin Tag: TORQUE_3_1_BRANCH project.xml
Log:
Make Torque build with commons-configuration 1.0-rc1
Revision Changes Path
No revision
No revision
1.103.2.8 +4 -4 db-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.103.2.7
retrieving revision 1.103.2.8
diff -u -r1.103.2.7 -r1.103.2.8
--- project.xml 14 Aug 2004 12:57:40 -0000 1.103.2.7
+++ project.xml 16 Aug 2004 22:32:24 -0000 1.103.2.8
@@ -219,12 +219,12 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>2.1</version>
+ <version>3.0</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev-3.20030607.194155</version>
+ <version>1.0-rc1</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -234,12 +234,12 @@
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0.1</version>
+ <version>2.0</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>1.0.4</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
No revision
No revision
1.5.2.3 +3 -2 db-torque/src/java/org/apache/torque/TorqueInstance.java
Index: TorqueInstance.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueInstance.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- TorqueInstance.java 20 May 2004 04:35:16 -0000 1.5.2.2
+++ TorqueInstance.java 16 Aug 2004 22:32:24 -0000 1.5.2.3
@@ -27,6 +27,7 @@
import java.util.Map;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.logging.Log;
@@ -303,7 +304,7 @@
log.debug("Config Object is " + conf);
init(conf);
}
- catch (IOException e)
+ catch (ConfigurationException e)
{
throw new TorqueException(e);
}
No revision
No revision
1.12.2.5 +4 -4 db-torque/src/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- project.xml 14 Aug 2004 13:35:34 -0000 1.12.2.4
+++ project.xml 16 Aug 2004 22:32:25 -0000 1.12.2.5
@@ -68,11 +68,11 @@
<dependencies>
<dependency>
<id>commons-collections</id>
- <version>2.1</version>
+ <version>3.0</version>
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0-dev-3.20030607.194155</version>
+ <version>1.0-rc1</version>
</dependency>
<dependency>
<id>commons-dbcp</id>
@@ -80,11 +80,11 @@
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0.1</version>
+ <version>2.0</version>
</dependency>
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
<id>log4j</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
