Merge trunk into branches/VFS-2.1
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs/branches/VFS-2.1@1742210 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 7ca2c70..3bb7b2f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -190,6 +190,11 @@
Removed:
o VFS-469: Remove unused dependency to javax.jcr:jcr.
+Please note that release 2.1 is not completely binary compatible with the previous 2.0 release. This
+is primarily due to the upgrade of Apache Commons Compress to 1.6 and is limited to the TarFileProvider
+and related classes. All other errors reported in the Clirr report should be binary compatible as
+they consist of method additions.
+
Historical list of changes: http://commons.apache.org/proper/commons-vfs/changes-report.html
For complete information on Apache Commons VFS, including instructions on how to submit bug reports,
diff --git a/pom.xml b/pom.xml
index d764705..a8dcf1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,10 @@
<version.checkstyle>2.13</version.checkstyle>
<!-- make sure bundle plugin has dependency informations for 'optional' -->
<commons.osgi.excludeDependencies />
+ <!-- Newer versions of clirr throw an NPE buildling the site -->
+ <commons.clirr.version>2.6</commons.clirr.version>
+ <!-- Avoid warnings about being unable to find jars during site buildling -->
+ <dependency.locations.enabled>false</dependency.locations.enabled>
</properties>
<build>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0700dc1..5ce19a1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -15,6 +15,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+This file is also used by the maven-changes-plugin to generate the release notes.
+Useful ways of finding items to add to this file are:
+
+1. Add items when you fix a bug or add a feature (this makes the
+release process easy :-).
+
+2. Do a JIRA search for tickets closed since the previous release.
+
+3. Use the report generated by the maven-changelog-plugin to see all
+SVN commits. Set the project.properties' maven.changelog.range
+property to the number of days since the last release.
+
+To generate the release notes from this file:
+
+mvn -N changes:announcement-generate -Prelease-notes [-Dchanges.version=nnn]
+
+then tweak the formatting if necessary
+and commit
+
+The <action> type attribute can be add,update,fix,remove.
+-->
+
<document xmlns="http://maven.apache.org/changes/1.0.0">
<properties>
<title>Apache Commons VFS Changes</title>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index b77ccd6..c30df46 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -81,8 +81,8 @@
to replace 2.0 with 2.1 without the need for changes to API consumers. VFS 2.1 has introduced some now
methods for provider interfaces (like <code>FileObject</code>). If you implement a VFS provider and use the
corresponding <code>Abstract*</code> or <code>Default*</code> classes, there should be no need to modify
- the code or recompile the provider.
- See the <a href="https://archive.apache.org/dist/commons/vfs/RELEASE_NOTES.txt">Release Notes</a> and the
+ the code or recompile the provider. The TarFileProvider is one known exception to compatibility with 2.0.
+ See the <a href="https://dist.apache.org/repos/dist/dev/commons/vfs/RELEASE-NOTES.txt">Release Notes</a> and the
<a href="commons-vfs2/clirr-report.html">Clirr Report</a> for details. VFS 2.1 adds a new read-only provider
for the Apache Hadoop (HDFS) File system.
</p><p>
