Honor Systems generated updates

eclipse-ee4j#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 <[email protected]> Signed-off-by: Honor Systems Updater Jenkins <[email protected]>
j2eeguys · Jun 20, 2022 · 146888f · 146888f
1 parent 7a829b5
commit 146888f
Show file tree

Hide file tree

Showing 46 changed files with 72 additions and 77 deletions.
diff --git a/...ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java b/...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
@@ -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 <? extends Annotation> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...laxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java b/...laxng-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
@@ -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 <grammar>} element of the {@code <include>}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
@@ -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/...rnal/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/...rnal/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,15 +387,15 @@ public char readChar() throws EOFException {
     /**
      * @deprecated @see #getEndColumn
      */
-    @Deprecated
+    @Deprecated(since="4.0.0", forRemoval=true)
     public int getColumn() {
         return bufcolumn[bufpos];
     }
 
     /**
      * @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
@@ -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
@@ -162,7 +162,7 @@ private static <T> T getPropertyValue(Map<String, Object> properties, String key
      *
      * @deprecated use {@code createContext(Class[] classes, Map<String,Object> properties)} method instead
      */
-    @Deprecated
+    @Deprecated(since="4.0.0", forRemoval=true)
     public static JAXBRIContext createContext( Class[] classes,
             Collection<TypeReference> typeRefs, Map<Class,Class> subclassReplacements,
             String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar,
@@ -177,7 +177,7 @@ public static JAXBRIContext createContext( Class[] classes,
      *
      * @deprecated use {@code createContext( Class[] classes, Map<String,Object> properties)} method instead
      */
-    @Deprecated
+    @Deprecated(since="4.0.0", forRemoval=true)
     public static JAXBRIContext createContext( Class[] classes,
             Collection<TypeReference> typeRefs, Map<Class,Class> 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
@@ -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/...ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java b/...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/...time/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java b/...time/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<TypeT,ClassDeclT> asElement() {
         return null;
     }

diff --git a/...ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java b/...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<T,C,F,M> getScope() {
         return null;
     }

diff --git a/.../runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java b/.../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/...runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java b/...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<T, C> getSubstitutionHead() {
         return null;
     }
@@ -229,7 +229,7 @@ public Element<T,C> asElement() {
      *      you shouldn't be invoking this method on {@link ClassInfoImpl}.
      */
     @Override
-    @Deprecated
+    @Deprecated(since="4.0.0", forRemoval=true)
     public ClassInfo<T,C> getScope() {
         return null;
     }

diff --git a/...-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java b/...-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
@@ -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/...pl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java b/...pl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java
@@ -500,15 +500,15 @@ public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
     /**
      * @deprecated since 2.0
      */
-    @Deprecated
+    @Deprecated(since="2.0", forRemoval=true)
     public boolean isValidating() {
         throw new UnsupportedOperationException();
     }
 
     /**
      * @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
@@ -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
@@ -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();