diff options
3 files changed, 14 insertions, 3 deletions
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 75a262792..0e297f508 100644 --- 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 7df353dc0..4f7242889 100644 --- 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(); @@ -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> |