git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@332494 13f79535-47bb-0310-9956-ffa450edef68master
@@ -60,7 +60,7 @@ Changes that could break older environments: | |||||
java.net.useSystemProxies to true, which gives it automatic use of the local | java.net.useSystemProxies to true, which gives it automatic use of the local | ||||
IE (Windows) or Gnome2 (Unix/Linux) proxy settings. This may break any build | IE (Windows) or Gnome2 (Unix/Linux) proxy settings. This may break any build | ||||
file that somehow relied on content outside the firewall being unreachable: | file that somehow relied on content outside the firewall being unreachable: | ||||
use the -noproxy command-line option to disable this new feature, or set | |||||
use the -noproxy command-line option to disable this new feature. | |||||
@@ -20,9 +20,11 @@ | |||||
-Ddest=system ant lib dir ${ant.home}/lib --Default-- | -Ddest=system ant lib dir ${ant.home}/lib --Default-- | ||||
-Ddest=optional optional dir ${ant.home}/lib/optional (for Ant developers) | -Ddest=optional optional dir ${ant.home}/lib/optional (for Ant developers) | ||||
You may also need to set proxy settings. This can be done by | |||||
setting the JVM proxy values in the ANT_OPTS environment | |||||
variables. | |||||
You may also need to set proxy settings. On Java1.5, Ant tries to get | |||||
this from the OS, unless you use the -noproxy option. | |||||
Proxies can be configured manually setting the JVM proxy values in the | |||||
ANT_OPTS environment variable. | |||||
For example, to set the proxy up in the tcsh shell, the command would be | For example, to set the proxy up in the tcsh shell, the command would be | ||||
something like: | something like: | ||||
@@ -32,7 +34,8 @@ | |||||
For bash: | For bash: | ||||
export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" | export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" | ||||
For Windows, set the environment variable in the appropriate dialog box | For Windows, set the environment variable in the appropriate dialog box | ||||
and open a new console. | |||||
and open a new console. or, by hand | |||||
set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 | |||||
</description> | </description> | ||||
<!-- Give user a chance to override without editing this file | <!-- Give user a chance to override without editing this file | ||||
@@ -1,7 +1,7 @@ | |||||
#this file declares the libraries for use in | #this file declares the libraries for use in | ||||
#a given release of the components | #a given release of the components | ||||
m2.version=2.0-alpha-3 | |||||
m2.version=2.0 | |||||
m2.url=http://ibiblio.org/maven2/ | m2.url=http://ibiblio.org/maven2/ | ||||
m2.artifact-name=maven-artifact-ant | m2.artifact-name=maven-artifact-ant | ||||
m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar | m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar | ||||
@@ -23,13 +23,13 @@ jdepend.version=2.7 | |||||
junit.version=3.8.1 | junit.version=3.8.1 | ||||
jsch.version=0.1.17 | jsch.version=0.1.17 | ||||
jython.version=3.8.1 | jython.version=3.8.1 | ||||
log4j.version=1.2.8 | |||||
log4j.version=1.2.12 | |||||
#rhino.version=1.5R5 | #rhino.version=1.5R5 | ||||
oro.version=2.0.8 | oro.version=2.0.8 | ||||
regexp.version=1.3 | regexp.version=1.3 | ||||
which.version=1.0 | which.version=1.0 | ||||
xerces.version=2.6.2 | xerces.version=2.6.2 | ||||
xalan.version=2.5.1 | |||||
xalan.version=2.7.0 | |||||
xml-resolver.version=1.1 | xml-resolver.version=1.1 | ||||
#paired | #paired | ||||