This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch release-3.2 in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit c827bced8c77cdb62bb683c80d6725538f3c331b Merge: 95aaa6a9 6f0b04fd Author: Thomas Vandahl <[email protected]> AuthorDate: Sat May 6 21:22:16 2023 +0200 Merge remote-tracking branch 'origin/master' into release-3.2 .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/coverage.yml | 6 ++--- .github/workflows/maven.yml | 6 ++--- .github/workflows/scorecards-analysis.yml | 4 ++-- .../jcs/auxiliary/javagroups/JavaGroupsCache.java | 1 - .../javagroups/JavaGroupsCacheAttributes.java | 1 - .../javagroups/JavaGroupsCacheFactory.java | 1 - .../jcs/auxiliary/javagroups/JavaGroupsCache.java | 2 -- .../javagroups/JavaGroupsCacheAttributes.java | 3 --- .../javagroups/JavaGroupsCacheFactory.java | 3 --- .../lateral/javagroups/LateralCacheJGListener.java | 1 - .../javagroups/LateralGroupCacheJGListener.java | 2 -- .../lateral/javagroups/LateralJGReceiver.java | 2 -- .../javagroups/LateralJGReceiverConnection.java | 3 --- .../lateral/javagroups/LateralJGSender.java | 2 -- .../lateral/javagroups/LateralJGService.java | 2 -- .../behavior/ILateralCacheJGListener.java | 2 -- .../lateral/javagroups/utils/JGRpcOpener.java | 2 -- .../lateral/javagroups/utils/JGSocketOpener.java | 2 -- commons-jcs-core/pom.xml | 12 +++++----- .../apache/commons/jcs3/access/package-info.java | 24 +++++++++++++++++++ .../org/apache/commons/jcs3/access/package.html | 27 --------------------- .../auxiliary/disk/indexed/IndexedDiskCache.java | 4 ++-- .../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 2 +- .../dsfactory/SharedPoolDataSourceFactory.java | 4 ++-- .../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 2 +- .../commons/jcs3/auxiliary/disk/package-info.java | 24 +++++++++++++++++++ .../commons/jcs3/auxiliary/disk/package.html | 27 --------------------- .../jcs3/auxiliary/lateral/package-info.java | 24 +++++++++++++++++++ .../commons/jcs3/auxiliary/lateral/package.html | 26 -------------------- .../commons/jcs3/auxiliary/package-info.java | 21 ++++++++++++++++ .../org/apache/commons/jcs3/auxiliary/package.html | 25 ------------------- .../http/server/AbstractRemoteCacheService.java | 2 +- .../jcs3/auxiliary/remote/package-info.java | 21 ++++++++++++++++ .../commons/jcs3/auxiliary/remote/package.html | 25 ------------------- .../auxiliary/remote/server/RemoteCacheServer.java | 4 ++-- .../apache/commons/jcs3/engine/CacheStatus.java | 1 - .../jcs3/engine/behavior/ICacheElement.java | 1 - .../jcs3/engine/behavior/ICacheObserver.java | 1 - .../jcs3/engine/behavior/ICacheServiceAdmin.java | 1 - .../commons/jcs3/engine/behavior/ICacheType.java | 1 - .../commons/jcs3/engine/behavior/IZombie.java | 1 - .../commons/jcs3/engine/behavior/package-info.java | 21 ++++++++++++++++ .../commons/jcs3/engine/behavior/package.html | 25 ------------------- .../event/behavior/IElementEventHandler.java | 1 - .../control/event/behavior/IElementEventQueue.java | 1 - .../commons/jcs3/engine/control/package-info.java | 21 ++++++++++++++++ .../commons/jcs3/engine/control/package.html | 25 ------------------- .../jcs3/engine/memory/lru/package-info.java | 21 ++++++++++++++++ .../commons/jcs3/engine/memory/lru/package.html | 25 ------------------- .../jcs3/engine/memory/mru/package-info.java | 24 +++++++++++++++++++ .../commons/jcs3/engine/memory/mru/package.html | 26 -------------------- .../commons/jcs3/engine/memory/package-info.java | 21 ++++++++++++++++ .../apache/commons/jcs3/engine/memory/package.html | 25 ------------------- .../jcs3/engine/memory/soft/package-info.java | 21 ++++++++++++++++ .../commons/jcs3/engine/memory/soft/package.html | 25 ------------------- .../apache/commons/jcs3/engine/package-info.java | 21 ++++++++++++++++ .../org/apache/commons/jcs3/engine/package.html | 25 ------------------- .../java/org/apache/commons/jcs3/package-info.java | 21 ++++++++++++++++ .../main/java/org/apache/commons/jcs3/package.html | 26 -------------------- .../commons/jcs3/utils/config/OptionConverter.java | 4 ++-- .../commons/jcs3/utils/config/package-info.java | 24 +++++++++++++++++++ .../apache/commons/jcs3/utils/config/package.html | 28 ---------------------- .../jcs3/utils/threadpool/ThreadPoolManager.java | 2 +- .../org/apache/commons/jcs3/RemovalTestUtil.java | 1 - .../apache/commons/jcs3/TestTCPLateralCache.java | 1 - ...dexedDiskCacheConcurrentNoDeadLockUnitTest.java | 3 --- .../IndexedDiskCacheConcurrentUnitTest.java | 1 - .../struct/JCSvsCommonsLRUMapPerformanceTest.java | 1 - .../utils/struct/LRUMapConcurrentUnitTest.java | 1 - commons-jcs-dist/pom.xml | 1 - .../jcs3/jcache/extras/web/JCacheFilter.java | 2 +- .../commons/jcs3/jcache/JCSCachingManager.java | 4 ++-- .../commons/jcs3/jcache/cdi/CDIJCacheHelper.java | 14 +++++------ .../jcache/cdi/CacheInvocationContextImpl.java | 2 +- .../cdi/MakeJCacheCDIInterceptorFriendly.java | 2 +- .../commons/jcs/yajcache/file/CacheFileDAO.java | 10 ++++---- .../commons/jcs/yajcache/util/BeanUtils.java | 2 +- .../util/concurrent/locks/KeyedReadWriteLock.java | 4 ++-- .../jcs/yajcache/core/CacheManagerTest.java | 4 ++-- .../jcs/yajcache/core/SafeCacheManagerTest.java | 6 ++--- .../jcs/yajcache/file/FileContentTypeTest.java | 2 +- pom.xml | 2 +- src/changes/changes.xml | 14 +++++++---- .../socket/udp/LateralCacheUDPListener.java | 1 - .../lateral/xmlrpc/LateralCacheXMLRPCListener.java | 3 --- .../xmlrpc/LateralGroupCacheXMLRPCListener.java | 2 -- .../lateral/xmlrpc/LateralXMLRPCReceiver.java | 3 --- .../xmlrpc/LateralXMLRPCReceiverConnection.java | 3 --- .../lateral/xmlrpc/LateralXMLRPCSender.java | 3 +-- .../lateral/xmlrpc/LateralXMLRPCService.java | 1 - .../behavior/ILateralCacheXMLRPCListener.java | 3 --- .../lateral/xmlrpc/utils/XMLRPCSocketOpener.java | 1 - 93 files changed, 375 insertions(+), 484 deletions(-) diff --cc src/changes/changes.xml index 0db77314,1ffbca19..87a8d8d7 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -19,7 -21,7 +21,11 @@@ <author email="[email protected]">Apache Commons Developers</author> </properties> <body> ++<<<<<<< HEAD + <release version="3.2" date="2023-02-05"> ++======= + <release version="3.1.1" date="TBD"> ++>>>>>>> refs/remotes/origin/master <action dev="tv" type="fix" issue="JCS-232" due-to="Jeremy Long"> Handle ServiceConfigurationError when using a different logging framework </action>
