Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not set proxy if maven.proxy.host is null or empty.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@155562 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-02-26 18:50:51 +00:00
parent cdd6ae204d
commit d220bf37ae
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ant/src/plugin-resources/templates/build.jelly
View File

@ -346,11 +346,13 @@
unless="noget"> unless="noget">
<x:comment>Proxy settings works only with a JDK 1.2 and higher.</x:comment> <x:comment>Proxy settings works only with a JDK 1.2 and higher.</x:comment>
<j:if test="${maven.proxy.host != null and !maven.proxy.host.trim().equals('')}">
<setproxy <setproxy
proxyhost="${maven.proxy.host}" proxyhost="${maven.proxy.host}"
proxyport="${maven.proxy.port}" proxyport="${maven.proxy.port}"
proxyuser="${maven.proxy.username}" proxyuser="${maven.proxy.username}"
proxypassword="${maven.proxy.password}"/> proxypassword="${maven.proxy.password}"/>
</j:if>
<j:forEach var="lib" items="${pom.artifacts}"> <j:forEach var="lib" items="${pom.artifacts}">
<maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}" path="${lib.path}" separator="/"/> <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}" path="${lib.path}" separator="/"/>
@ -371,7 +373,7 @@
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<maven:makeRelativePath var="relativePath" basedir="${basedir}" path="${lib.path}" separator="/"/> <maven:makeRelativePath var="relativePath" basedir="${basedir}" path="${lib.path}" separator="/"/>
<copy todir="$${libdir}" file="${relativePath}"/> <copy todir="$${libdir}" file="${relativePath}"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</j:forEach> </j:forEach>

4
ant/xdocs/changes.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
/* /*
* Copyright 2001-2004 The Apache Software Foundation. * Copyright 2001-2004 The Apache Software Foundation.
@ -17,17 +16,16 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<document> <document>
<properties> <properties>
<title>Ant plugin changes</title> <title>Ant plugin changes</title>
<author email="dion@multitask.com.au">dIon Gillard</author> <author email="dion@multitask.com.au">dIon Gillard</author>
</properties> </properties>
<body> <body>
<release version="1.9" date=""> <release version="1.9" date="">
<action dev="epugh" type="add" issue="MPANT-7">Obey jar override and not attempt to download relative jars.</action> <action dev="epugh" type="add" issue="MPANT-7">Obey jar override and not attempt to download relative jars.</action>
<action dev="aheritier" type="add" issue="MPANT-20" due-to="Dennis Lundberg">Allow URL substitutions in generated build.xml files.</action> <action dev="aheritier" type="add" issue="MPANT-20" due-to="Dennis Lundberg">Allow URL substitutions in generated build.xml files.</action>
<action dev="aheritier" type="fix">Do not set proxy if maven.proxy.host is null or empty.</action>
</release> </release>
<release version="1.8.1" date="2004-08-20"> <release version="1.8.1" date="2004-08-20">
<action dev="carlos" type="fix" issue="MPANT-16">Use relative paths in test resources filesets.</action> <action dev="carlos" type="fix" issue="MPANT-16">Use relative paths in test resources filesets.</action>