Bug 530305 - [null] consider opening @NonNullByDefault to all default

target positions

Change-Id: Ieb3a5ce5588af9bf18bf73edcda25b7669019319

4 files changed, 15 insertions, 5 deletions

diff --git a/org.eclipse.jdt.annotation/.settings/.api_filters b/org.eclipse.jdt.annotation/.settings/.api_filters
new file mode 100644
index 0000000000..61e6c791f7
--- /dev/null
+++ b/org.eclipse.jdt.annotation/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jdt.annotation" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="Target of NonNullByDefault has been removed" id="926941240">
+            <message_arguments>
+                <message_argument value="2.2.0"/>
+                <message_argument value="2.1.100"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
index 0846b22fb6..f0bfa5d08e 100644
--- a/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.annotation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Localization: bundle
 Bundle-SymbolicName: org.eclipse.jdt.annotation
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.jdt.annotation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.annotation/pom.xml b/org.eclipse.jdt.annotation/pom.xml
index 9388ccce7d..21ebdecec4 100644
--- a/org.eclipse.jdt.annotation/pom.xml
+++ b/org.eclipse.jdt.annotation/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.annotation</artifactId>
-  <version>2.1.200-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
index 8004851f6d..98c75a9058 100644
--- a/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
+++ b/org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java
@@ -17,7 +17,6 @@ import static org.eclipse.jdt.annotation.DefaultLocation.*;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
  
 /**
  * Applying this annotation to a declaration has the effect that type references,
@@ -47,7 +46,8 @@ import java.lang.annotation.Target;
  * <code>package-info.java</code> is used.
  * </p>
  * <p>
- * <b>Note:</b> Since org.eclipse.jdt.annotation 2.0.0, this annotation also applies to field and local variable declarations.
+ * <b>Note:</b> Since org.eclipse.jdt.annotation 2.0.0, this annotation also applies to field and 
+ * local variable declarations and since 2.2.0 also to parameter and module declarations.
  * For the old API, see
  * <a href="http://help.eclipse.org/kepler/topic/org.eclipse.jdt.doc.isv/reference/api/org/eclipse/jdt/annotation/NonNullByDefault.html">
  * <code>@NonNullByDefault</code> in 1.1.0</a>.
@@ -56,7 +56,6 @@ import java.lang.annotation.Target;
  */
 @Documented
 @Retention(RetentionPolicy.CLASS)
-@Target({ ElementType.PACKAGE, ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE })
 public @interface NonNullByDefault {
 	/**
 	 * Specifies the set of locations within the annotated declaration that should be affected by the nonnull default.