Skip to content

Commit c5c0636

Browse files
fixed: jck-16-signature tests (#25)
Addressed jck-16-signature tests failures.
1 parent ac44a17 commit c5c0636

23 files changed

+103
-88
lines changed

make/langtools/netbeans/nb-javac/build.xml

+8
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@
8080
<available file="../../../../../nbbuild/netbeans/java/modules/ext" type="dir" property="modules.ext.exists"/>
8181
</target>
8282

83+
<target name="-pre-compile">
84+
<mkdir dir="${build.dir}/depr-src/java/lang" />
85+
<echo file="${build.dir}/depr-src/java/lang/Deprecated.java">package java.lang; @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface Deprecated {public String since() default ""; }</echo>
86+
<mkdir dir="${build.dir}/depr-classes/" />
87+
<property name="build.depr.classes" location="${build.dir}/depr-classes/" />
88+
<javac srcdir="${build.dir}/depr-src/java/lang" destdir="${build.depr.classes}" />
89+
</target>
90+
8391
<target name="-separate-jars">
8492
<jar destfile="${dist.dir}/nb-javac-${nb-javac-ver}-api.jar">
8593
<fileset dir="${build.classes.dir}">

make/langtools/netbeans/nb-javac/nbproject/build-impl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ is divided into following sections:
10741074
</propertyfile>
10751075
<property location="${build.dir}/lib" name="lib.dir"/>
10761076
<mkdir dir="${lib.dir}"/>
1077-
<get dest="${lib.dir}">
1077+
<get skipexisting="true" dest="${lib.dir}">
10781078
<url url="${maven.repo.url}/junit/junit/4.12/junit-4.12.jar"/>
10791079
<url url="${maven.repo.url}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
10801080
</get>

make/langtools/netbeans/nb-javac/nbproject/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ javadoc.encoding=${source.encoding}
8181
build.test.classes.dir=${build.dir}/test/classes
8282
jar.index=${jnlp.enabled}
8383
src.classes2.dir=${file.reference.share-classes-2}
84-
javac.compilerargs=
84+
javac.compilerargs=-Xbootclasspath/p:${basedir}/build/depr-classes
8585
source.encoding=UTF-8
8686
jnlp.signing.keystore=
8787
meta.inf.dir=${src.dir}/META-INF

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public abstract class AbstractAnnotationValueVisitor6<R, P>
7979
* @deprecated Release 6 is obsolete; update to a visitor for a newer
8080
* release level.
8181
*/
82-
@Deprecated()
82+
@Deprecated(since="9")
8383
protected AbstractAnnotationValueVisitor6() {}
8484

8585
/**

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public abstract class AbstractAnnotationValueVisitor7<R, P> extends AbstractAnno
5454
* @deprecated Release 7 is obsolete; update to a visitor for a newer
5555
* release level.
5656
*/
57-
@Deprecated
57+
@Deprecated(since="12")
5858
protected AbstractAnnotationValueVisitor7() {
5959
super(); // Superclass constructor deprecated too
6060
}

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public abstract class AbstractElementVisitor6<R, P> implements ElementVisitor<R,
7979
* @deprecated Release 6 is obsolete; update to a visitor for a newer
8080
* release level.
8181
*/
82-
@Deprecated()
82+
@Deprecated(since="9")
8383
protected AbstractElementVisitor6(){}
8484

8585
/**

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class AbstractElementVisitor7<R, P> extends AbstractElementVisit
5757
* @deprecated Release 7 is obsolete; update to a visitor for a newer
5858
* release level.
5959
*/
60-
@Deprecated
60+
@Deprecated(since="12")
6161
protected AbstractElementVisitor7(){
6262
super(); // Superclass constructor deprecated too
6363
}

src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public abstract class AbstractTypeVisitor6<R, P> implements TypeVisitor<R, P> {
7878
* @deprecated Release 6 is obsolete; update to a visitor for a newer
7979
* release level.
8080
*/
81-
@Deprecated()
81+
@Deprecated(since="9")
8282
protected AbstractTypeVisitor6() {}
8383

8484
/**

src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class AbstractTypeVisitor7<R, P> extends AbstractTypeVisitor6<R,
5757
* @deprecated Release 7 is obsolete; update to a visitor for a newer
5858
* release level.
5959
*/
60-
@Deprecated
60+
@Deprecated(since="12")
6161
protected AbstractTypeVisitor7() {
6262
super(); // Superclass constructor deprecated too
6363
}

src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class ElementKindVisitor6<R, P>
9292
* @deprecated Release 6 is obsolete; update to a visitor for a newer
9393
* release level.
9494
*/
95-
@Deprecated()
95+
@Deprecated(since="9")
9696
protected ElementKindVisitor6() {
9797
super(null);
9898
}
@@ -105,7 +105,7 @@ protected ElementKindVisitor6() {
105105
* @deprecated Release 6 is obsolete; update to a visitor for a newer
106106
* release level.
107107
*/
108-
@Deprecated()
108+
@Deprecated(since="9")
109109
protected ElementKindVisitor6(R defaultValue) {
110110
super(defaultValue);
111111
}

src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class ElementKindVisitor7<R, P> extends ElementKindVisitor6<R, P> {
6868
* @deprecated Release 7 is obsolete; update to a visitor for a newer
6969
* release level.
7070
*/
71-
@Deprecated
71+
@Deprecated(since="12")
7272
protected ElementKindVisitor7() {
7373
super(null); // Superclass constructor deprecated too
7474
}
@@ -82,7 +82,7 @@ protected ElementKindVisitor7() {
8282
* @deprecated Release 7 is obsolete; update to a visitor for a newer
8383
* release level.
8484
*/
85-
@Deprecated
85+
@Deprecated(since="12")
8686
protected ElementKindVisitor7(R defaultValue) {
8787
super(defaultValue); // Superclass constructor deprecated too
8888
}

src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public class ElementScanner6<R, P> extends AbstractElementVisitor6<R, P> {
106106
* @deprecated Release 6 is obsolete; update to a visitor for a newer
107107
* release level.
108108
*/
109-
@Deprecated()
109+
@Deprecated(since="9")
110110
protected ElementScanner6(){
111111
DEFAULT_VALUE = null;
112112
}
@@ -119,7 +119,7 @@ protected ElementScanner6(){
119119
* @deprecated Release 6 is obsolete; update to a visitor for a newer
120120
* release level.
121121
*/
122-
@Deprecated()
122+
@Deprecated(since="9")
123123
protected ElementScanner6(R defaultValue){
124124
DEFAULT_VALUE = defaultValue;
125125
}

src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class ElementScanner7<R, P> extends ElementScanner6<R, P> {
8282
* @deprecated Release 7 is obsolete; update to a visitor for a newer
8383
* release level.
8484
*/
85-
@Deprecated
85+
@Deprecated(since="12")
8686
protected ElementScanner7(){
8787
super(null); // Superclass constructor deprecated too
8888
}
@@ -96,7 +96,7 @@ protected ElementScanner7(){
9696
* @deprecated Release 7 is obsolete; update to a visitor for a newer
9797
* release level.
9898
*/
99-
@Deprecated
99+
@Deprecated(since="12")
100100
protected ElementScanner7(R defaultValue){
101101
super(defaultValue); // Superclass constructor deprecated too
102102
}

src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class SimpleAnnotationValueVisitor6<R, P>
9494
* @deprecated Release 6 is obsolete; update to a visitor for a newer
9595
* release level.
9696
*/
97-
@Deprecated()
97+
@Deprecated(since="9")
9898
protected SimpleAnnotationValueVisitor6() {
9999
super();
100100
DEFAULT_VALUE = null;
@@ -108,7 +108,7 @@ protected SimpleAnnotationValueVisitor6() {
108108
* @deprecated Release 6 is obsolete; update to a visitor for a newer
109109
* release level.
110110
*/
111-
@Deprecated()
111+
@Deprecated(since="9")
112112
protected SimpleAnnotationValueVisitor6(R defaultValue) {
113113
super();
114114
DEFAULT_VALUE = defaultValue;

src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class SimpleAnnotationValueVisitor7<R, P> extends SimpleAnnotationValueVi
6060
* @deprecated Release 7 is obsolete; update to a visitor for a newer
6161
* release level.
6262
*/
63-
@Deprecated
63+
@Deprecated(since="12")
6464
protected SimpleAnnotationValueVisitor7() {
6565
super(null); // Superclass constructor deprecated too
6666
}
@@ -74,7 +74,7 @@ protected SimpleAnnotationValueVisitor7() {
7474
* @deprecated Release 7 is obsolete; update to a visitor for a newer
7575
* release level.
7676
*/
77-
@Deprecated
77+
@Deprecated(since="12")
7878
protected SimpleAnnotationValueVisitor7(R defaultValue) {
7979
super(defaultValue); // Superclass constructor deprecated too
8080
}

src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class SimpleElementVisitor6<R, P> extends AbstractElementVisitor6<R, P> {
9797
* @deprecated Release 6 is obsolete; update to a visitor for a newer
9898
* release level.
9999
*/
100-
@Deprecated()
100+
@Deprecated(since="9")
101101
protected SimpleElementVisitor6(){
102102
DEFAULT_VALUE = null;
103103
}
@@ -110,7 +110,7 @@ protected SimpleElementVisitor6(){
110110
* @deprecated Release 6 is obsolete; update to a visitor for a newer
111111
* release level.
112112
*/
113-
@Deprecated()
113+
@Deprecated(since="9")
114114
protected SimpleElementVisitor6(R defaultValue){
115115
DEFAULT_VALUE = defaultValue;
116116
}

src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class SimpleElementVisitor7<R, P> extends SimpleElementVisitor6<R, P> {
6666
* @deprecated Release 7 is obsolete; update to a visitor for a newer
6767
* release level.
6868
*/
69-
@Deprecated
69+
@Deprecated(since="12")
7070
protected SimpleElementVisitor7(){
7171
super(null); // Superclass constructor deprecated too
7272
}
@@ -80,7 +80,7 @@ protected SimpleElementVisitor7(){
8080
* @deprecated Release 7 is obsolete; update to a visitor for a newer
8181
* release level.
8282
*/
83-
@Deprecated
83+
@Deprecated(since="12")
8484
protected SimpleElementVisitor7(R defaultValue){
8585
super(defaultValue); // Superclass constructor deprecated too
8686
}

src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class SimpleTypeVisitor6<R, P> extends AbstractTypeVisitor6<R, P> {
9797
* @deprecated Release 6 is obsolete; update to a visitor for a newer
9898
* release level.
9999
*/
100-
@Deprecated()
100+
@Deprecated(since="9")
101101
protected SimpleTypeVisitor6(){
102102
DEFAULT_VALUE = null;
103103
}
@@ -110,7 +110,7 @@ protected SimpleTypeVisitor6(){
110110
* @deprecated Release 6 is obsolete; update to a visitor for a newer
111111
* release level.
112112
*/
113-
@Deprecated()
113+
@Deprecated(since="9")
114114
protected SimpleTypeVisitor6(R defaultValue){
115115
DEFAULT_VALUE = defaultValue;
116116
}

src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class SimpleTypeVisitor7<R, P> extends SimpleTypeVisitor6<R, P> {
6666
* @deprecated Release 7 is obsolete; update to a visitor for a newer
6767
* release level.
6868
*/
69-
@Deprecated
69+
@Deprecated(since="12")
7070
protected SimpleTypeVisitor7(){
7171
super(null); // Superclass constructor deprecated too
7272
}
@@ -80,7 +80,7 @@ protected SimpleTypeVisitor7(){
8080
* @deprecated Release 7 is obsolete; update to a visitor for a newer
8181
* release level.
8282
*/
83-
@Deprecated
83+
@Deprecated(since="12")
8484
protected SimpleTypeVisitor7(R defaultValue){
8585
super(defaultValue); // Superclass constructor deprecated too
8686
}

src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class TypeKindVisitor6<R, P> extends SimpleTypeVisitor6<R, P> {
8989
* @deprecated Release 6 is obsolete; update to a visitor for a newer
9090
* release level.
9191
*/
92-
@Deprecated()
92+
@Deprecated(since="9")
9393
protected TypeKindVisitor6() {
9494
super(null);
9595
}
@@ -103,7 +103,7 @@ protected TypeKindVisitor6() {
103103
* @deprecated Release 6 is obsolete; update to a visitor for a newer
104104
* release level.
105105
*/
106-
@Deprecated()
106+
@Deprecated(since="9")
107107
protected TypeKindVisitor6(R defaultValue) {
108108
super(defaultValue);
109109
}

src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class TypeKindVisitor7<R, P> extends TypeKindVisitor6<R, P> {
6868
* @deprecated Release 7 is obsolete; update to a visitor for a newer
6969
* release level.
7070
*/
71-
@Deprecated
71+
@Deprecated(since="12")
7272
protected TypeKindVisitor7() {
7373
super(null); // Superclass constructor deprecated too
7474
}
@@ -82,7 +82,7 @@ protected TypeKindVisitor7() {
8282
* @deprecated Release 7 is obsolete; update to a visitor for a newer
8383
* release level.
8484
*/
85-
@Deprecated
85+
@Deprecated(since="12")
8686
protected TypeKindVisitor7(R defaultValue) {
8787
super(defaultValue); // Superclass constructor deprecated too
8888
}

0 commit comments

Comments
 (0)