From 44dbf46adf61b197525b00faebc2371cf0062b82 Mon Sep 17 00:00:00 2001 From: Steve Davidson Date: Thu, 17 Feb 2022 10:44:06 -0600 Subject: [PATCH] Sonarqube Fixes #1603 https://github.com/eclipse-ee4j/jaxb-ri/issues/1603 Fixed version in @Deprecated annotations. Signed-off-by: Steve Davidson --- .../main/java/com/sun/codemodel/JAnnotationArrayMember.java | 2 +- .../java/org/glassfish/jaxb/core/marshaller/Messages.java | 6 +++--- .../org/glassfish/jaxb/core/unmarshaller/DOMScanner.java | 4 ++-- jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java | 2 +- .../java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) 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 81a753bff..4f8e582ca 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 annotations2() { * @deprecated * use {@link #annotate} */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", 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 5b9e9eca6..679585f78 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", forRemoval=true) public static final String ERR_DANGLING_IDREF = // 1 arg "SAXMarshaller.DanglingIDREF"; /** * @deprecated only used from 1.0 */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", 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 6ea9f2dd7..d1b626d53 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", forRemoval=true) public void parseWithContext( Element e, ContentHandler handler ) throws SAXException { setContentHandler(handler); scan(e); 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 eb74c1d03..8d528a48d 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", 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 c2fd50022..af229e751 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(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -221,7 +221,7 @@ public int getColumn() { * @deprecated * @see #getEndLine */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", forRemoval=true) public int getLine() { return bufline[bufpos]; }