Author: brett
Date: Wed Feb 25 00:11:47 2009
New Revision: 747621
URL: http://svn.apache.org/viewvc?rev=747621&view=rev
Log:
[MRM-1098] upgrade to wagon 1.0-beta-5 and remove workaround that was needed
previously
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=747621&r1=747620&r2=747621&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Wed Feb 25 00:11:47 2009
@@ -497,11 +497,6 @@
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 @@
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 )
{
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=747621&r1=747620&r2=747621&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Feb 25 00:11:47 2009
@@ -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>
