This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new a0d7cb569 Normalize spelling
a0d7cb569 is described below
commit a0d7cb569f2ae507b95f66553bc35f3737bafd2a
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Jan 27 10:34:27 2025 -0500
Normalize spelling
---
.../java/org/apache/commons/collections4/bag/AbstractMapBag.java | 2 +-
.../java/org/apache/commons/collections4/keyvalue/MultiKey.java | 2 +-
.../org/apache/commons/collections4/map/CaseInsensitiveMap.java | 2 +-
src/main/java/org/apache/commons/collections4/map/HashedMap.java | 2 +-
src/main/java/org/apache/commons/collections4/map/LRUMap.java | 2 +-
src/main/java/org/apache/commons/collections4/map/LinkedMap.java | 2 +-
src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java | 2 +-
.../apache/commons/collections4/multimap/AbstractListValuedMap.java | 2 +-
.../commons/collections4/multimap/AbstractMultiValuedMap.java | 2 +-
.../apache/commons/collections4/multimap/AbstractSetValuedMap.java | 2 +-
.../apache/commons/collections4/multiset/AbstractMapMultiSet.java | 2 +-
.../org/apache/commons/collections4/multiset/AbstractMultiSet.java | 2 +-
src/site/xdoc/security.xml | 2 +-
src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java | 6 +++---
src/test/java/org/apache/commons/collections4/map/IdentityMap.java | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
index d5528ffe1..891b12e1c 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
@@ -154,7 +154,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> {
private transient Set<E> uniqueSet;
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractMapBag() {
}
diff --git
a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 519d70092..9e4f451d8 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -49,7 +49,7 @@ import java.util.Objects;
public class MultiKey<K> implements Serializable {
// This class could implement List, but that would confuse its purpose
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = 4465448607415788805L;
@SuppressWarnings("unchecked")
diff --git
a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
index 485a4cc38..579e00c87 100644
--- a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
@@ -73,7 +73,7 @@ import java.util.Map;
*/
public class CaseInsensitiveMap<K, V> extends AbstractHashedMap<K, V>
implements Serializable, Cloneable {
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = -7074655917369299456L;
/**
diff --git a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
index a20597450..04c35cc4d 100644
--- a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
@@ -45,7 +45,7 @@ import java.util.Map;
public class HashedMap<K, V>
extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = -1788199231038721040L;
/**
diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
index 846242d97..c4758a861 100644
--- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -66,7 +66,7 @@ import org.apache.commons.collections4.BoundedMap;
public class LRUMap<K, V>
extends AbstractLinkedMap<K, V> implements BoundedMap<K, V>,
Serializable, Cloneable {
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = -612114643488955218L;
/** Default maximum size */
protected static final int DEFAULT_MAX_SIZE = 100;
diff --git a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
index 53080eef0..1c6b349dc 100644
--- a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
@@ -175,7 +175,7 @@ public class LinkedMap<K, V> extends AbstractLinkedMap<K,
V> implements Serializ
}
}
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = 9077234323521161066L;
/**
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
index 71e468f6f..6b28f0f69 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
@@ -88,7 +88,7 @@ import
org.apache.commons.collections4.map.AbstractHashedMap.HashEntry;
public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends
K>, V>
implements Serializable, Cloneable {
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = -1788199231038721040L;
/**
diff --git
a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
index 52e144a35..5b55bbcf3 100644
---
a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
+++
b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
@@ -225,7 +225,7 @@ public abstract class AbstractListValuedMap<K, V> extends
AbstractMultiValuedMap
}
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractListValuedMap() {
}
diff --git
a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
index 39d0cd5c6..3ce1592f3 100644
---
a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
+++
b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
@@ -576,7 +576,7 @@ public abstract class AbstractMultiValuedMap<K, V>
implements MultiValuedMap<K,
private transient Map<K, Collection<V>> map;
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractMultiValuedMap() {
}
diff --git
a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
index 7f563bcdb..661c0b544 100644
---
a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
+++
b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
@@ -70,7 +70,7 @@ public abstract class AbstractSetValuedMap<K, V> extends
AbstractMultiValuedMap<
}
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractSetValuedMap() {
}
diff --git
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
index 15b2169d3..d896e251c 100644
---
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
+++
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
@@ -276,7 +276,7 @@ public abstract class AbstractMapMultiSet<E> extends
AbstractMultiSet<E> {
private transient int modCount;
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractMapMultiSet() {
}
diff --git
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
index 489eaac7a..eb308ee43 100644
---
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -240,7 +240,7 @@ public abstract class AbstractMultiSet<E> extends
AbstractCollection<E> implemen
private transient Set<Entry<E>> entrySet;
/**
- * Constructor needed for subclass serialisation.
+ * Constructor needed for subclass serialization.
*/
protected AbstractMultiSet() {
}
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index ab3a746b5..8385d2f07 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -96,7 +96,7 @@
(<a
href="https://access.redhat.com/security/cve/cve-2015-7501";>Red Hat
Portal</a>)</li>
<li>Apache Commons
<a
href="https://blogs.apache.org/foundation/entry/apache_commons_statement_to_widespread";>statement</a>
- to widespread Java object de-serialisation vulnerability</li>
+ to widespread Java object de-serialization vulnerability</li>
<li><a
href="https://www.slideshare.net/frohoff1/appseccali-2015-marshalling-pickles";>
Presentation</a> @ AppSecCali2015 by Lawrence and Frohoff</li>
<li><a
href="https://foxglovesecurity.com/2015/11/06/what-do-weblogic-websphere-jboss-jenkins-opennms-and-your-application-have-in-common-this-vulnerability/";>Attack
scenarios</a>
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 6acb26911..844a3519b 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -779,7 +779,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
}
@Test
- public void testSerialisation0() throws Exception {
+ public void testSerialization0() throws Exception {
final Flat3Map<K, V> map = makeObject();
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
final ObjectOutputStream out = new ObjectOutputStream(bout);
@@ -796,7 +796,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
@Test
@SuppressWarnings("unchecked")
- public void testSerialisation2() throws Exception {
+ public void testSerialization2() throws Exception {
final Flat3Map<K, V> map = makeObject();
map.put((K) ONE, (V) TEN);
map.put((K) TWO, (V) TWENTY);
@@ -820,7 +820,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
@Test
@SuppressWarnings("unchecked")
- public void testSerialisation4() throws Exception {
+ public void testSerialization4() throws Exception {
final Flat3Map<K, V> map = makeObject();
map.put((K) ONE, (V) TEN);
map.put((K) TWO, (V) TWENTY);
diff --git a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
index 9d67084eb..cb26c6851 100644
--- a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
+++ b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
@@ -79,7 +79,7 @@ public class IdentityMap<K, V>
}
}
- /** Serialisation version */
+ /** Serialization version */
private static final long serialVersionUID = 2028493495224302329L;
/**
