--- a/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -28,7 +28,7 @@
  * @summary Test verifies that lambda forms are cached when run with multiple threads
  * @author kshefov
  * @library /lib/testlibrary/jsr292 /lib/testlibrary
- * @modules java.management
+ * @modules jdk.management
  * @build TestMethods
  * @build LambdaFormTestCase
  * @build LFCachingTestCase

--- a/jdk/test/java/lang/management/BufferPoolMXBean/Basic.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/BufferPoolMXBean/Basic.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -24,7 +24,7 @@
 /* @test
  * @bug 6606598 7024172
  * @summary Unit test for java.lang.management.BufferPoolMXBean
- * @modules java.management
+ * @modules jdk.management
  * @run main/othervm Basic
  * @key randomness
  */

--- a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016 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
@@ -26,8 +26,7 @@
  * @bug     6396794
  * @summary Check that LastGcInfo contents are reasonable
  * @author  Eamonn McManus
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @run     main/othervm -XX:-ExplicitGCInvokesConcurrent GcInfoCompositeType
  */
 // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()

--- a/jdk/test/java/lang/management/MXBean/MXBeanBehavior.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MXBean/MXBeanBehavior.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -27,8 +27,7 @@
  * @summary Check that java.lang.management MXBeans have the same behavior
  *          as user MXBeans
  * @author  Eamonn McManus
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @run     main/othervm MXBeanBehavior
  */
 

--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -28,7 +28,7 @@
  *          methods and PlatformManagedObject.getObjectName()
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @run main GetPlatformMXBeans
  */
 

--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -28,7 +28,7 @@
  *          ManagementFactory.getPlatformManagementInterfaces() method
  * @author  Frederic Parain
  *
- * @modules java.management
+ * @modules jdk.management
  * @run main GetPlatformManagementInterfaces
  */
 

--- a/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, 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
@@ -27,8 +27,7 @@
  * @summary Test that all the platform MXBeans are wrapped in StandardMBean so
  *          an MBeanServer which does not have support for MXBeans can be used.
  * @author Luis-Miguel Alventosa
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @run clean MBeanServerMXBeanUnsupportedTest
  * @run build MBeanServerMXBeanUnsupportedTest
  * @run main/othervm MBeanServerMXBeanUnsupportedTest

--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -29,7 +29,7 @@
  *
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @build MXBeanException
  * @run main MXBeanException
  */

--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -25,7 +25,7 @@
  * @test
  * @bug     5024531
  * @summary Basic Test for ManagementFactory.newPlatformMXBean().
- * @modules java.management
+ * @modules jdk.management
  * @run main/othervm MXBeanProxyTest
  * @author  Mandy Chung
  */

--- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -26,7 +26,7 @@
  * @bug     4947536
  * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer()
  * @author  Mandy Chung
- * @modules java.management
+ * @modules jdk.management
  */
 
 import java.lang.management.*;

--- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -27,8 +27,7 @@
  * @summary Test type mapping of the platform MXBean proxy
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  */
 import java.lang.management.*;
 import javax.management.*;

--- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -28,8 +28,7 @@
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
  *
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @compile ProxyTypeMapping.java
  * @run main/othervm -verbose:gc ProxyTypeMapping
  */

--- a/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -29,7 +29,7 @@
  *
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @run main ThreadMXBeanProxy
  */
 

--- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -28,8 +28,7 @@
  *          MBeanServer.
  * @author  Mandy Chung
  *
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @compile ValidateOpenTypes.java
  * @run main/othervm -verbose:gc ValidateOpenTypes
  */

--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -31,7 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
- * @modules java.management
+ * @modules jdk.management
  * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
  * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null"
  * @run main/timeout=300 CollectionUsageThreshold

--- a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -27,7 +27,7 @@
  * @summary Make sure MemoryMXBean has two notification types.
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @run main GetMBeanInfo
  */
 

--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -30,7 +30,7 @@
  *
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @build MemoryManagement MemoryUtil
  * @run main/othervm/timeout=600 -Xmn8m -XX:+IgnoreUnrecognizedVMOptions -XX:G1HeapRegionSize=1 -XX:-UseLargePages MemoryManagement
  */

--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -28,7 +28,7 @@
  *          MemoryMXBean.getMemoryManager().
  * @author  Mandy Chung
  *
- * @modules java.management
+ * @modules jdk.management
  * @run main MemoryTest 2
  */
 

--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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,7 +33,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
- * @modules java.management
+ * @modules jdk.management
  * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
  * @run main ResetPeakMemoryUsage
  */

--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -27,8 +27,7 @@
  * @summary Test if proxy for PlatformLoggingMXBean is equivalent
  *          to proxy for LoggingMXBean
  *
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @build LoggingMXBeanTest
  * @run main LoggingMXBeanTest
  */

--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -29,8 +29,7 @@
  *          This test performs similar testing as
  *          java/util/logging/LoggingMXBeanTest.
  *
- * @modules java.management
- *          jdk.management
+ * @modules jdk.management
  * @build PlatformLoggingMXBeanTest
  * @run main PlatformLoggingMXBeanTest
  */

--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Wed May 11 12:01:19 2016 -0300
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Tue May 10 14:51:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -30,7 +30,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
- * @modules java.management
+ * @modules jdk.management
  * @build ThreadInfoArray
  * @run main ThreadInfoArray
  */