changeset 16639:19aaaf6ee13e

8173604: Rename module 8173604 java.annotations.common to java.xml.ws.annoations Reviewed-by: dfuchs, alanb, psandoz, mchung
author lancea
date Sat, 04 Feb 2017 14:04:28 -0500
parents 0eb0f644345d
children 2719a1f55cd8
files make/src/classes/build/tools/jigsaw/GenGraphs.java make/src/classes/build/tools/jigsaw/technology-summary.html src/java.se.ee/share/classes/module-info.java test/tools/launcher/modules/addmods/AddModsTest.java
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/src/classes/build/tools/jigsaw/GenGraphs.java	Sat Feb 04 03:29:39 2017 +0100
+++ b/make/src/classes/build/tools/jigsaw/GenGraphs.java	Sat Feb 04 14:04:28 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -126,7 +126,7 @@
         ranks.add(Set.of("java.compiler", "java.instrument"));
         ranks.add(Set.of("java.desktop", "java.management"));
         ranks.add(Set.of("java.corba", "java.xml.ws"));
-        ranks.add(Set.of("java.xml.bind", "java.annotations.common"));
+        ranks.add(Set.of("java.xml.bind", "java.xml.ws.annotation"));
 
     }
 
--- a/make/src/classes/build/tools/jigsaw/technology-summary.html	Sat Feb 04 03:29:39 2017 +0100
+++ b/make/src/classes/build/tools/jigsaw/technology-summary.html	Sat Feb 04 14:04:28 2017 -0500
@@ -588,7 +588,7 @@
 <td>Common Annotations</td>
 <td><a href="https://jcp.org/en/jsr/detail?id=250">250</a></td>
 <td>Java SE,EE</td>
-<td><a href="module-summary.html#java.annotations.common">java.annotations.common</a></td>
+<td><a href="module-summary.html#java.xml.ws.annotation">java.xml.ws.annotation</a></td>
 <td>Original JSR</td>
 <td>Formerly a <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/standards/#standalone-technologies">Standalone Technology</a> (unlisted)</td>
 <td>SE</td>
--- a/src/java.se.ee/share/classes/module-info.java	Sat Feb 04 03:29:39 2017 +0100
+++ b/src/java.se.ee/share/classes/module-info.java	Sat Feb 04 14:04:28 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -36,10 +36,10 @@
 
     // Upgradeable modules for Java EE technologies
     requires transitive java.activation;
-    requires transitive java.annotations.common;
     requires transitive java.corba;
     requires transitive java.transaction;
     requires transitive java.xml.bind;
     requires transitive java.xml.ws;
+    requires transitive java.xml.ws.annotation;
 
 }
--- a/test/tools/launcher/modules/addmods/AddModsTest.java	Sat Feb 04 03:29:39 2017 +0100
+++ b/test/tools/launcher/modules/addmods/AddModsTest.java	Sat Feb 04 14:04:28 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -98,7 +98,7 @@
     }
 
     /**
-     * Basic test of --add-modules ALL-DEFAULT. Module java.annotations.common
+     * Basic test of --add-modules ALL-DEFAULT. Module java.xml.ws.annotation
      * should not resolved and so the types in that module should not be
      * visible.
      */