fix default user agent value, ensure ssl test passed because of outdated self signed certificate
Signed-off-by: olivier lamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/49570bfa Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/49570bfa Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/49570bfa Branch: refs/heads/feature/webdav_upgrade Commit: 49570bfa31e1409eb2ee645a48e6ef740d19923b Parents: 749a01a Author: olivier lamy <[email protected]> Authored: Tue Jul 4 15:00:55 2017 +1000 Committer: olivier lamy <[email protected]> Committed: Tue Jul 4 15:00:55 2017 +1000 ---------------------------------------------------------------------- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 12 ++++++++++++ .../maven/wagon/providers/webdav/WebDavWagon.java | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/49570bfa/wagon-providers/wagon-webdav-jackrabbit/pom.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml index 4a31f0e..8b64fb4 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml @@ -147,6 +147,18 @@ under the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <maven.wagon.http.ssl.insecure>true</maven.wagon.http.ssl.insecure> + <maven.wagon.http.ssl.ignore.validity.dates>true</maven.wagon.http.ssl.ignore.validity.dates> + <org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime> + <org.slf4j.simpleLogger.dateTimeFormat>yyyy-MM-dd'T'HH:mm:ss.SSS</org.slf4j.simpleLogger.dateTimeFormat> + </systemPropertyVariables> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/49570bfa/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java index 0d91ad6..ad1fa71 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java @@ -110,7 +110,7 @@ public class WebDavWagon props.load( is ); is.close(); } - catch ( IOException ignore ) + catch ( Exception ignore ) { // ignore } @@ -123,10 +123,11 @@ public class WebDavWagon protected String getUserAgent( HttpUriRequest method ) { String userAgent = super.getUserAgent( method ); - if (userAgent == null) + if ( userAgent == null ) { return DEFAULT_USER_AGENT; } + return userAgent; } /**
