Author: fmeschbe
Date: Thu Aug 19 11:16:30 2010
New Revision: 987128
URL: http://svn.apache.org/viewvc?rev=987128&view=rev
Log:
SLING-952 Applied the patch (thanks Federico Paparoni for providing it)
Modified:
sling/trunk/contrib/extensions/dojo/pom.xml
Modified: sling/trunk/contrib/extensions/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/dojo/pom.xml?rev=987128&r1=987127&r2=987128&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/dojo/pom.xml (original)
+++ sling/trunk/contrib/extensions/dojo/pom.xml Thu Aug 19 11:16:30 2010
@@ -71,6 +71,22 @@
<phase>process-resources</phase>
<configuration>
<tasks>
+ <property name="useProxy"
value="${settings.activeProxy}" />
+ <condition property="testProxySetting">
+ <equals arg1="${settings.activeProxy}"
arg2="$${settings.activeProxy}"/>
+ </condition>
+ <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
+ <if>
+ <isfalse value="${testProxySetting}"/>
+ <then>
+ <echo message="Using proxy" />
+ <taskdef name="setproxy"
classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+ <setproxy
proxyhost="${settings.activeProxy.host}"
proxyport="${settings.activeProxy.port}"
+
proxypassword="${settings.activeProxy.password}"
proxyuser="${settings.activeProxy.username}"
+
nonproxyhosts="${settings.activeProxy.nonProxyHosts}" />
+ </then>
+ </if>
+
<mkdir dir="${dojo.download.dir}" />
<mkdir dir="${dojo.target}" />
<get
@@ -96,6 +112,24 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
