Author: ronvoe122
Date: 2008-05-21 14:21:28-0700
New Revision: 10584
Modified:
trunk/INSTALL
trunk/build/build-torque.xml
Log:
Raise the required maven version to v1.1.
This allows us to remove a hack in build-torque.xml, which was necessary to support the old ant-version included in maven v1.02.
Modified: trunk/INSTALL
Url: http://scarab.tigris.org/source/browse/scarab/trunk/INSTALL?view=diff&rev=10584&p1=trunk/INSTALL&p2=trunk/INSTALL&r1=10583&r2=10584
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL 2008-05-21 14:21:28-0700
@@ -7,11 +7,11 @@
Before we get started, please ensure that you either have installed
- Maven-1.0 or newer
+ Maven-1.1
or if you prefer ant, ensure, that you have installed
- Ant 1.5.x or newer
+ Ant 1.6.5 or newer
on your system.
Modified: trunk/build/build-torque.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build-torque.xml?view=diff&rev=10584&p1=trunk/build/build-torque.xml&p2=trunk/build/build-torque.xml&r1=10583&r2=10584
==============================================================================
--- trunk/build/build-torque.xml (original)
+++ trunk/build/build-torque.xml 2008-05-21 14:21:28-0700
@@ -61,12 +61,6 @@
any drivers. In the maven-built versions, ${torque.jar} is in the working
directory.
-->
-
- <!-- customized for scarab!:
- commented out the condition elements,
- because they are not supported by the ant version
- which is built into maven 1.02
-
<condition property="valid.override.directory"
value="${torque.override.dir}">
<isset property="torque.override.dir" />
@@ -77,8 +71,6 @@
<isset property="torque.override.dir" />
</not>
</condition>
- -->
- <property name="valid.override.directory" value="${torque.lib.dir}"/>
<path id="torque-classpath">
<pathelement location="${valid.override.directory}/templates"/>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.