Author: elserj
Date: Mon May 2 01:17:07 2016
New Revision: 1741917
URL: http://svn.apache.org/viewvc?rev=1741917&view=rev
Log:
Merge changes from trunk in branch VFS-2.1
Modified:
commons/proper/vfs/branches/VFS-2.1/ (props changed)
commons/proper/vfs/branches/VFS-2.1/RELEASE-NOTES.txt
commons/proper/vfs/branches/VFS-2.1/core/pom.xml
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
commons/proper/vfs/branches/VFS-2.1/pom.xml
Propchange: commons/proper/vfs/branches/VFS-2.1/
------------------------------------------------------------------------------
svn:mergeinfo = /commons/proper/vfs/trunk:1741893-1741916
Modified: commons/proper/vfs/branches/VFS-2.1/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS-2.1/RELEASE-NOTES.txt?rev=1741917&r1=1741916&r2=1741917&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS-2.1/RELEASE-NOTES.txt (original)
+++ commons/proper/vfs/branches/VFS-2.1/RELEASE-NOTES.txt Mon May 2 01:17:07
2016
@@ -41,6 +41,18 @@ o VFS-370: Add a FileExtensionSelector
o VFS-367: Add APIs FileObject isFile(), FileObject isFolder(), and FileName
isFile().
Fixed Bugs:
+o VFS-424: Fix StandardFileSystemManager class loading so it works in a OSGi
environment.
+o VFS-490: [vfsclassloader] Do not open folders with .jar extension. Adds
tests.
+o VFS-582: [tests] revert rename of getTestDirectoryFile to make test classes
more compatible for external providers.
+o VFS-480: Make startup of SoftRefsFileCache cleaner thread work and less
racy to avoid leaks.
+o VFS-549: Use File.seperator instead of getProperty("file.separator").
+o VFS-567: [ftp] Ignore exceptions while QUIT/disconnect. Thanks to Antonio
Petrelli.
+o VFS-572: [sftp] better documentation for knownhosts file option. Thanks to
Sandra Parsick.
+o VFS-574: Ensure FileOpertionProviders are closed. Adds some testcases.
+ The error code for missing operations exceptions corrected:
vfs.operation/operation-not-supported.error
+o VFS-279: [local] Avoid ClassCastException when replicating local files
while OnCall caching is active. Thanks to Didier Earith, Simon Legner.
+o VFS-297: [sftp] VSF fails to reuse FileSystem instances if
FileSystemOptions contain
+ an array as value. Reported for SFTP using identities. Thanks to
Kirill Safonov, Jimmy Praet.
o VFS-202: [http] Allow URLs responding with 405 to HEAD requests. Thanks to
Sergey Vladimirov, Simon Legner.
o VFS-490: [hdfs] Make OSGi package imports for hdfs resolution=optional.
Removed all scopes from dependency management.
@@ -109,7 +121,11 @@ o VFS-364: Check the href in the respon
Changes:
o VFS-530: [hdfs] Use stable Apache Hadoop 2.6 dependencies. Thanks to Dave
Marion.
+o VFS-601: Update Apache Commons Net from 3.3 to 3.4.
+o VFS-602: Update Apache Commons IO from 2.4 to 2.5.
+o VFS-579: Update Jsch from 0.1.51 to 0.1.53.
o VFS-542: Update Jsch from 0.1.50 to 0.1.51.
+o VFS-578: Update Apache Commons Compress from 1.9 to 1.10.
o VFS-541: Update Apache Commons Compress from 1.6 to 1.9.
o VFS-540: Update Apache Commons Logging from 1.1.3 to 1.2.
o VFS-539: Update Apache Commons Lang from 3.1 to 3.3.2.
@@ -126,7 +142,7 @@ o VFS-494: [SFTP] No support for SFTP s
o VFS-368: [SFTP] Documentation implies that "userDirIsRoot" defaults to
true. Thanks to Brendan Long.
o VFS-265: [FTP] Set user dir as root dir by default. Thanks to Scott
Bjerstedt.
o VFS-484: [SFTP] Update Jsch to 0.1.50 from 0.1.49.
-o VFS-507: Update to Apache Commons Collection 4.0 from 3.2.1 and use
generics.
+o VFS-507: Update to Apache Commons Collection 4.1 from 3.2.1 and use
generics.
o VFS-476: Update Apache Commons Logging to 1.1.3 from 1.1.2.
o VFS-475: Update Apache Commons Net to 3.3 from 3.2.
o VFS-506: [Tar][Bzip2] Update Apache Commons Compress to 1.6 from 1.5.
Modified: commons/proper/vfs/branches/VFS-2.1/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS-2.1/core/pom.xml?rev=1741917&r1=1741916&r2=1741917&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS-2.1/core/pom.xml (original)
+++ commons/proper/vfs/branches/VFS-2.1/core/pom.xml Mon May 2 01:17:07 2016
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -219,9 +216,7 @@
<phase>process-test-classes</phase>
<configuration>
<target>
- <move
- todir="${project.build.testOutputDirectory}/test-data/code"
- failonerror="false">
+ <move
todir="${project.build.testOutputDirectory}/test-data/code" failonerror="false">
<fileset dir="${project.build.testOutputDirectory}/code" />
</move>
</target>
Modified:
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1741917&r1=1741916&r2=1741917&view=diff
==============================================================================
---
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
(original)
+++
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
Mon May 2 01:17:07 2016
@@ -32,6 +32,11 @@ import org.apache.commons.vfs2.provider.
*/
public class Bzip2FileObject extends CompressedFileFileObject<Bzip2FileSystem>
{
+ /**
+ * Deprecated since 2.1.
+ *
+ * @deprecated Use {@link #Bzip2FileObject(AbstractFileName, FileObject,
Bzip2FileSystem)} instead.
+ */
@Deprecated
protected Bzip2FileObject(final AbstractFileName name, final FileObject
container, final CompressedFileFileSystem fs)
{
Modified:
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java?rev=1741917&r1=1741916&r2=1741917&view=diff
==============================================================================
---
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
(original)
+++
commons/proper/vfs/branches/VFS-2.1/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
Mon May 2 01:17:07 2016
@@ -31,6 +31,11 @@ import org.apache.commons.vfs2.provider.
*/
public class GzipFileObject extends CompressedFileFileObject<GzipFileSystem>
{
+ /**
+ * Deprecated since 2.1.
+ *
+ * @deprecated Use {@link #GzipFileObject(AbstractFileName, FileObject,
GzipFileSystem)} instead.
+ */
@Deprecated
protected GzipFileObject(final AbstractFileName name, final FileObject
container, final CompressedFileFileSystem fs) {
super(name, container, cast(fs));
Modified: commons/proper/vfs/branches/VFS-2.1/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/branches/VFS-2.1/pom.xml?rev=1741917&r1=1741916&r2=1741917&view=diff
==============================================================================
--- commons/proper/vfs/branches/VFS-2.1/pom.xml (original)
+++ commons/proper/vfs/branches/VFS-2.1/pom.xml Mon May 2 01:17:07 2016
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
@@ -48,9 +47,9 @@
</issueManagement>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/vfs/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/vfs/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/vfs/trunk/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/vfs/tags/commons-vfs2-project-2.1</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/vfs/tags/commons-vfs2-project-2.1</developerConnection>
+
<url>http://svn.apache.org/viewvc/commons/proper/vfs/tags/commons-vfs2-project-2.1</url>
</scm>
<developers>
@@ -159,7 +158,7 @@
<commons.release.2.version>2.0</commons.release.2.version>
<commons.release.2.name>commons-vfs-2.0</commons.release.2.name>
<commons.release.2.desc>(requires Java 1.5+)</commons.release.2.desc>
- <commons.release.2.binary.suffix></commons.release.2.binary.suffix>
+ <commons.release.2.binary.suffix />
<vfs.parent.dir>${basedir}</vfs.parent.dir>
<version.checkstyle>2.13</version.checkstyle>
