diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
index 25f84436a..7d810f607 100644
--- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
+++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
@@ -266,7 +266,7 @@ public Collection<JAnnotationValue> annotations2() {
      * @deprecated
      *      use {@link #annotate}
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public JAnnotationArrayMember param (JAnnotationUse value ){
         values.add(value);
         return this;
diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
index 1b34f0018..042031ee5 100644
--- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
+++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
@@ -69,7 +69,7 @@ static String format( String property, Object[] args ) {
     /**
      * @deprecated use ERR_MISSING_OBJECT2
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public static final String ERR_MISSING_OBJECT = // 0 args
         "SAXMarshaller.MissingObject";
     
@@ -84,14 +84,14 @@ static String format( String property, Object[] args ) {
     /**
      * @deprecated only used from 1.0
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public static final String ERR_DANGLING_IDREF = // 1 arg
         "SAXMarshaller.DanglingIDREF";
 
     /**
      * @deprecated only used from 1.0
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public static final String ERR_NOT_IDENTIFIABLE = // 0 args
         "SAXMarshaller.NotIdentifiable";
 
diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
index 6490fa345..3b9586064 100644
--- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
+++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
@@ -121,7 +121,7 @@ public void scan( Element e) throws SAXException {
      * @deprecated in JAXB 2.0
      *      Use {@link #scan(Element)}
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public void parse( Element e, ContentHandler handler ) throws SAXException {
         // it might be better to set receiver at the constructor.
         receiver = handler;
@@ -143,7 +143,7 @@ public void parse( Element e, ContentHandler handler ) throws SAXException {
      * @deprecated in JAXB 2.0
      *      Use {@link #scan(Element)}
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     public void parseWithContext( Element e, ContentHandler handler ) throws SAXException {
         setContentHandler(handler);
         scan(e);
diff --git a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
index 0898571da..04defded5 100644
--- a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
+++ b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
@@ -58,7 +58,7 @@ public final class ConfigReader  {
      * The set of classes to be passed to XJC
      *
      */
-    private final Set<Reference> classesToBeIncluded = new HashSet<Reference>();
+    private final Set<Reference> classesToBeIncluded = new HashSet<>();
 
 
     /**
@@ -229,7 +229,7 @@ private static final class SchemaOutputResolverImpl extends SchemaOutputResolver
          * Namespace URI to the location of the schema.
          * This captures what the user specifies.
          */
-        private final Map<String,File> schemas = new HashMap<String,File>();
+        private final Map<String,File> schemas = new HashMap<>();
 
 
         /**
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
index 872cc3af6..19c84624d 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
@@ -78,7 +78,7 @@ public <T extends XmlAdapter> boolean containsAdapter(Class<T> type) {
     }
 
     // this much is necessary to avoid calling get and set twice when we push.
-    private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<Coordinator>();
+    private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<>();
 
     /**
      * The {@link Coordinator} in charge before this {@link Coordinator}.
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
index 474594336..d6c599619 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
@@ -212,7 +212,7 @@ public ItemT[] build() {
     /**
      * Listers for the primitive type arrays, keyed by their primitive Class object.
      */
-    /*package*/ static final Map<Class,Lister> primitiveArrayListers = new HashMap<Class,Lister>();
+    /*package*/ static final Map<Class,Lister> primitiveArrayListers = new HashMap<>();
 
     static {
         // register primitive array listers
diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
index 250eda644..f4745575c 100644
--- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
+++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
@@ -113,7 +113,7 @@ public interface XSSchema extends XSComponent
      *      this method from {@link XSSchema} and not from {@link XSComponent},
      *      there's something wrong with your code.
      */
-    @Deprecated
+    @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
     SchemaDocument getSourceDocument();
 
     /**
diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
index e7118487b..60272e23a 100644
--- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
+++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
@@ -212,7 +212,7 @@ public char readChar() throws java.io.IOException
    * @deprecated 
    * @see #getEndColumn
    */
-  @Deprecated
+  @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
   public int getColumn() {
      return bufcolumn[bufpos];
   }
@@ -221,7 +221,7 @@ public int getColumn() {
    * @deprecated 
    * @see #getEndLine
    */
-  @Deprecated
+  @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
   public int getLine() {
      return bufline[bufpos];
   }