Merge branch 'layered_filter' of github.com:Claudenw/commons-collecti…

…ons into layered_filter

.github/workflows/scorecards-analysis.yml

@@ -45,7 +45,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af    # 2.1.3
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031    # 2.2.0
         with:
           results_file: results.sarif
           results_format: sarif

pom.xml

@@ -512,7 +512,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>32.0.1-jre</version>
+      <version>32.1.0-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/changes/changes.xml

@@ -356,7 +356,7 @@
       Bump pmd from 6.46.0 to 6.52.0 #318, #327, #333, #347.
     </action>
     <action type="update" dev="ggregory" due-to="Dependabot">
-      Bump guava-testlib from 31.1-jre to 32.0.1-jre #394, #395.
+      Bump guava-testlib from 31.1-jre to 32.1.0-jre #394, #395, #404.
     </action>
   </release>
   <release version="4.4" date="2019-07-05" description="Maintenance release.">

src/main/java/org/apache/commons/collections4/bloomfilter/LayerManager.java

@@ -47,6 +47,7 @@
  * <li>{@code FilterSuplier} is executed and the new filter added to the list as
  * the {@code target} filter.</li>
  * </ol>
+ * @since 4.5
  */
 public class LayerManager implements BloomFilterProducer {
 

src/main/java/org/apache/commons/collections4/bloomfilter/LayeredBloomFilter.java

@@ -32,6 +32,7 @@
  * <p>
  * In short, Layered Bloom filter contains several bloom filters arranged in
  * layers.
+ * </p>
  * <ul>
  * <li>When membership in the filter is checked each layer in turn is checked
  * and if a match is found {@code true} is returned.</li>
@@ -43,7 +44,6 @@
  * The net result is that the layered Bloom filter can be populated with more
  * items than the Shape would indicate and yet still return a false positive
  * rate in line with the Shape and not the over population.
- * </p>
  * <p>
  * This implementation uses a LayerManager to handle the manipulation of the
  * layers.

src/main/java/org/apache/commons/collections4/bloomfilter/WrappedBloomFilter.java

@@ -22,6 +22,7 @@
 /**
  * An abstract class to assist in implementing Bloom filter decorators.
  *
+ * @since 4.5
  */
 public abstract class WrappedBloomFilter implements BloomFilter {
     final BloomFilter wrapped;