From 146888f42d043c15bef08a3c3a5c7083e7f0d1e3 Mon Sep 17 00:00:00 2001 From: Honor Systems Updater Jenkins Date: Mon, 20 Jun 2022 02:41:33 +0000 Subject: [PATCH] Honor Systems generated updates https://github.com/eclipse-ee4j/jaxb-ri/issues/1603 Automatic updates https://jenkins.updater.j2eeguys.com/ txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/Model.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java Remove this unused import 'com.sun.tools.rngom.parse.Parseable'. [java:S1128] xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java Remove this unused import 'com.sun.xml.xsom.ForeignAttributes'. [java:S1128] xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/XJCBase.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java Remove this unused import 'java.io.UnsupportedEncodingException'. [java:S1128] codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java Remove this unused import 'java.net.MalformedURLException'. [java:S1128] Remove this unused import 'java.net.URL'. [java:S1128] xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] Also-by: Stephen Davidson Signed-off-by: Honor Systems Updater Jenkins --- .../src/main/java/com/sun/codemodel/ac/ACTask.java | 2 -- .../src/main/java/com/sun/codemodel/JAnnotationUse.java | 2 +- .../src/main/java/com/sun/codemodel/JClassContainer.java | 2 +- .../src/main/java/com/sun/codemodel/JCodeModel.java | 2 +- .../src/main/java/com/sun/codemodel/JDefinedClass.java | 2 +- .../src/main/java/com/sun/codemodel/JPackage.java | 2 +- .../src/main/java/com/sun/codemodel/JPrimitiveType.java | 2 +- .../java/org/glassfish/jaxb/core/annotation/XmlIsSet.java | 4 ++-- .../org/glassfish/jaxb/core/marshaller/DataWriter.java | 4 ++-- .../org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java | 4 ++-- .../tools/rngdatatype/helpers/DatatypeLibraryLoader.java | 1 - .../com/sun/tools/rngom/ast/builder/IncludedGrammar.java | 3 +-- .../com/sun/tools/rngom/parse/compact/JavaCharStream.java | 6 +++--- .../rngom/parse/compact/UCode_UCodeESC_CharStream.java | 6 +++--- .../org/glassfish/jaxb/runtime/DatatypeConverterImpl.java | 2 +- .../org/glassfish/jaxb/runtime/v2/ContextFactory.java | 4 ++-- .../glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java | 4 ++-- .../jaxb/runtime/v2/model/impl/ArrayInfoImpl.java | 2 +- .../jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java | 6 +++--- .../jaxb/runtime/v2/model/impl/ClassInfoImpl.java | 2 +- .../jaxb/runtime/v2/model/impl/ElementInfoImpl.java | 4 ++-- .../jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java | 6 +++--- .../jaxb/runtime/v2/model/impl/LeafInfoImpl.java | 4 ++-- .../glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java | 2 +- .../runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java | 4 ++-- .../src/main/java/com/sun/xml/txw2/output/DataWriter.java | 4 ++-- .../java/com/sun/xml/txw2/output/IndentingXMLFilter.java | 4 ++-- .../com/sun/xml/txw2/output/IndentingXMLStreamWriter.java | 4 ++-- jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java | 2 +- .../src/main/java/com/sun/tools/xjc/api/JAXBModel.java | 4 ++-- .../main/java/com/sun/tools/xjc/api/SchemaCompiler.java | 2 +- .../com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java | 4 ++-- .../java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java | 8 ++++---- .../src/main/java/com/sun/tools/xjc/model/CClassInfo.java | 2 +- .../main/java/com/sun/tools/xjc/model/CElementInfo.java | 2 +- .../main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java | 4 ++-- .../main/java/com/sun/tools/xjc/model/CPropertyInfo.java | 2 +- .../xjc/src/main/java/com/sun/tools/xjc/model/Model.java | 4 ++-- .../java/com/sun/tools/xjc/model/nav/NavigatorImpl.java | 2 +- .../main/java/com/sun/tools/xjc/reader/gbind/Element.java | 2 +- .../src/main/java/com/sun/xml/xsom/XSDeclaration.java | 4 ++-- .../src/main/java/com/sun/xml/xsom/XSElementDecl.java | 4 ++-- .../main/java/com/sun/xml/xsom/impl/DeclarationImpl.java | 2 +- .../src/main/java/com/sun/xml/xsom/impl/ElementDecl.java | 2 +- .../src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java | 1 - .../sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java | 4 ++-- 46 files changed, 72 insertions(+), 77 deletions(-) diff --git a/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java b/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java index 11d9577f5..38ce6de24 100644 --- a/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java +++ b/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java @@ -32,8 +32,6 @@ import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java index 6aee994e7..6280b4fd8 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java @@ -373,7 +373,7 @@ public JAnnotationArrayMember paramArray(String name){ * @deprecated * use {@link JAnnotationArrayMember#annotate} */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JAnnotationUse annotate(Class clazz) { return new JAnnotationUse(owner().ref(clazz)); } diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java index f59f6395d..e887e687c 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java @@ -80,7 +80,7 @@ public interface JClassContainer { * @deprecated * use {@link #_class(int, String, ClassType)} */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) JDefinedClass _class(int mods, String name, boolean isInterface) throws JClassAlreadyExistsException; diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java index bbca727b0..c6fb6685e 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java @@ -249,7 +249,7 @@ public JDefinedClass _getClass(String fullyQualifiedName) { * The naming convention doesn't match the rest of the CodeModel. * Use {@link #anonymousClass(JClass)} instead. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JDefinedClass newAnonymousClass(JClass baseType) { return new JAnonymousClass(baseType); } diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java index bed061827..0ff106114 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java @@ -652,7 +652,7 @@ public JDefinedClass _class(int mods, String name) * * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public JDefinedClass _class(int mods, String name, boolean isInterface) throws JClassAlreadyExistsException { return _class(mods,name,isInterface?ClassType.INTERFACE:ClassType.CLASS); diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java index ffcc6b4f9..a90d17f42 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java @@ -143,7 +143,7 @@ public JDefinedClass _class(int mods, String name) throws JClassAlreadyExistsExc * * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public JDefinedClass _class( int mods, String name, boolean isInterface ) throws JClassAlreadyExistsException { return _class(mods,name, isInterface?ClassType.INTERFACE:ClassType.CLASS ); diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java index 809790642..36db26b1e 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java @@ -79,7 +79,7 @@ public JType unboxify() { * @deprecated * Use {@link #boxify()}. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JClass getWrapperClass() { return boxify(); } diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java index 4b1e2aca1..6aba2de0b 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -90,7 +90,7 @@ */ @Retention(RUNTIME) @Target({FIELD,METHOD}) -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public @interface XmlIsSet { /** * Specifies the name of the property to attach to. diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java index 65d6ea222..0e47e8cf0 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java @@ -131,7 +131,7 @@ public DataWriter (Writer writer, String encoding ) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -148,7 +148,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder buf = new StringBuilder(); diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java index d4e2df840..737e36a46 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -82,7 +82,7 @@ public SAX2DOMEx(DocumentBuilderFactory f) throws ParserConfigurationException { * Creates a fresh empty DOM document and adds nodes under this document. * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public SAX2DOMEx() throws ParserConfigurationException { DocumentBuilderFactory factory = XmlFactory.createDocumentBuilderFactory(false); factory.setValidating(false); diff --git a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java index c0b6b8fd5..26579fee6 100644 --- a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java +++ b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java @@ -43,7 +43,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.io.UnsupportedEncodingException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Enumeration; diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java index 5ec43ab55..ea1fc382e 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2015 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,7 +24,6 @@ import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; import com.sun.tools.rngom.ast.om.Location; import com.sun.tools.rngom.ast.om.ParsedPattern; -import com.sun.tools.rngom.parse.Parseable; /** * {@link Scope} for {@code } element of the {@code }d grammar. diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java index 77aaa4386..83340b238 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2011 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -372,7 +372,7 @@ public char readChar() throws java.io.IOException * @deprecated * @see #getEndColumn */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -381,7 +381,7 @@ public int getColumn() { * @deprecated * @see #getEndLine */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getLine() { return bufline[bufpos]; } diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java index 8e35817fd..59e30e8de 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2012 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -387,7 +387,7 @@ public char readChar() throws EOFException { /** * @deprecated @see #getEndColumn */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -395,7 +395,7 @@ public int getColumn() { /** * @deprecated @see #getEndLine */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getLine() { return bufline[bufpos]; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java index 3620f10bf..4a63f997f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java @@ -43,7 +43,7 @@ * @deprecated in JAXB 2.2.4 - use jakarta.xml.bind.DatatypeConverterImpl instead * or let us know why you can't */ -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public final class DatatypeConverterImpl implements DatatypeConverterInterface { @Deprecated diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java index 79f753b51..2b81cc6c3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java @@ -162,7 +162,7 @@ private static T getPropertyValue(Map properties, String key * * @deprecated use {@code createContext(Class[] classes, Map properties)} method instead */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public static JAXBRIContext createContext( Class[] classes, Collection typeRefs, Map subclassReplacements, String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar, @@ -177,7 +177,7 @@ public static JAXBRIContext createContext( Class[] classes, * * @deprecated use {@code createContext( Class[] classes, Map properties)} method instead */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public static JAXBRIContext createContext( Class[] classes, Collection typeRefs, Map subclassReplacements, String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar, diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java index d352e7c07..f912523ff 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -66,7 +66,7 @@ public Location getLocation() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return true; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java index 5d8c01a73..dac47d560 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java @@ -82,7 +82,7 @@ public TypeT getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java index 577a00361..c61b03700 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java @@ -48,7 +48,7 @@ public final QName[] getTypeNames() { * @deprecated always return false at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean isElement() { return false; } @@ -57,7 +57,7 @@ public final boolean isElement() { * @deprecated always return null at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final QName getElementName() { return null; } @@ -66,7 +66,7 @@ public final QName getElementName() { * @deprecated always return null at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final Element asElement() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java index 03800ae84..8fcc9edd9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java @@ -241,7 +241,7 @@ public final C getClazz() { * you shouldn't be invoking this method on . */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public ClassInfoImpl getScope() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java index 19dfe6fc7..a5a1c1bd2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -366,7 +366,7 @@ public T getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java index 21a0597fe..694fa8357 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java @@ -148,7 +148,7 @@ public boolean isToken() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } @@ -198,7 +198,7 @@ public void link() { * @deprecated if you are invoking this method directly, there's something wrong. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public Element getSubstitutionHead() { return null; } @@ -229,7 +229,7 @@ public Element asElement() { * you shouldn't be invoking this method on {@link ClassInfoImpl}. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public ClassInfo getScope() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java index bd52d9bbf..e28141568 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -48,7 +48,7 @@ public TypeT getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java index 36a31dd6f..3b94f2813 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java @@ -176,7 +176,7 @@ public final class XMLSerializer extends Coordinator { * {@link Base64Data} is no longer cached, so that * XMLStreamWriterEx impl can retain the data, like JAX-WS does. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public Base64Data getCachedBase64DataInstance() { return new Base64Data(); } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java index efd33cf9a..53150327f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java @@ -500,7 +500,7 @@ public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) { /** * @deprecated since 2.0 */ - @Deprecated + @Deprecated(since="2.0", forRemoval=true) public boolean isValidating() { throw new UnsupportedOperationException(); } @@ -508,7 +508,7 @@ public boolean isValidating() { /** * @deprecated since 2.0 */ - @Deprecated + @Deprecated(since="2.0", forRemoval=true) public void setValidating(boolean validating) { throw new UnsupportedOperationException(); } diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java index d4ba20d81..7f2d5c2a2 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java @@ -135,7 +135,7 @@ public DataWriter (Writer writer) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -152,7 +152,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder s = new StringBuilder(); diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java index 98ba0d58a..c20287fb4 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java @@ -61,7 +61,7 @@ public void setLexicalHandler(LexicalHandler lexical) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -78,7 +78,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder s = new StringBuilder(); diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java index f31afb088..a607fe087 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java @@ -46,7 +46,7 @@ public IndentingXMLStreamWriter(XMLStreamWriter writer) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep() { return indentStep.length(); } @@ -62,7 +62,7 @@ public int getIndentStep() { * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep(int indentStep) { StringBuilder s = new StringBuilder(); for (; indentStep > 0; indentStep--) s.append(' '); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java index 9c00aa62a..ea5a9afbb 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java @@ -338,7 +338,7 @@ public void setFailonerror(boolean value) { * * @deprecated not much need for JAXB2, as we now use much less stack. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setStackSize(String ss) { try { stackSize = Long.parseLong(ss); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java index bfaf8fe14..1cb513017 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -39,7 +39,7 @@ public interface JAXBModel { * @deprecated * this method is provided for now to allow gradual migration for JAX-RPC. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) List getClassList(); } diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java index ecae0812b..14f150ad8 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java @@ -235,6 +235,6 @@ public interface SchemaCompiler { * {@link Options} class in the compatible fashion. So please don't * use this method unless you know what you're doing. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @NotNull Options getOptions(); } diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java index 946a5a512..c4debdffb 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -66,7 +66,7 @@ public final XSComponent getSchemaComponent() { * @deprecated * why are you calling an unimplemented method? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean canBeReferencedByIDREF() { // we aren't doing any error check in XJC, so no point in implementing this method. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java index 5cc983786..0f483806c 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java @@ -181,7 +181,7 @@ public final TypeUse makeMimeTyped( MimeType mt ) { /** * @deprecated always return false at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean isElement() { return false; @@ -190,7 +190,7 @@ public final boolean isElement() { /** * @deprecated always return null at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final QName getElementName() { return null; @@ -199,7 +199,7 @@ public final QName getElementName() { /** * @deprecated always return null at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final Element asElement() { return null; @@ -229,7 +229,7 @@ public final QName[] getTypeNames() { * @deprecated * why are you calling a method whose return value is always known? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean canBeReferencedByIDREF() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java index d2b7517db..d8b502662 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java @@ -320,7 +320,7 @@ public boolean isOrdered() { * @deprecated * if you are calling this method directly, you must be doing something wrong. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean isFinal() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java index 0d788a988..dd4c6e936 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java @@ -193,7 +193,7 @@ public CClassInfo getScope() { /** * @deprecated why are you calling a method that returns this? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public NType getType() { return this; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java index 41e97a5a3..b37493723 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -144,7 +144,7 @@ public NType getType() { * @deprecated * why are you calling the method whose return value is known? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean canBeReferencedByIDREF() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java index d5c70871a..f8bf4df3c 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java @@ -173,7 +173,7 @@ public final XSComponent getSchemaComponent() { * * @see #getName(boolean) */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public String getName() { return getName(false); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java index 17cb6d740..9ded2e60f 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java @@ -401,7 +401,7 @@ public Iterable getAllElements() { * @deprecated * Always return null. Perhaps you are interested in {@link #schemaComponent}? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public XSComponent getSchemaComponent() { return null; @@ -411,7 +411,7 @@ public XSComponent getSchemaComponent() { * @deprecated * No line number available for the "root" component. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public Locator getLocator() { LocatorImpl r = new LocatorImpl(); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java index bf3d76568..0e3737851 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java @@ -310,7 +310,7 @@ public boolean isAbstract(NClass clazz) { * @deprecated * no class generated by XJC is final. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean isFinal(NClass clazz) { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java index 59fc01080..95ee8e1be 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java @@ -108,7 +108,7 @@ public boolean contains(ElementSet rhs) { * @deprecated * if you statically call this method, there's something wrong. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public Iterator iterator() { return Collections.singleton(this).iterator(); diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java index 52e1fa9c5..db8a21447 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -35,7 +35,7 @@ public interface XSDeclaration extends XSComponent * @deprecated use the isGlobal method, which always returns * the opposite of this function. Or the isLocal method. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) boolean isAnonymous(); /** diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java index b4e72a501..13ad1412f 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -89,7 +89,7 @@ public interface XSElementDecl extends XSDeclaration, XSTerm * inefficient when working with a large schema. Use * {@link #getSubstitutables()} instead. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) XSElementDecl[] listSubstitutables(); /** diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java index 31bc2d158..f63923985 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java @@ -34,7 +34,7 @@ abstract class DeclarationImpl extends ComponentImpl implements XSDeclaration private final boolean anonymous; /** @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public boolean isAnonymous() { return anonymous; } public final boolean isGlobal() { return !isAnonymous(); } diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java index 34be8f677..0a9ba02a2 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java @@ -120,7 +120,7 @@ public Boolean getForm() { * @deprecated */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public XSElementDecl[] listSubstitutables() { Set s = getSubstitutables(); return s.toArray(new XSElementDecl[0]); diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java index c4982ddbf..052a73c6e 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java @@ -10,7 +10,6 @@ package com.sun.xml.xsom.impl; -import com.sun.xml.xsom.ForeignAttributes; import com.sun.xml.xsom.XSContentType; import com.sun.xml.xsom.XSParticle; import com.sun.xml.xsom.XSSimpleType; diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java index ff0b83687..c2ec36ae4 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java @@ -32,7 +32,7 @@ * @author * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) */ -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public class SAXParserFactoryAdaptor extends SAXParserFactory { private final XMLParser parser; @@ -60,7 +60,7 @@ private class SAXParserImpl extends SAXParser /** * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public org.xml.sax.Parser getParser() throws SAXException { return new XMLReaderAdapter(reader); }