OpenJDK / amber / amber

changeset 44281:47ff6e3034d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Thu, 16 Mar 2017 17:55:56 +0000
parents 9ad85c8672f2 d299a23c65e2
children e70f843fe0d1 5dc8a3b7756b 664d5912500e
files
diffstat 12 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventFactory.java	Thu Mar 16 17:55:56 2017 +0000
@@ -155,7 +155,7 @@
    *              #newFactory(java.lang.String, java.lang.ClassLoader)}
    *              method defines no changes in behavior.
    */
-  @Deprecated(since="7")
+  @Deprecated(since="1.7")
   public static XMLEventFactory newInstance(String factoryId,
           ClassLoader classLoader)
           throws FactoryConfigurationError {
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java	Thu Mar 16 17:55:56 2017 +0000
@@ -222,7 +222,7 @@
    *   java.util.ServiceConfigurationError service configuration error} or if
    *   the implementation is not available or cannot be instantiated.
    */
-  @Deprecated(since="7")
+  @Deprecated(since="1.7")
   public static XMLInputFactory newFactory()
     throws FactoryConfigurationError
   {
@@ -244,7 +244,7 @@
    *              #newFactory(java.lang.String, java.lang.ClassLoader)} method
    *              defines no changes in behavior.
    */
-  @Deprecated(since="7")
+  @Deprecated(since="1.7")
   public static XMLInputFactory newInstance(String factoryId,
           ClassLoader classLoader)
           throws FactoryConfigurationError {
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java	Thu Mar 16 17:55:56 2017 +0000
@@ -222,7 +222,7 @@
    *              Use the new method {@link #newFactory(java.lang.String,
    *              java.lang.ClassLoader)} instead.
    */
-  @Deprecated(since="7")
+  @Deprecated(since="1.7")
   public static XMLInputFactory newInstance(String factoryId,
           ClassLoader classLoader)
           throws FactoryConfigurationError {
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/AttributeList.java	Thu Mar 16 17:55:56 2017 +0000
@@ -93,7 +93,7 @@
  * @see org.xml.sax.DocumentHandler#startElement startElement
  * @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl
  */
-@Deprecated(since="5")
+@Deprecated(since="1.5")
 public interface AttributeList {
 
 
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/DocumentHandler.java	Thu Mar 16 17:55:56 2017 +0000
@@ -68,7 +68,7 @@
  * @see org.xml.sax.Locator
  * @see org.xml.sax.HandlerBase
  */
-@Deprecated(since="5")
+@Deprecated(since="1.5")
 public interface DocumentHandler {
 
 
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/Parser.java	Thu Mar 16 17:55:56 2017 +0000
@@ -73,7 +73,7 @@
  * @see org.xml.sax.HandlerBase
  * @see org.xml.sax.InputSource
  */
-@Deprecated(since="5")
+@Deprecated(since="1.5")
 public interface Parser
 {
 
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserFactory.java	Thu Mar 16 17:55:56 2017 +0000
@@ -64,7 +64,7 @@
  * @version 2.0.1 (sax2r2)
  */
 @SuppressWarnings( "deprecation" )
-@Deprecated(since="5")
+@Deprecated(since="1.5")
 public class ParserFactory {
     private static SecuritySupport ss = new SecuritySupport();
 
--- a/jaxp/src/java.xml/share/legal/bcel.md	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/legal/bcel.md	Thu Mar 16 17:55:56 2017 +0000
@@ -1,6 +1,6 @@
-## Apache Byte Code Engineering Library v5.2
+## Apache Byte Code Engineering Library (BCEL) v5.2
 
-### Notice
+### Apache BCEL Notice
 <pre>
 
     =========================================================================
--- a/jaxp/src/java.xml/share/legal/dom.md	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/legal/dom.md	Thu Mar 16 17:55:56 2017 +0000
@@ -1,6 +1,6 @@
-## DOM Level 3 core specification, v1.0
+## DOM Level 3 Core Specification v1.0
 
-## W3C License
+### W3C License
 <pre>
 
 W3C SOFTWARE NOTICE AND LICENSE
--- a/jaxp/src/java.xml/share/legal/xalan.md	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/legal/xalan.md	Thu Mar 16 17:55:56 2017 +0000
@@ -1,6 +1,6 @@
 ## Apache Xalan v2.7.1
 
-### Notice
+### Apache Xalan Notice
 <pre>
 
     ======================================================================================
--- a/jaxp/src/java.xml/share/legal/xerces.md	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/legal/xerces.md	Thu Mar 16 17:55:56 2017 +0000
@@ -1,7 +1,7 @@
 ## Apache Xerces v2.11.0
 
-### Notice
-
+### Apache Xerces Notice
+<pre>
     =========================================================================
     == NOTICE file corresponding to section 4(d) of the Apache License, ==
     == Version 2.0, in this case for the Apache Xerces Java distribution. ==
@@ -17,6 +17,7 @@
     - voluntary contributions made by Paul Eng on behalf of the
     Apache Software Foundation that were originally developed at iClick, Inc.,
     software copyright (c) 1999.
+</pre>
 
 ### Apache 2.0 License
 <pre>
--- a/jaxp/src/java.xml/share/legal/xmlresolver.md	Thu Mar 16 16:34:35 2017 +0000
+++ b/jaxp/src/java.xml/share/legal/xmlresolver.md	Thu Mar 16 17:55:56 2017 +0000
@@ -1,6 +1,6 @@
 ## Apache XML Resolver Library v1.2
 
-### Notice
+### Apache XML Resolver Notice
 <pre>
 
 Apache XML Commons Resolver
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks