Prepare release

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jcs/trunk@1776030 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index cce05fc..0abd50f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -16,13 +16,13 @@
 
 
                         Apache Commons JCS
-                        Version 2.0-beta-2
+                        Version 2.0
                         Release Notes
 
 
 INTRODUCTION:
 
-This document contains the release notes for the 2.0-beta-2 version of Apache Commons JCS.
+This document contains the release notes for the 2.0 version of Apache Commons JCS.
 Commons JCS is a distributed caching system written in Java. It is intend to speed up 
 applications by providing a means to manage cached data of various dynamic natures.
 
@@ -35,48 +35,24 @@
 
 Apache Commons JCS is a distributed, versatile caching system.
 
-JDK 1.6 based major release (beta-2)
+JDK 1.6 based major release
 
 Changes in this version include:
 
-New features:
-o JCS-54:   Add soft reference memory cache Thanks to Tore Halset.
-o           Add verification of block disk cache key file. Thanks to Wiktor Niesiobedzki.
-o           Add orderly shutdown of ThreadPoolManager
-o JCS-147:  Provide file size limitation for Block Disk Cache and Indexed Disk Cache Thanks to Wiktor Niesiobedzki.
 
 Fixed Bugs:
-o JCS-165:  Fix: BlockDiskCache partial remove / group remove doesn't work Thanks to Wiktor Niesiobedzki.
-o JCS-156:  BlockDiskCache is limited to 2GB Thanks to Ryan Fong.
-o JCS-162:  Fix: Memory region properties documentation incorrect Thanks to Ryan Fong.
-o JCS-161:  Fix: Dynamic regions leak memory upon dispose due to ShrinkerTask Thanks to Ryan Fong.
-o JCS-78:   Fix: RemoteCacheStartupServlet can't start with config outside classpath Thanks to Marko Stipanov.
-o JCS-159:  Fix: BlockDiskCache overwrites data after loading from disk Thanks to Wiktor Niesiobedzki.
-o           Fix Javadoc for Java 8 Thanks to Mat Jaggard.
-o JCS-116:  Fix: CompositeCacheManager is thread-hostile Thanks to Sebb.
-o JCS-158:  Fix NullPointerException in IndexedDiskCache.addToRecycleBin(...) Thanks to Wiktor Niesiobedzki.
-o JCS-153:  Fix file size limitation for Block Disk Cache and Indexed Disk Cache Thanks to Wiktor Niesiobedzki.
-o JCS-149:  When reading keys from disk, a StreamCorruptedException happens when a custom serializer is applied Thanks to Youngho Cho.
-o           Fix removal of items from group cache, added several tests
-o JCS-140:  JCacheFilter code logic error, first hit always fails Thanks to liangjiarui.
-o JCS-96:   Incomplete shutdown of RemoteCacheServer Thanks to Gregory Fernandez.
-o JCS-148:  Unnecessary use of FileChannel.force() in Indexed and Block Disk Caches Thanks to Wiktor Niesiobedzki.
-o JCS-146:  IndexedDiskCache: Mismatched memory and disk length (0) for 
-            [DED:  pos = 63802 len = 9658] during optimization Thanks to Wiktor Niesiobedzki.
-o JCS-145:  AbstractDiskCacheAttributes logs error, when directory already exists Thanks to Wiktor Niesiobedzki.
-o JCS-144:  BlockDiskCache hangs on SEVERE: Region [TMS] Failure getting from disk--IOException Thanks to Wiktor Niesiobedzki.
-o JCS-141:  RemoteCacheServerFactory ignores configuration Thanks to validruk.
+o JCS-169:  JCache Access Expiry not respected
+o JCS-168:  cdi/nocdi jcache jar doesnt contain the right 
+            META-INF/services/javax.enterprise.inject.spi.Extension file
 
 Changes:
-o JCS-130:  Simplify management of auxiliary caches
-o           Reduce synchronization
-o JCS-48:   Replace PoolAccess with a DataSourceFactory model borrowed from DB-Torque Thanks to Hanasaki Jiji.
-o JCS-124:  Make the code in Step 5 on the JCS overview page a full working class that can compile Thanks to Richard Eigenmann.
+o JCS-119:  Improve concurrency in
+            - CompositeCacheManager
+            - CacheEventQueue
+            - CacheWatchRepairable
+            - LHMLRUMemoryCache
+o           Deprecate JCS.defineRegion() methods
 
-Removed:
-o           Remove size limitation configuration of indexed cache recycle bin
-o           Replace SortedPreferentialArray with JDK ConcurrentSkipListSet
-o           Replace SingleLinkedList with JDK ConcurrentLinkedQueue
 
 Historical list of changes: http://commons.apache.org/proper/commons-jcs/changes-report.html
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 09b1399..3f3d29f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -19,7 +19,9 @@
 		<author email="dev@commons.apache.org">Apache Commons Developers</author>
 	</properties>
 	<body>
-        <release version="2.0" date="unreleased" description="JDK 1.6 based major release">
+        <release version="2.1" date="unreleased">
+        </release>
+        <release version="2.0" date="2016-12-25" description="JDK 1.6 based major release">
             <action issue="JCS-119" dev="tv" type="update">
                 Improve concurrency in
                 - CompositeCacheManager