diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java
index 1b4067c835a4..678d9782f294 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/BaseRow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ public abstract class BaseRow implements Serializable, Cloneable {
  * object.
  * @serial
  */
+    @SuppressWarnings("serial") // Array component type is not Serializable
     protected Object[] origVals;
 
 /**
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
index 47a8bc7c7c1f..a588c1dd94a8 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
@@ -147,6 +147,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable {
  *
  * @serial
  */
+    @SuppressWarnings("serial") // Array component type is not Serializable
     private Object[] params;
 
 /**
diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java
index 1fa4b767b028..2167effa1092 100644
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/Row.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,7 @@ public class Row extends BaseRow implements Serializable, Cloneable {
  * object.
  * @serial
  */
+    @SuppressWarnings("serial") // Array component type is not Serializable
     private Object[] currentVals;
 
 /**