diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
index d20c19547adf1..f28e63f137bc9 100644
--- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriter.java
@@ -136,7 +136,6 @@ private void open() throws IOException {
       sparkConf);
     serArray = new byte[SER_BUFFER_SIZE];
     serByteBuffer = ByteBuffer.wrap(serArray);
-    // TODO: we should not depend on this class from Kryo; copy its source or find an alternative
     serOutputStream = serializer.serializeStream(new ByteBufferOutputStream(serByteBuffer));
   }
 
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index cfe387faec14b..6913ebbae9714 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -106,6 +106,12 @@ object MimaExcludes {
               "org.apache.spark.sql.parquet.ParquetTestData$"),
             ProblemFilters.exclude[MissingClassProblem](
               "org.apache.spark.sql.parquet.TestGroupWriteSupport")
+          ) ++ Seq(
+            // SPARK-7081 changed ShuffleWriter from a trait to an abstract class and removed some
+            // unnecessary type bounds in order to fix some compiler warnings that occurred when
+            // implementing this interface in Java. Note that ShuffleWriter is private[spark].
+            ProblemFilters.exclude[IncompatibleTemplateDefProblem](
+              "org.apache.spark.shuffle.ShuffleWriter")
           )
 
         case v if v.startsWith("1.3") =>