From 28631ec8adcbbb67553801eb727c18d5635d9087 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Tue, 22 Nov 2005 23:51:45 +0000 Subject: [PATCH] Make serialization version ids private bug 37106, from Sebb git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@348299 13f79535-47bb-0310-9956-ffa450edef68 --- RELEASE-NOTES.html | 1 + src/java/org/apache/commons/collections/bag/HashBag.java | 4 ++-- src/java/org/apache/commons/collections/bag/TreeBag.java | 4 ++-- .../commons/collections/list/NodeCachingLinkedList.java | 4 ++-- src/java/org/apache/commons/collections/map/LRUMap.java | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES.html b/RELEASE-NOTES.html index fd4a5667b..8272ea1ee 100644 --- a/RELEASE-NOTES.html +++ b/RELEASE-NOTES.html @@ -103,6 +103,7 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
  • IteratorChain.remove() - Fix to avoid IllegalStateException when one of the underlying iterators is a FilterIterator [34267]
  • ExtendedProperties.convertProperties() - Fix to handle default properties maps correctly [32204]
  • Add casts to avoid some JDK1.5 compilation warnings [35474]
    • +
  • Make serialization version ids private [37106]

    • JAVADOC

    diff --git a/src/java/org/apache/commons/collections/bag/HashBag.java b/src/java/org/apache/commons/collections/bag/HashBag.java index 5e1b765e5..a4ec94442 100644 --- a/src/java/org/apache/commons/collections/bag/HashBag.java +++ b/src/java/org/apache/commons/collections/bag/HashBag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2004 The Apache Software Foundation + * Copyright 2002-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ public class HashBag extends AbstractMapBag implements Bag, Serializable { /** Serial version lock */ - static final long serialVersionUID = -6561115435802554013L; + private static final long serialVersionUID = -6561115435802554013L; /** * Constructs an empty HashBag. diff --git a/src/java/org/apache/commons/collections/bag/TreeBag.java b/src/java/org/apache/commons/collections/bag/TreeBag.java index 1af943a24..7dc94cc13 100644 --- a/src/java/org/apache/commons/collections/bag/TreeBag.java +++ b/src/java/org/apache/commons/collections/bag/TreeBag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2004 The Apache Software Foundation + * Copyright 2002-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class TreeBag extends AbstractMapBag implements SortedBag, Serializable { /** Serial version lock */ - static final long serialVersionUID = -7740146511091606676L; + private static final long serialVersionUID = -7740146511091606676L; /** * Constructs an empty TreeBag. diff --git a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java index 059b6b889..77b596aa5 100644 --- a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java +++ b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 The Apache Software Foundation + * Copyright 2001-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import java.util.Collection; public class NodeCachingLinkedList extends AbstractLinkedList implements Serializable { /** Serialization version */ - static final long serialVersionUID = 6897789178562232073L; + private static final long serialVersionUID = 6897789178562232073L; /** * The default value for {@link #maximumCacheSize}. diff --git a/src/java/org/apache/commons/collections/map/LRUMap.java b/src/java/org/apache/commons/collections/map/LRUMap.java index 72553c850..13b04725f 100644 --- a/src/java/org/apache/commons/collections/map/LRUMap.java +++ b/src/java/org/apache/commons/collections/map/LRUMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 The Apache Software Foundation + * Copyright 2001-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class LRUMap extends AbstractLinkedMap implements BoundedMap, Serializable, Cloneable { /** Serialisation version */ - static final long serialVersionUID = -612114643488955218L; + private static final long serialVersionUID = -612114643488955218L; /** Default maximum size */ protected static final int DEFAULT_MAX_SIZE = 100;