You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/01/18 12:09:21 UTC
[2/2] archiva git commit: fix toString and upgrade httpclient version
fix toString and upgrade httpclient version
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/66a67966
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/66a67966
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/66a67966
Branch: refs/heads/master
Commit: 66a67966e6d7fc59beb4bd24bc0931b37fafb041
Parents: b141b83
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Jan 16 14:57:28 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Jan 16 14:57:28 2015 +1100
----------------------------------------------------------------------
.../apache/archiva/proxy/common/WagonFactoryRequest.java | 11 +++++++++++
.../apache/archiva/admin/model/beans/NetworkProxy.java | 2 +-
pom.xml | 4 ++--
3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/66a67966/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
----------------------------------------------------------------------
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 75a2627..0e297f5 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 +
+ '}';
+ }
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/66a67966/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/NetworkProxy.java
----------------------------------------------------------------------
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 7df353d..4f72428 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();
http://git-wip-us.apache.org/repos/asf/archiva/blob/66a67966/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6ae063..2b94fea 100644
--- 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>