Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1098] upgrade to wagon 1.0-beta-5 and remove workaround that was needed previously 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@747621 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-02-25 00:11:47 +00:00
parent ae1a9ea059
commit 12c36ed347
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

@ -497,11 +497,6 @@ public class DefaultRepositoryProxyConnectors
return null;
}
// MRM-631 - the lightweight wagon does not reset these - remove if we switch to httpclient based wagon
String previousHttpProxyHost = System.getProperty( "http.proxyHost" );
String previousHttpProxyPort = System.getProperty( "http.proxyPort" );
String previousProxyExclusions = System.getProperty( "http.nonProxyHosts" );
File tmpMd5 = null;
File tmpSha1 = null;
File tmpResource = null;
@ -550,32 +545,6 @@ public class DefaultRepositoryProxyConnectors
try
{
wagon.disconnect();
// MRM-631 - the lightweight wagon does not reset these - remove if we switch to httpclient based wagon
if ( previousHttpProxyHost != null )
{
System.setProperty( "http.proxyHost", previousHttpProxyHost );
}
else
{
System.getProperties().remove( "http.proxyHost" );
}
if ( previousHttpProxyPort != null )
{
System.setProperty( "http.proxyPort", previousHttpProxyPort );
}
else
{
System.getProperties().remove( "http.proxyPort" );
}
if ( previousProxyExclusions != null )
{
System.setProperty( "http.nonProxyHosts", previousProxyExclusions );
}
else
{
System.getProperties().remove( "http.nonProxyHosts" );
}
}
catch ( ConnectionException e )
{

2
pom.xml
View File

@ -1093,7 +1093,7 @@
</dependencyManagement>
<properties>
<maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-4</wagon.version>
<wagon.version>1.0-beta-5</wagon.version>
<redback.version>1.2-SNAPSHOT</redback.version>
<jetty.version>6.1.6</jetty.version>
<binder.version>0.9</binder.version>