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 ef6102b23ed955250032c2762f5584d91cbc9ba7
Merge: 3406b042 31973f57
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Wed May 31 18:00:00 2023 +0200
Merge remote-tracking branch 'origin/master' into release-3.2
README.md | 9 ++++-----
.../auxiliary/lateral/LateralElementDescriptor.java | 2 +-
.../lateral/socket/tcp/LateralTCPListener.java | 4 ++--
.../lateral/socket/tcp/LateralTCPService.java | 2 +-
.../lateral/socket/tcp/TCPLateralCacheAttributes.java | 18 +++++++++---------
.../tcp/behavior/ITCPLateralCacheAttributes.java | 16 ++++++++--------
.../java/org/apache/commons/jcs3/engine/CacheInfo.java | 2 +-
.../memory/AbstractDoubleLinkedListMemoryCache.java | 6 +++---
.../jcs3/utils/discovery/DiscoveredService.java | 2 +-
.../commons/jcs3/utils/struct/AbstractLRUMap.java | 8 ++++----
.../tcp/LateralTCPFilterRemoveHashCodeUnitTest.java | 4 ++--
commons-jcs-jcache-extras/pom.xml | 2 +-
.../commons/jcs/access/PartitionedCacheAccess.java | 6 +++---
.../commons/jcs/yajcache/file/CacheFileContent.java | 2 +-
.../jcs/yajcache/lang/ref/KeyedSoftReference.java | 2 +-
.../jcs/yajcache/lang/ref/KeyedWeakReference.java | 2 +-
pom.xml | 2 +-
src/changes/changes.xml | 5 ++++-
18 files changed, 48 insertions(+), 46 deletions(-)
diff --cc README.md
index 056bcb46,395087cf..b6586aab
--- a/README.md
+++ b/README.md
@@@ -1,106 -1,105 +1,105 @@@
-<!---
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!---
- +======================================================================+
- |**** ****|
- |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
- |**** DO NOT EDIT DIRECTLY ****|
- |**** ****|
- +======================================================================+
- | TEMPLATE FILE: readme-md-template.md |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- | |
- | 1) Re-generate using: mvn commons-build:readme-md |
- | |
- | 2) Set the following properties in the component's pom: |
- | - commons.componentid (required, alphabetic, lower case) |
- | - commons.release.version (required) |
- | |
- | 3) Example Properties |
- | |
- | <properties> |
- | <commons.componentid>math</commons.componentid> |
- | <commons.release.version>1.2</commons.release.version> |
- | </properties> |
- | |
- +======================================================================+
---->
-Apache Commons JCS
-===================
-
-[](https://github.com/apache/commons-jcs/actions)
-[](https://app.codecov.io/gh/apache/commons-jcs)
-[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-jcs3/?gav=true)
-[](https://javadoc.io/doc/org.apache.commons/commons-jcs3/3.1)
-
-Apache Commons JCS is a distributed, versatile caching system.
-
-Documentation
--------------
-
-More information can be found on the [Apache Commons JCS
homepage](https://commons.apache.org/proper/commons-jcs).
-The [Javadoc](https://commons.apache.org/proper/commons-jcs/apidocs) can be
browsed.
-Questions related to the usage of Apache Commons JCS should be posted to the
[user mailing list][ml].
-
-Where can I get the latest release?
------------------------------------
-You can download source and binaries from our [download
page](https://commons.apache.org/proper/commons-jcs/download_jcs.cgi).
-
-Alternatively, you can pull it from the central Maven repositories:
-
-```xml
-<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs3</artifactId>
- <version>3.1</version>
-</dependency>
-```
-
-Contributing
-------------
-
-We accept Pull Requests via GitHub. The [developer mailing list][ml] is the
main channel of communication for contributors.
-There are some guidelines which will make applying PRs easier for us:
-+ No tabs! Please use spaces for indentation.
-+ Respect the code style.
-+ Create minimal diffs - disable on save actions like reformat source code or
organize imports. If you feel the source code should be reformatted create a
separate PR for this change.
-+ Provide JUnit tests for your changes and make sure your changes don't break
any existing tests by running ```mvn```.
-
-If you plan to contribute on a regular basis, please consider filing a
[contributor license agreement](https://www.apache.org/licenses/#clas).
-You can learn more about contributing via GitHub in our [contribution
guidelines](CONTRIBUTING.md).
-
-License
--------
-This code is under the [Apache Licence
v2](https://www.apache.org/licenses/LICENSE-2.0).
-
-See the `NOTICE.txt` file for required notices and attributions.
-
-Donations
----------
-You like Apache Commons JCS? Then [donate back to the
ASF](https://www.apache.org/foundation/contributing.html) to support the
development.
-
-Additional Resources
---------------------
-
-+ [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/JCS)
-+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ `#apache-commons` IRC channel on `irc.freenode.org`
-
-[ml]:https://commons.apache.org/mail-lists.html
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!---
+ +======================================================================+
+ |**** ****|
+ |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
+ |**** DO NOT EDIT DIRECTLY ****|
+ |**** ****|
+ +======================================================================+
+ | TEMPLATE FILE: readme-md-template.md |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ | |
+ | 1) Re-generate using: mvn commons-build:readme-md |
+ | |
+ | 2) Set the following properties in the component's pom: |
+ | - commons.componentid (required, alphabetic, lower case) |
+ | - commons.release.version (required) |
+ | |
+ | 3) Example Properties |
+ | |
+ | <properties> |
+ | <commons.componentid>math</commons.componentid> |
+ | <commons.release.version>1.2</commons.release.version> |
+ | </properties> |
+ | |
+ +======================================================================+
+--->
+Apache Commons JCS
+===================
+
- [](https://travis-ci.org/apache/commons-jcs)
+[](https://github.com/apache/commons-jcs/actions)
- [](https://coveralls.io/r/apache/commons-jcs)
- [](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-jcs3/)
-
[](https://javadoc.io/doc/org.apache.commons/commons-jcs3/3.2)
++[](https://app.codecov.io/gh/apache/commons-jcs)
++[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-jcs3/?gav=true)
++[](https://javadoc.io/doc/org.apache.commons/commons-jcs3/3.1)
+
+Apache Commons JCS is a distributed, versatile caching system.
+
+Documentation
+-------------
+
+More information can be found on the [Apache Commons JCS
homepage](https://commons.apache.org/proper/commons-jcs).
+The [Javadoc](https://commons.apache.org/proper/commons-jcs/apidocs) can be
browsed.
+Questions related to the usage of Apache Commons JCS should be posted to the
[user mailing list][ml].
+
+Where can I get the latest release?
+-----------------------------------
+You can download source and binaries from our [download
page](https://commons.apache.org/proper/commons-jcs/download_jcs.cgi).
+
- Alternatively you can pull it from the central Maven repositories:
++Alternatively, you can pull it from the central Maven repositories:
+
+```xml
+<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs3</artifactId>
+ <version>3.2</version>
+</dependency>
+```
+
+Contributing
+------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the
main channel of communication for contributors.
+There are some guidelines which will make applying PRs easier for us:
++ No tabs! Please use spaces for indentation.
++ Respect the code style.
++ Create minimal diffs - disable on save actions like reformat source code or
organize imports. If you feel the source code should be reformatted create a
separate PR for this change.
++ Provide JUnit tests for your changes and make sure your changes don't break
any existing tests by running ```mvn clean test```.
+
+If you plan to contribute on a regular basis, please consider filing a
[contributor license agreement](https://www.apache.org/licenses/#clas).
+You can learn more about contributing via GitHub in our [contribution
guidelines](CONTRIBUTING.md).
+
+License
+-------
+This code is under the [Apache Licence
v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
+
+Donations
+---------
+You like Apache Commons JCS? Then [donate back to the
ASF](https://www.apache.org/foundation/contributing.html) to support the
development.
+
+Additional Resources
+--------------------
+
++ [Apache Commons Homepage](https://commons.apache.org/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/JCS)
++ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
++ `#apache-commons` IRC channel on `irc.freenode.org`
+
+[ml]:https://commons.apache.org/mail-lists.html
