Repository: maven-wagon Updated Branches: refs/heads/feature/webdav_upgrade 2a129274c -> 3856f0fac
use the usual components.xml 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/57b0c930 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/57b0c930 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/57b0c930 Branch: refs/heads/feature/webdav_upgrade Commit: 57b0c9306ee5f40444a36d1f4f0424bb2769a0b4 Parents: 2a12927 Author: olivier lamy <[email protected]> Authored: Tue Jul 4 14:42:00 2017 +1000 Committer: olivier lamy <[email protected]> Committed: Tue Jul 4 14:42:00 2017 +1000 ---------------------------------------------------------------------- pom.xml | 2 + wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- .../webdav/client/methods/XmlRequestEntity.java | 1 - .../wagon/providers/webdav/WebDavWagon.java | 9 ++- .../resources/META-INF/plexus/components.xml | 63 ++++++++++++++++++++ .../META-INF/plexus/default-bindings.xml | 63 -------------------- 6 files changed, 70 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 48aff04..b3f5cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -332,6 +332,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.20</version> <configuration> <forkedProcessTimeoutInSeconds>800</forkedProcessTimeoutInSeconds> <systemPropertyVariables> @@ -357,6 +358,7 @@ under the License. <exclude>src/main/resources/ssh-keys/**</exclude> <exclude>src/test/ssh-keys/**</exclude> <exclude>.repository/**</exclude><!-- for CI --> + <exclude>out/**</exclude> <!-- for intellij --> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/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 d34bfe9..4a31f0e 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml @@ -75,7 +75,7 @@ under the License. <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> <!-- required for commons-httpclient:commons-httpclient --> + <dependency> <!-- required for org.apache.httpcomponents:httpclient --> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <scope>runtime</scope> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java index 24d44c6..c317978 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.webdav.client.methods; * under the License. */ -import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/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 5dc0759..aed4fc3 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 @@ -216,7 +216,7 @@ public class WebDavWagon if ( method.succeeded( closeableHttpResponse ) ) { - MultiStatus multiStatus = method.getResponseBodyAsMultiStatus(closeableHttpResponse); + MultiStatus multiStatus = method.getResponseBodyAsMultiStatus( closeableHttpResponse ); MultiStatusResponse response = multiStatus.getResponses()[0]; DavPropertySet propertySet = response.getProperties( HttpStatus.SC_OK ); DavProperty<?> property = propertySet.get( DavConstants.PROPERTY_RESOURCETYPE ); @@ -263,10 +263,10 @@ public class WebDavWagon method = new HttpPropfind( url, nameSet, DavConstants.DEPTH_1 ); closeableHttpResponse = execute( method ); - if ( method.succeeded(closeableHttpResponse) ) + if ( method.succeeded( closeableHttpResponse ) ) { - ArrayList<String> dirs = new ArrayList<String>(); - MultiStatus multiStatus = method.getResponseBodyAsMultiStatus(closeableHttpResponse); + ArrayList<String> dirs = new ArrayList<>(); + MultiStatus multiStatus = method.getResponseBodyAsMultiStatus( closeableHttpResponse ); for ( int i = 0; i < multiStatus.getResponses().length; i++ ) { MultiStatusResponse response = multiStatus.getResponses()[i]; @@ -278,7 +278,6 @@ public class WebDavWagon { // by design jackrabbit WebDAV sticks parent directory as the first entry // so we need to ignore this entry - // http://www.nabble.com/Extra-entry-in-get-file-list-with-jackrabbit-webdav-td21262786.html // http://www.webdav.org/specs/rfc4918.html#rfc.section.9.1 continue; } http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml new file mode 100644 index 0000000..c2a53db --- /dev/null +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/components.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<component-set> + <components> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>davs</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav+http</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav+https</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a webdav remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + </components> +</component-set> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/57b0c930/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml deleted file mode 100644 index c2a53db..0000000 --- a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<component-set> - <components> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>davs</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav+http</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a WebDAV remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav+https</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - </components> -</component-set>
