Repository: ant-ivy Updated Branches: refs/heads/master 45046b5fd -> d2e4494b4
Upgrade to Apache Commons VFS version 2 (and watch VFS-360) Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d2e4494b Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d2e4494b Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d2e4494b Branch: refs/heads/master Commit: d2e4494b4719f956babeae65c0f6ffd340a5e234 Parents: 45046b5 Author: Gintas Grigelionis <[email protected]> Authored: Sat Sep 16 20:56:56 2017 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Sat Sep 16 20:56:56 2017 +0200 ---------------------------------------------------------------------- ivy.xml | 2 +- .../plugins/repository/vfs/VfsRepository.java | 12 ++++++------ .../ivy/plugins/repository/vfs/VfsResource.java | 10 +++++----- .../ivy/plugins/repository/vfs/ivy_vfs.xml | 20 ++++++++++---------- .../plugins/repository/vfs/VfsTestHelper.java | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d2e4494b/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index f38c1e5..c6fe7b7 100644 --- a/ivy.xml +++ b/ivy.xml @@ -46,7 +46,7 @@ <dependency org="org.apache.ant" name="ant" rev="1.9.9" conf="default,ant"/> <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.3" conf="default,httpclient->runtime,master"/> <dependency org="oro" name="oro" rev="2.0.8" conf="default,oro"/> - <dependency org="commons-vfs" name="commons-vfs" rev="1.0" conf="default,vfs"/> + <dependency org="org.apache.commons" name="commons-vfs2" rev="2.1" conf="default,vfs"/> <dependency org="com.jcraft" name="jsch" rev="0.1.54" conf="default,sftp"/> <dependency org="com.jcraft" name="jsch.agentproxy" rev="0.0.9" conf="default,sftp"/> <dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="0.0.9" conf="default,sftp"/> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d2e4494b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java index 5325078..691a998 100644 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java @@ -25,12 +25,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.vfs.FileContent; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.commons.vfs.FileType; -import org.apache.commons.vfs.impl.StandardFileSystemManager; +import org.apache.commons.vfs2.FileContent; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.impl.StandardFileSystemManager; import org.apache.ivy.core.settings.TimeoutConstraint; import org.apache.ivy.plugins.repository.AbstractRepository; import org.apache.ivy.plugins.repository.RepositoryCopyProgressListener; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d2e4494b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java index bf22346..8fcc302 100644 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java @@ -22,11 +22,11 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.vfs.FileContent; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.commons.vfs.FileType; +import org.apache.commons.vfs2.FileContent; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.FileType; import org.apache.ivy.plugins.repository.Resource; import org.apache.ivy.plugins.resolver.VfsResolver; import org.apache.ivy.util.Message; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d2e4494b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml index 347d73e..9e52784 100644 --- a/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml +++ b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml @@ -14,18 +14,19 @@ "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. + under the License. --> -<!-- For all intents and purposes this is the providers.xml file included - in the jakarta-vfs-common distribution with the res and tmp schemas removed. - --> - <providers> - <default-provider class-name="org.apache.commons.vfs.provider.url.UrlFileProvider"> +<!-- + For all intents and purposes this is the providers.xml file included + in the jakarta-vfs-common distribution with the res and tmp schemas removed. +--> +<providers> + <default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider"> </default-provider> - <provider class-name="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider"> <scheme name="file"/> </provider> - <provider class-name="org.apache.commons.vfs.provider.ftp.FtpFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider"> <scheme name="ftp"/> <if-available class-name="org.apache.commons.net.ftp.FTPFile"/> </provider> @@ -41,8 +42,7 @@ <if-available class-name="org.apache.commons.httpclient.HttpClient"/> </provider> --> - - <provider class-name="org.apache.commons.vfs.provider.sftp.SftpFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider"> <scheme name="sftp"/> <if-available class-name="javax.crypto.Cipher"/> <if-available class-name="com.jcraft.jsch.JSch"/> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d2e4494b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java index a8314e4..8d0f4f5 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.impl.StandardFileSystemManager; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.impl.StandardFileSystemManager; import org.apache.ivy.Ivy; import org.apache.ivy.util.FileUtil;
