fix toString and upgrade httpclient version

diff --git a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
index 75a2627927fa020bfd53139e5b2d5bde650cd9ae..0e297f508dc56edf1ea3e45732330e4df76fd112 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
+++ b/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
@@ -153,4 +153,15 @@ public class WagonFactoryRequest
         result = 31 * result + ( userAgent != null ? userAgent.hashCode() : 0 );
         return result;
     }
+
+    @Override
+    public String toString()
+    {
+        return "WagonFactoryRequest{" +
+            "protocol='" + protocol + '\'' +
+            ", headers=" + headers +
+            ", userAgent='" + userAgent + '\'' +
+            ", networkProxy=" + networkProxy +
+            '}';
+    }
 }

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
index 7df353dc05cf127a9750417cef1b3246b1fba8ab..4f72428891c4e0442b251618b05f4464ae6016f3 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
@@ -189,7 +189,7 @@ public class NetworkProxy
         sb.append( ", host='" ).append( host ).append( '\'' );
         sb.append( ", port=" ).append( port );
         sb.append( ", username='" ).append( username ).append( '\'' );
-        sb.append( ", password='" ).append( password ).append( '\'' );
+        //sb.append( ", password='" ).append( password ).append( '\'' );
         sb.append( ", useNtlm=" ).append( useNtlm );
         sb.append( '}' );
         return sb.toString();

diff --git a/pom.xml b/pom.xml
index d6ae063e4325db0423fcdb4237344f0d126a0532..2b94fea5f69ee62c3dbcb148cb445354070b3fc3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -87,8 +87,8 @@
 
     <cxfVersion>2.6.15</cxfVersion>
     <derbyVersion>10.10.1.1</derbyVersion>
-    <httpclient.version>4.3.5</httpclient.version>
-    <httpclient.core.version>4.3.2</httpclient.core.version>
+    <httpclient.version>4.3.6</httpclient.version>
+    <httpclient.core.version>4.4</httpclient.core.version>
     <javaxMailVersion>1.4</javaxMailVersion>
     <jettyVersion>8.1.14.v20131031</jettyVersion>
     <guava.version>16.0.1</guava.version>