Merge changes from 2.1 release branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jcs/trunk@1782354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0abd50f..ce5330a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -16,13 +16,13 @@
Apache Commons JCS
- Version 2.0
+ Version 2.1
Release Notes
INTRODUCTION:
-This document contains the release notes for the 2.0 version of Apache Commons JCS.
+This document contains the release notes for the 2.1 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,23 +35,19 @@
Apache Commons JCS is a distributed, versatile caching system.
-JDK 1.6 based major release
+This is mainly a bugfix release.
Changes in this version include:
Fixed Bugs:
-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
+o SoftReference cache did not work because of strong references being
+ stored in payload of DoubleLinkedListNode
+o JCS-172: ElementAttributes.clone() not updating createTime causes cache elements
+ to expire immediately Thanks to Tom Schroeder.
+o JCS-171: Multiple CacheEventQueue.QProcessor spawned for the same cache region Thanks to Wiktor Niesiobedzki.
+o JCS-170: Replace at least commas for jmx registration
-Changes:
-o JCS-119: Improve concurrency in
- - CompositeCacheManager
- - CacheEventQueue
- - CacheWatchRepairable
- - LHMLRUMemoryCache
-o Deprecate JCS.defineRegion() methods
Historical list of changes: http://commons.apache.org/proper/commons-jcs/changes-report.html
diff --git a/commons-jcs-core/src/site/resources/profile.clirr b/commons-jcs-core/src/site/resources/profile.clirr
new file mode 100644
index 0000000..b5cfeb9
--- /dev/null
+++ b/commons-jcs-core/src/site/resources/profile.clirr
@@ -0,0 +1 @@
+Re-enable clirr-report for core
\ No newline at end of file
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f969d6a..e27c9c5 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.1" date="unreleased">
+ <release version="2.2" date="unreleased">
+ </release>
+ <release version="2.1" date="2017-02-05">
<action dev="tv" type="fix">
SoftReference cache did not work because of strong references being
stored in payload of DoubleLinkedListNode
@@ -31,6 +33,9 @@
<action issue="JCS-171" dev="tv" type="fix" due-to="Wiktor Niesiobedzki">
Multiple CacheEventQueue.QProcessor spawned for the same cache region
</action>
+ <action issue="JCS-170" dev="rmannibucau" type="fix">
+ Replace at least commas for jmx registration
+ </action>
</release>
<release version="2.0" date="2016-12-25" description="JDK 1.6 based major release">
<action issue="JCS-119" dev="tv" type="update">
diff --git a/xdocs/download_jcs.xml b/xdocs/download_jcs.xml
index 24cd4d5..ba217dd 100755
--- a/xdocs/download_jcs.xml
+++ b/xdocs/download_jcs.xml
@@ -111,32 +111,32 @@
</p>
</subsection>
</section>
- <section name="Apache Commons JCS 2.0 (Java 6.0+)">
+ <section name="Apache Commons JCS 2.1 (Java 6.0+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz">commons-jcs-dist-2.0-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.1-bin.tar.gz">commons-jcs-dist-2.1-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.1-bin.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.1-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip">commons-jcs-dist-2.0-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.1-bin.zip">commons-jcs-dist-2.1-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.1-bin.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.1-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz">commons-jcs-dist-2.0-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.1-src.tar.gz">commons-jcs-dist-2.1-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.1-src.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.1-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.0-src.zip">commons-jcs-dist-2.0-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.zip.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.1-src.zip">commons-jcs-dist-2.1-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.1-src.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.1-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>