--- old/src/java.base/share/classes/java/lang/Throwable.java 2019-09-18 13:11:05.044116999 -0700 +++ new/src/java.base/share/classes/java/lang/Throwable.java 2019-09-18 13:11:04.852213000 -0700 @@ -230,6 +230,7 @@ * @serial * @since 1.7 */ + @SuppressWarnings("serial") // Not statically typed as Serializable private List suppressedExceptions = SUPPRESSED_SENTINEL; /** Message for trying to suppress a null exception. */ --- old/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java 2019-09-18 13:11:05.583846999 -0700 +++ new/src/java.base/share/classes/java/lang/invoke/SerializedLambda.java 2019-09-18 13:11:05.387944999 -0700 @@ -76,6 +76,7 @@ private final String implMethodSignature; private final int implMethodKind; private final String instantiatedMethodType; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Object[] capturedArgs; /** --- old/src/java.base/share/classes/java/lang/reflect/Proxy.java 2019-09-18 13:11:06.135570999 -0700 +++ new/src/java.base/share/classes/java/lang/reflect/Proxy.java 2019-09-18 13:11:05.911682999 -0700 @@ -308,6 +308,7 @@ * the invocation handler for this proxy instance. * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable protected InvocationHandler h; /** --- old/src/java.base/share/classes/java/time/Clock.java 2019-09-18 13:11:06.647314999 -0700 +++ new/src/java.base/share/classes/java/time/Clock.java 2019-09-18 13:11:06.459409000 -0700 @@ -641,6 +641,7 @@ static final class OffsetClock extends Clock implements Serializable { @java.io.Serial private static final long serialVersionUID = 2007484719125426256L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Clock baseClock; private final Duration offset; @@ -692,6 +693,7 @@ static final class TickClock extends Clock implements Serializable { @java.io.Serial private static final long serialVersionUID = 6504659149906368850L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Clock baseClock; private final long tickNanos; --- old/src/java.base/share/classes/java/time/Ser.java 2019-09-18 13:11:07.290992999 -0700 +++ new/src/java.base/share/classes/java/time/Ser.java 2019-09-18 13:11:07.019128999 -0700 @@ -112,6 +112,7 @@ /** The type being serialized. */ private byte type; /** The object being serialized. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object object; /** --- old/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java 2019-09-18 13:11:07.834720999 -0700 +++ new/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java 2019-09-18 13:11:07.638818999 -0700 @@ -109,6 +109,7 @@ /** * The chronology. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final Chronology chrono; /** * The number of years. --- old/src/java.base/share/classes/java/time/chrono/Ser.java 2019-09-18 13:11:08.406435000 -0700 +++ new/src/java.base/share/classes/java/time/chrono/Ser.java 2019-09-18 13:11:08.190543000 -0700 @@ -110,6 +110,7 @@ /** The type being serialized. */ private byte type; /** The object being serialized. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object object; /** --- old/src/java.base/share/classes/java/time/zone/Ser.java 2019-09-18 13:11:08.950162999 -0700 +++ new/src/java.base/share/classes/java/time/zone/Ser.java 2019-09-18 13:11:08.762256999 -0700 @@ -97,6 +97,7 @@ /** The type being serialized. */ private byte type; /** The object being serialized. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object object; /** --- old/src/java.base/share/classes/java/util/AbstractMap.java 2019-09-18 13:11:09.501886999 -0700 +++ new/src/java.base/share/classes/java/util/AbstractMap.java 2019-09-18 13:11:09.305985000 -0700 @@ -607,7 +607,9 @@ @java.io.Serial private static final long serialVersionUID = -8499721149061103585L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final K key; + @SuppressWarnings("serial") // Not statically typed as Serializable private V value; /** @@ -738,7 +740,9 @@ @java.io.Serial private static final long serialVersionUID = 7138329143949025153L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final K key; + @SuppressWarnings("serial") // Not statically typed as Serializable private final V value; /** --- old/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java 2019-09-18 13:11:10.049613000 -0700 +++ new/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java 2019-09-18 13:11:09.849713000 -0700 @@ -103,10 +103,15 @@ static final int MIN_PARTITION = 16; static final class CumulateTask extends CountedCompleter { + @SuppressWarnings("serial") // Not statically typed as Serializable final T[] array; + @SuppressWarnings("serial") // Not statically typed as Serializable final BinaryOperator function; CumulateTask left, right; - T in, out; + @SuppressWarnings("serial") // Not statically typed as Serializable + T in; + @SuppressWarnings("serial") // Not statically typed as Serializable + T out; final int lo, hi, origin, fence, threshold; /** Root task constructor */ @@ -257,6 +262,7 @@ static final class LongCumulateTask extends CountedCompleter { final long[] array; + @SuppressWarnings("serial") // Not statically typed as Serializable final LongBinaryOperator function; LongCumulateTask left, right; long in, out; @@ -408,6 +414,7 @@ static final class DoubleCumulateTask extends CountedCompleter { final double[] array; + @SuppressWarnings("serial") // Not statically typed as Serializable final DoubleBinaryOperator function; DoubleCumulateTask left, right; double in, out; @@ -559,6 +566,7 @@ static final class IntCumulateTask extends CountedCompleter { final int[] array; + @SuppressWarnings("serial") // Not statically typed as Serializable final IntBinaryOperator function; IntCumulateTask left, right; int in, out; --- old/src/java.base/share/classes/java/util/Arrays.java 2019-09-18 13:11:10.597338999 -0700 +++ new/src/java.base/share/classes/java/util/Arrays.java 2019-09-18 13:11:10.409432999 -0700 @@ -4339,6 +4339,7 @@ { @java.io.Serial private static final long serialVersionUID = -2764017481108945198L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final E[] a; ArrayList(E[] array) { --- old/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java 2019-09-18 13:11:11.257008999 -0700 +++ new/src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java 2019-09-18 13:11:11.065104999 -0700 @@ -115,8 +115,12 @@ static final class Sorter extends CountedCompleter { @java.io.Serial static final long serialVersionUID = 2446542900576103244L; - final T[] a, w; + @SuppressWarnings("serial") // Not statically typed as Serializable + final T[] a; + @SuppressWarnings("serial") // Not statically typed as Serializable + final T[] w; final int base, size, wbase, gran; + @SuppressWarnings("serial") // Not statically typed as Serializable Comparator comparator; Sorter(CountedCompleter par, T[] a, T[] w, int base, int size, int wbase, int gran, @@ -153,8 +157,13 @@ static final class Merger extends CountedCompleter { @java.io.Serial static final long serialVersionUID = 2446542900576103244L; - final T[] a, w; // main and workspace arrays + // main and workspace arrays + @SuppressWarnings("serial") // Not statically typed as Serializable + final T[] a; + @SuppressWarnings("serial") // Not statically typed as Serializable + final T[] w; final int lbase, lsize, rbase, rsize, wbase, gran; + @SuppressWarnings("serial") // Not statically typed as Serializable Comparator comparator; Merger(CountedCompleter par, T[] a, T[] w, int lbase, int lsize, int rbase, @@ -273,7 +282,8 @@ static final class Merger extends CountedCompleter { @java.io.Serial static final long serialVersionUID = 2446542900576103244L; - final byte[] a, w; // main and workspace arrays + // main and workspace arrays + final byte[] a, w; final int lbase, lsize, rbase, rsize, wbase, gran; Merger(CountedCompleter par, byte[] a, byte[] w, int lbase, int lsize, int rbase, --- old/src/java.base/share/classes/java/util/Collections.java 2019-09-18 13:11:11.808732999 -0700 +++ new/src/java.base/share/classes/java/util/Collections.java 2019-09-18 13:11:11.604835000 -0700 @@ -1024,6 +1024,7 @@ @java.io.Serial private static final long serialVersionUID = 1820017752578914078L; + @SuppressWarnings("serial") // Not statically typed as Serializable final Collection c; UnmodifiableCollection(Collection c) { @@ -1164,6 +1165,7 @@ implements SortedSet, Serializable { @java.io.Serial private static final long serialVersionUID = -4929149591599911165L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedSet ss; UnmodifiableSortedSet(SortedSet s) {super(s); ss = s;} @@ -1244,6 +1246,7 @@ /** * The instance we are protecting. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableSet ns; UnmodifiableNavigableSet(NavigableSet s) {super(s); ns = s;} @@ -1304,6 +1307,7 @@ @java.io.Serial private static final long serialVersionUID = -283967356065247728L; + @SuppressWarnings("serial") // Not statically typed as Serializable final List list; UnmodifiableList(List list) { @@ -1450,6 +1454,7 @@ @java.io.Serial private static final long serialVersionUID = -1034234728574286014L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Map m; UnmodifiableMap(Map m) { @@ -1809,6 +1814,7 @@ @java.io.Serial private static final long serialVersionUID = -8806743815996713206L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedMap sm; UnmodifiableSortedMap(SortedMap m) {super(m); sm = m; } @@ -1886,6 +1892,7 @@ /** * The instance we wrap and protect. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableMap nm; UnmodifiableNavigableMap(NavigableMap m) @@ -2017,7 +2024,9 @@ @java.io.Serial private static final long serialVersionUID = 3053995032091335093L; + @SuppressWarnings("serial") // Not statically typed as Serializable final Collection c; // Backing Collection + @SuppressWarnings("serial") // Not statically typed as Serializable final Object mutex; // Object on which to synchronize SynchronizedCollection(Collection c) { @@ -2219,6 +2228,7 @@ @java.io.Serial private static final long serialVersionUID = 8695801310862127406L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedSet ss; SynchronizedSortedSet(SortedSet s) { @@ -2314,6 +2324,7 @@ @java.io.Serial private static final long serialVersionUID = -5505529816273629798L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableSet ns; SynchronizedNavigableSet(NavigableSet s) { @@ -2424,6 +2435,7 @@ @java.io.Serial private static final long serialVersionUID = -7754090372962971524L; + @SuppressWarnings("serial") // Not statically typed as Serializable final List list; SynchronizedList(List list) { @@ -2591,7 +2603,9 @@ @java.io.Serial private static final long serialVersionUID = 1978198479659022715L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Map m; // Backing Map + @SuppressWarnings("serial") // Not statically typed as Serializable final Object mutex; // Object on which to synchronize SynchronizedMap(Map m) { @@ -2788,6 +2802,7 @@ @java.io.Serial private static final long serialVersionUID = -8798146769416483793L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedMap sm; SynchronizedSortedMap(SortedMap m) { @@ -2891,6 +2906,7 @@ @java.io.Serial private static final long serialVersionUID = 699392247599746807L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableMap nm; SynchronizedNavigableMap(NavigableMap m) { @@ -3070,7 +3086,9 @@ @java.io.Serial private static final long serialVersionUID = 1578914078182001775L; + @SuppressWarnings("serial") // Not statically typed as Serializable final Collection c; + @SuppressWarnings("serial") // Not statically typed as Serializable final Class type; @SuppressWarnings("unchecked") @@ -3126,6 +3144,7 @@ public boolean add(E e) { return c.add(typeCheck(e)); } + @SuppressWarnings("serial") // Not statically typed as Serializable private E[] zeroLengthElementArray; // Lazily initialized private E[] zeroLengthElementArray() { @@ -3219,6 +3238,7 @@ { @java.io.Serial private static final long serialVersionUID = 1433151992604707767L; + @SuppressWarnings("serial") // Not statically typed as Serializable final Queue queue; CheckedQueue(Queue queue, Class elementType) { @@ -3323,6 +3343,7 @@ @java.io.Serial private static final long serialVersionUID = 1599911165492914959L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedSet ss; CheckedSortedSet(SortedSet s, Class type) { @@ -3387,6 +3408,7 @@ @java.io.Serial private static final long serialVersionUID = -5429120189805438922L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableSet ns; CheckedNavigableSet(NavigableSet s, Class type) { @@ -3470,6 +3492,7 @@ { @java.io.Serial private static final long serialVersionUID = 65247728283967356L; + @SuppressWarnings("serial") // Not statically typed as Serializable final List list; CheckedList(List list, Class type) { @@ -3619,8 +3642,11 @@ @java.io.Serial private static final long serialVersionUID = 5742860141034234728L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Map m; + @SuppressWarnings("serial") // Not statically typed as Serializable final Class keyType; + @SuppressWarnings("serial") // Not statically typed as Serializable final Class valueType; private void typeCheck(Object key, Object value) { @@ -4019,6 +4045,7 @@ @java.io.Serial private static final long serialVersionUID = 1599671320688067438L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final SortedMap sm; CheckedSortedMap(SortedMap m, @@ -4094,6 +4121,7 @@ @java.io.Serial private static final long serialVersionUID = -4852462692372534096L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final NavigableMap nm; CheckedNavigableMap(NavigableMap m, @@ -4825,6 +4853,7 @@ @java.io.Serial private static final long serialVersionUID = 3193687207550431679L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final E element; SingletonSet(E e) {element = e;} @@ -4879,6 +4908,7 @@ @java.io.Serial private static final long serialVersionUID = 3093736618740652951L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final E element; SingletonList(E obj) {element = obj;} @@ -4948,7 +4978,9 @@ @java.io.Serial private static final long serialVersionUID = -6979724477215052911L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final K k; + @SuppressWarnings("serial") // Not statically typed as Serializable private final V v; SingletonMap(K key, V value) { @@ -5087,6 +5119,7 @@ private static final long serialVersionUID = 2739099268398711800L; final int n; + @SuppressWarnings("serial") // Not statically typed as Serializable final E element; CopiesList(int n, E e) { @@ -5320,6 +5353,7 @@ * * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable final Comparator cmp; ReverseComparator2(Comparator cmp) { @@ -5601,6 +5635,7 @@ private static class SetFromMap extends AbstractSet implements Set, Serializable { + @SuppressWarnings("serial") // Not statically typed as Serializable private final Map m; // The backing map private transient Set s; // Its keySet @@ -5686,6 +5721,7 @@ implements Queue, Serializable { @java.io.Serial private static final long serialVersionUID = 1802017725587941708L; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Deque q; AsLIFOQueue(Deque q) { this.q = q; } public boolean add(E e) { q.addFirst(e); return true; } --- old/src/java.base/share/classes/java/util/Comparators.java 2019-09-18 13:11:12.568352999 -0700 +++ new/src/java.base/share/classes/java/util/Comparators.java 2019-09-18 13:11:12.320477000 -0700 @@ -66,6 +66,7 @@ private static final long serialVersionUID = -7569533591570686392L; private final boolean nullFirst; // if null, non-null Ts are considered equal + @SuppressWarnings("serial") // Not statically typed as Serializable private final Comparator real; @SuppressWarnings("unchecked") --- old/src/java.base/share/classes/java/util/PriorityQueue.java 2019-09-18 13:11:13.112080999 -0700 +++ new/src/java.base/share/classes/java/util/PriorityQueue.java 2019-09-18 13:11:12.920176999 -0700 @@ -111,6 +111,7 @@ * The comparator, or null if priority queue uses elements' * natural ordering. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final Comparator comparator; /** --- old/src/java.base/share/classes/java/util/TreeMap.java 2019-09-18 13:11:13.643814999 -0700 +++ new/src/java.base/share/classes/java/util/TreeMap.java 2019-09-18 13:11:13.459907000 -0700 @@ -118,6 +118,7 @@ * * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final Comparator comparator; private transient Entry root; @@ -1353,7 +1354,10 @@ * if loInclusive is true, lo is the inclusive bound, else lo * is the exclusive bound. Similarly for the upper bound. */ - final K lo, hi; + @SuppressWarnings("serial") // Not statically typed as Serializable + final K lo; + @SuppressWarnings("serial") // Not statically typed as Serializable + final K hi; final boolean fromStart, toEnd; final boolean loInclusive, hiInclusive; @@ -1936,6 +1940,7 @@ super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive); } + @SuppressWarnings("serial") // Not statically typed as Serializable private final Comparator reverseComparator = Collections.reverseOrder(m.comparator); @@ -2024,7 +2029,10 @@ @java.io.Serial private static final long serialVersionUID = -6520786458950516097L; private boolean fromStart = false, toEnd = false; - private K fromKey, toKey; + @SuppressWarnings("serial") // Not statically typed as Serializable + private K fromKey; + @SuppressWarnings("serial") // Not statically typed as Serializable + private K toKey; @java.io.Serial private Object readResolve() { return new AscendingSubMap<>(TreeMap.this, --- old/src/java.base/share/classes/java/util/Vector.java 2019-09-18 13:11:14.227523000 -0700 +++ new/src/java.base/share/classes/java/util/Vector.java 2019-09-18 13:11:14.019626999 -0700 @@ -102,6 +102,7 @@ * * @serial */ + @SuppressWarnings("serial") // Not statically typed as Serializable protected Object[] elementData; /** --- old/src/java.base/share/classes/java/util/jar/JarVerifier.java 2019-09-18 13:11:14.819227000 -0700 +++ new/src/java.base/share/classes/java/util/jar/JarVerifier.java 2019-09-18 13:11:14.591341000 -0700 @@ -590,6 +590,7 @@ URL vlocation; CodeSigner[] vsigners; java.security.cert.Certificate[] vcerts; + @SuppressWarnings("serial") // Not statically typed as Serializable Object csdomain; VerifierCodeSource(Object csdomain, URL location, CodeSigner[] signers) { --- old/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-09-18 13:11:15.354958999 -0700 +++ new/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2019-09-18 13:11:15.155058999 -0700 @@ -44,6 +44,7 @@ @java.io.Serial private static final long serialVersionUID = 6182022883658399397L; private final Class type; + @SuppressWarnings("serial") // Not statically typed as Serializable private final Map memberValues; AnnotationInvocationHandler(Class type, Map memberValues) { --- old/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java 2019-09-18 13:11:15.930670999 -0700 +++ new/src/java.base/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java 2019-09-18 13:11:15.726773000 -0700 @@ -36,7 +36,8 @@ class AnnotationTypeMismatchExceptionProxy extends ExceptionProxy { @java.io.Serial private static final long serialVersionUID = 7844069490309503934L; - private Method member; + @SuppressWarnings("serial") // Not statically typed as Serializable + private Method member; // Would be more robust to null-out in a writeObject method. private final String foundType; /**