[commons-jcs] 01/02: Merge tag 'upstream/2.0'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository commons-jcs.

commit c60dbe5205b685d01a9aeca7ceaf9f4e4d941793
Merge: 7e7c46e 13a625a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 14 19:08:55 2017 +0100

    Merge tag 'upstream/2.0'
    
    Upstream version 2.0

 RELEASE-NOTES.txt                                  |  50 ++--
 commons-jcs-core/pom.xml                           |  10 +-
 .../src/main/java/org/apache/commons/jcs/JCS.java  |  51 ++++-
 .../jcs/auxiliary/disk/AbstractDiskCache.java      |  69 +++---
 .../commons/jcs/auxiliary/disk/LRUMapJCS.java      |  75 ------
 .../auxiliary/disk/indexed/IndexedDiskCache.java   |  11 -
 .../jcs/engine/AbstractCacheEventQueue.java        | 119 +++++-----
 .../apache/commons/jcs/engine/CacheEventQueue.java | 255 +++++----------------
 .../commons/jcs/engine/CacheWatchRepairable.java   |  92 ++++----
 .../commons/jcs/engine/PooledCacheEventQueue.java  |  47 +---
 .../jcs/engine/behavior/ICacheEventQueue.java      |  17 +-
 .../jcs/engine/control/CompositeCacheManager.java  |  41 ++--
 .../AbstractDoubleLinkedListMemoryCache.java       |  68 +-----
 .../jcs/engine/memory/AbstractMemoryCache.java     |  65 ++++--
 .../jcs/engine/memory/lru/LHMLRUMemoryCache.java   |  87 +------
 .../memory/soft/SoftReferenceMemoryCache.java      |  54 +----
 .../commons/jcs/access/CacheAccessUnitTest.java    |  14 +-
 .../jcs/auxiliary/disk/LRUMapJCSUnitTest.java      |  78 -------
 .../commons/jcs/engine/MockCacheEventQueue.java    |  33 ---
 commons-jcs-dist/pom.xml                           |  10 +-
 commons-jcs-jcache-extras/pom.xml                  |  10 +-
 commons-jcs-jcache-openjpa/pom.xml                 |  10 +-
 commons-jcs-jcache/pom.xml                         |  12 +-
 .../org/apache/commons/jcs/jcache/JCSCache.java    | 120 +++++-----
 .../org/apache/commons/jcs/jcache/CacheTest.java   |  38 +++
 commons-jcs-tck-tests/pom.xml                      |  13 +-
 pom.xml                                            |   8 +-
 src/changes/changes.xml                            |  21 +-
 28 files changed, 516 insertions(+), 962 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-jcs.git