Merge
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 92fe10a..607d2df 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -203,3 +203,4 @@
c933505d75c2a0a671f06d6dac5d2237a9228d2d jdk8-b79
dfb40f066c6ce129822f0f5dc2ac89173808781a jdk8-b80
c0f8022eba536dcdc8aae659005b33f3982b9368 jdk8-b81
+624bcb4800065c6656171948e31ebb2925f25c7a jdk8-b82
diff --git a/jdk/make/com/sun/org/apache/xml/Makefile b/jdk/make/com/sun/org/apache/xml/Makefile
index f00135d..b3568e4 100644
--- a/jdk/make/com/sun/org/apache/xml/Makefile
+++ b/jdk/make/com/sun/org/apache/xml/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -34,6 +34,8 @@
JAVAC_WARNINGS_FATAL = true
include $(BUILDDIR)/common/Defs.gmk
+JAVAC_LINT_OPTIONS += -Xlint:-overrides
+
#
# Files to compile
#
diff --git a/jdk/make/javax/others/Makefile b/jdk/make/javax/others/Makefile
index b122c20..7ee1151 100644
--- a/jdk/make/javax/others/Makefile
+++ b/jdk/make/javax/others/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2013, 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
@@ -33,6 +33,8 @@
include $(BUILDDIR)/common/Defs.gmk
+JAVAC_LINT_OPTIONS += -Xlint:-deprecation
+
#
# Files to compile
#