diff -r 732289cfaec2 api.annotations.common/apichanges.xml
--- a/api.annotations.common/apichanges.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/api.annotations.common/apichanges.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -108,6 +108,22 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="SuppressWarningsJustification">
+            <api name="common_annotations_api"/>
+            <summary>Added justification attribute to <code>SuppressWarnings</code></summary>
+            <version major="1" minor="19"/>
+            <date day="1" month="2" year="2013"/>
+            <author login="phejl"/>
+            <compatibility addition="yes"/>
+            <description>
+                <p>
+                    Introduced justificatio attribute to specify why it is ok to
+                    suppress a warning.
+                </p>
+            </description>
+            <class package="org.netbeans.api.annotations.common" name="SuppressWarnings"/>
+            <issue number="221381"/>
+        </change>
         <change id="StaticResource">
             <api name="common_annotations_api"/>
             <summary>Added <code>StaticResource</code></summary>
diff -r 732289cfaec2 api.annotations.common/manifest.mf
--- a/api.annotations.common/manifest.mf	Fri Jan 25 15:12:15 2013 +0100
+++ b/api.annotations.common/manifest.mf	Fri Jan 25 16:50:12 2013 +0100
@@ -2,5 +2,5 @@
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.api.annotations.common/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/annotations/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
 
diff -r 732289cfaec2 api.annotations.common/src/org/netbeans/api/annotations/common/SuppressWarnings.java
--- a/api.annotations.common/src/org/netbeans/api/annotations/common/SuppressWarnings.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/api.annotations.common/src/org/netbeans/api/annotations/common/SuppressWarnings.java	Fri Jan 25 16:50:12 2013 +0100
@@ -62,4 +62,13 @@
      */
     String[] value() default {};
 
+    /**
+     * The justification for the suppression. Should be human readable
+     * description explaining why it is ok to suppress the message(s).
+     *
+     * @return the justification for the suppression
+     * @since 1.19
+     */
+    String justification() default "";
+
 }
diff -r 732289cfaec2 j2ee.dd/build.xml
--- a/j2ee.dd/build.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.dd/build.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -86,7 +86,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_web_2_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_4;</echo>
+        <echo file="${s2b_root_web_2_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_4;</echo>
 	<schema2beans schema="${s2b_res_root}/web-app_2_5.xsd"
 	  mddFile="${s2b_res_root}/web-app_2_5.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.web.model_2_5"
@@ -97,7 +97,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_web_2_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_5;</echo>
+        <echo file="${s2b_root_web_2_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_5;</echo>
 	<schema2beans schema="${s2b_res_root}/web-app_3_0.xsd"
 	  mddFile="${s2b_res_root}/web-app_3_0.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.web.model_3_0"
@@ -108,7 +108,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_web_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0;</echo>
+        <echo file="${s2b_root_web_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0;</echo>
 	<schema2beans schema="${s2b_res_root}/web-fragment_3_0.xsd"
 	  mddFile="${s2b_res_root}/web-fragment_3_0.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.web.model_3_0_frag"
@@ -119,7 +119,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_web_3_0_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0_frag;</echo>
+        <echo file="${s2b_root_web_3_0_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0_frag;</echo>
 
     <replace file="${s2b_root_web_2_5}/ServletMapping.java" summary="true">
         <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
@@ -288,7 +288,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_2_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_2_1;</echo>
+        <echo file="${s2b_root_2_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_2_1;</echo>
 	<schema2beans schema="${s2b_res_root}/ejb-jar_3_0.xsd"
  	  mddFile="${s2b_res_root}/ejb-jar_3_0.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.ejb.model_3_0"
@@ -299,7 +299,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_0;</echo>
+        <echo file="${s2b_root_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_0;</echo>
 	<schema2beans schema="${s2b_res_root}/ejb-jar_3_1.xsd"
  	  mddFile="${s2b_res_root}/ejb-jar_3_1.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1"
@@ -310,7 +310,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_3_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1;</echo>
+        <echo file="${s2b_root_3_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1;</echo>
     <replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
         <replacetoken>public java.lang.String getVersion() {</replacetoken>
         <replacevalue>public java.lang.String getVersionString() {</replacevalue>
@@ -337,7 +337,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_app_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_1_4;</echo>
+        <echo file="${s2b_root_app_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_1_4;</echo>
         <schema2beans schema="${s2b_res_root}/application_5.xsd"
  	  mddFile="${s2b_res_root}/application_5.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.application.model_5"
@@ -348,7 +348,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_app_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_5;</echo>
+        <echo file="${s2b_root_app_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_5;</echo>
         <schema2beans schema="${s2b_res_root}/application_6.xsd"
  	  mddFile="${s2b_res_root}/application_6.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.application.model_6"
@@ -359,7 +359,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_app_6}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_6;</echo>
+        <echo file="${s2b_root_app_6}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_6;</echo>
     <replace file="${s2b_root_app_6}/Application.java" summary="true">
         <replacetoken>public java.lang.String getVersion() {</replacetoken>
         <replacevalue>public java.lang.String getVersionString() {</replacevalue>
@@ -386,7 +386,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_client_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_1_4;</echo>
+        <echo file="${s2b_root_client_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_1_4;</echo>
         <schema2beans schema="${s2b_res_root}/application-client_5.xsd"
  	  mddFile="${s2b_res_root}/application-client_5.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.client.model_5_0"
@@ -397,7 +397,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_client_5_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_5_0;</echo>
+        <echo file="${s2b_root_client_5_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_5_0;</echo>
         <schema2beans schema="${s2b_res_root}/application-client_6.xsd"
  	  mddFile="${s2b_res_root}/application-client_6.mdd"
 	  package="org.netbeans.modules.j2ee.dd.impl.client.model_6_0"
@@ -408,7 +408,7 @@
 	  removeUnreferencedNodes="true"
 	  rootDir="src"
           java5="true"/>
-        <echo file="${s2b_root_client_6_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_6_0;</echo>
+        <echo file="${s2b_root_client_6_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_6_0;</echo>
     <replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
         <replacetoken>public java.lang.String getVersion() {</replacetoken>
         <replacevalue>public java.lang.String getVersionString() {</replacevalue>
diff -r 732289cfaec2 j2ee.dd/nbproject/project.xml
--- a/j2ee.dd/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.dd/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -55,7 +55,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.16</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java	Fri Jan 25 16:50:12 2013 +0100
@@ -72,7 +72,7 @@
  *
  * @author  Milan Kuchtiak
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 public final class DDProvider {
     
     private static final DDProvider ddProvider = new DDProvider();
diff -r 732289cfaec2 j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java	Fri Jan 25 16:50:12 2013 +0100
@@ -67,7 +67,7 @@
  *
  * @author  Milan Kuchtiak
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 public final class DDProvider {
     private static DDProvider ddProvider;
     private final Map<URL, WeakReference<WebAppProxy>> ddMap;
diff -r 732289cfaec2 j2ee.persistence/nbproject/project.xml
--- a/j2ee.persistence/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.persistence/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -55,7 +55,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.17</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     removeUnreferencedNodes=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.persistence.dd.orm.model_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/orm/model_2_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     removeUnreferencedNodes=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.persistence.dd.orm.model_2_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     removeUnreferencedNodes=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.persistence.dd.persistence.model_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java
--- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/persistence/model_2_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     removeUnreferencedNodes=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.persistence.dd.persistence.model_2_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/nbproject/project.xml
--- a/j2ee.sun.dd/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -55,7 +55,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.16</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_3_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_3_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_1_4_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.app.model_1_4_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_5_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.app.model_5_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.app.model_6_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/app/model_6_0_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.app.model_6_0_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_3_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_3_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_1_4_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_1_4_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_5_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_5_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_6_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/client/model_6_0_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.client.model_6_0_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/cmp/model_1_2/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.cmp.model_1_2;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
 	attrProp=true,
         java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_2_1_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
 	attrProp=true,
         java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.common.model_2_1_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/model_3_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.common.model_3_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_2_1_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_2_1_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_0_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_0_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_1_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/ejb/model_3_1_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.ejb.model_3_1_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/serverresources/model_1_5/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/serverresources/model_1_5/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/serverresources/model_1_5/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.serverresources.model_1_5;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_3_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_3_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_4_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_4_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_2_5_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_2_5_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_0/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_3_0_0;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_1/package-info.java
--- a/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_1/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/web/model_3_0_1/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -51,7 +51,7 @@
     attrProp=true,
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.sun.dd.impl.web.model_3_0_1;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/nbproject/project.xml
--- a/j2ee.weblogic9/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -61,7 +61,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1030/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1030/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1030/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-application_10_3_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ear1030;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1031/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1031/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear1031/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-application_10_3_1.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ear1031;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear90/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear90/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ear90/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-application_9_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ear90;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1030/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1030/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1030/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-ejb-jar_10_3_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ejb1030;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1031/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1031/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb1031/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-ejb-jar_10_3_1.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ejb1031;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb90/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb90/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/ejb90/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-ejb-jar_9_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.ejb90;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/jms1031/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/jms1031/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/jms1031/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-jms_10_3_1.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.jms1031;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1030/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1030/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1030/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-web-app_10_3_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.web1030;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1031/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1031/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web1031/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-web-app_10_3_1.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.web1031;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web90/package-info.java
--- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web90/package-info.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/dd/web90/package-info.java	Fri Jan 25 16:50:12 2013 +0100
@@ -52,7 +52,7 @@
     mddFile="../../resources/weblogic-web-app_9_0.mdd",
     java5=true
 )
-@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification="Generated implementation classes")
 package org.netbeans.modules.j2ee.weblogic9.dd.web90;
 
 import org.netbeans.modules.schema2beans.Schema2Beans;
diff -r 732289cfaec2 j2eeserver/nbproject/project.xml
--- a/j2eeserver/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -64,7 +64,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerFileDistributor.java	Fri Jan 25 16:50:12 2013 +0100
@@ -362,7 +362,7 @@
         }
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("REC_CATCH_EXCEPTION") // justification="We rethrow with localized message"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="REC_CATCH_EXCEPTION", justification="We rethrow with localized message")
     private AppChanges _distributeOnSave(File destDir, TargetModuleID target, Iterable<Artifact> artifacts) throws IOException {
         AppChanges mc = createModuleChangeDescriptor(target);
 
diff -r 732289cfaec2 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformJavadocForBinaryQuery.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformJavadocForBinaryQuery.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformJavadocForBinaryQuery.java	Fri Jan 25 16:50:12 2013 +0100
@@ -75,7 +75,7 @@
  * Implementation of Javadoc query for the library.
  * @since 1.5
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation.class)
 public class J2eePlatformJavadocForBinaryQuery implements JavadocForBinaryQueryImplementation {
     
@@ -87,7 +87,7 @@
     public J2eePlatformJavadocForBinaryQuery() {
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("DMI_BLOCKING_METHODS_ON_URL") // justification="File URLs only"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_BLOCKING_METHODS_ON_URL", justification="File URLs only")
     public JavadocForBinaryQuery.Result findJavadoc(final URL b) {
         class R implements JavadocForBinaryQuery.Result, PropertyChangeListener {
 
diff -r 732289cfaec2 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformSourceForBinaryQuery.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformSourceForBinaryQuery.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/query/J2eePlatformSourceForBinaryQuery.java	Fri Jan 25 16:50:12 2013 +0100
@@ -75,7 +75,7 @@
  * Finds the locations of sources for various libraries.
  * @since 1.5
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation.class)
 public class J2eePlatformSourceForBinaryQuery implements SourceForBinaryQueryImplementation2 {
 
@@ -85,7 +85,7 @@
     /** Default constructor for lookup. */
     public J2eePlatformSourceForBinaryQuery() {}
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("DMI_BLOCKING_METHODS_ON_URL") // justification="File URLs only"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_BLOCKING_METHODS_ON_URL", justification="File URLs only")
     public SourceForBinaryQueryImplementation2.Result findSourceRoots2 (URL binaryRoot) {
         SourceForBinaryQueryImplementation2.Result res = this.cache.get (binaryRoot);
         if (res != null) {
diff -r 732289cfaec2 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/JavadocForBinaryQueryImpl.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/JavadocForBinaryQueryImpl.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/JavadocForBinaryQueryImpl.java	Fri Jan 25 16:50:12 2013 +0100
@@ -67,7 +67,7 @@
 /**
  * Implementation of Javadoc query for the library.
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation.class)
 public class JavadocForBinaryQueryImpl implements JavadocForBinaryQueryImplementation {
 
@@ -83,7 +83,7 @@
     public JavadocForBinaryQueryImpl() {
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("DMI_BLOCKING_METHODS_ON_URL") // justification="File URLs only"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_BLOCKING_METHODS_ON_URL", justification="File URLs only")
     public JavadocForBinaryQuery.Result findJavadoc(final URL b) {
         class R implements JavadocForBinaryQuery.Result, PropertyChangeListener {
 
diff -r 732289cfaec2 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/SourceForBinaryQueryImpl.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/SourceForBinaryQueryImpl.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/SourceForBinaryQueryImpl.java	Fri Jan 25 16:50:12 2013 +0100
@@ -68,7 +68,7 @@
  * Finds the locations of sources for various libraries.
  * @author Tomas Zezula
  */
-@org.netbeans.api.annotations.common.SuppressWarnings("DMI_COLLECTION_OF_URLS") // justification="File URLs only"
+@org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="File URLs only")
 @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation.class)
 public class SourceForBinaryQueryImpl implements SourceForBinaryQueryImplementation2 {
 
@@ -83,7 +83,7 @@
     /** Default constructor for lookup. */
     public SourceForBinaryQueryImpl() {}
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("DMI_BLOCKING_METHODS_ON_URL") // justification="File URLs only"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_BLOCKING_METHODS_ON_URL", justification="File URLs only")
     public SourceForBinaryQueryImplementation2.Result findSourceRoots2(URL binaryRoot) {
         SourceForBinaryQueryImplementation2.Result res = cache.get(binaryRoot);
         if (res != null) {
diff -r 732289cfaec2 java.source/nbproject/project.xml
--- a/java.source/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/java.source/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -55,7 +55,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 java.source/src/org/netbeans/api/java/source/ClassIndex.java
--- a/java.source/src/org/netbeans/api/java/source/ClassIndex.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/java.source/src/org/netbeans/api/java/source/ClassIndex.java	Fri Jan 25 16:50:12 2013 +0100
@@ -110,15 +110,15 @@
 
     //INV: Never null
     //@GuardedBy (this)
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     private final Set<URL> oldSources;
     //INV: Never null
     //@GuardedBy (this)
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     private final Set<URL> oldBoot;    
     //INV: Never null
     //@GuardedBy (this)
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"},justification="URLs have never host part")    //NOI18N
     private final Set<URL> oldCompile;
     //INV: Never null
     //@GuardedBy (this)
@@ -796,7 +796,7 @@
             }
         }
 
-        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
         private boolean containsRoot (final ClassPath cp, final Set<? extends URL> roots, final List<? super URL> affectedRoots, final boolean translate) {
             final List<ClassPath.Entry> entries = cp.entries();
             final PathRegistry preg = PathRegistry.getDefault();
@@ -866,7 +866,7 @@
             return result;
         }
 
-        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
         public void propertyChange(PropertyChangeEvent evt) {
             if (ClassPath.PROP_ENTRIES.equals (evt.getPropertyName())) {
                 final List<URL> newRoots = new LinkedList<URL>();
diff -r 732289cfaec2 java.source/src/org/netbeans/api/java/source/SourceUtils.java
--- a/java.source/src/org/netbeans/api/java/source/SourceUtils.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/java.source/src/org/netbeans/api/java/source/SourceUtils.java	Fri Jan 25 16:50:12 2013 +0100
@@ -672,7 +672,7 @@
      * incoming root, never returns null.
      * @since 0.10
      */
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     public static Set<URL> getDependentRoots (final URL root) {
         final Map<URL, List<URL>> sourceDeps = IndexingController.getDefault().getRootDependencies();
         final Map<URL, List<URL>> binaryDeps = IndexingController.getDefault().getBinaryRootDependencies();
@@ -691,14 +691,14 @@
      * root, never returns null.
      * @since 0.110
      */
-    @org.netbeans.api.annotations.common.SuppressWarnings(value = {"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value = {"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     public static Set<URL> getDependentRoots(final URL root, boolean filterNonOpenedProjects) {
         final Map<URL, List<URL>> sourceDeps = IndexingController.getDefault().getRootDependencies();
         final Map<URL, List<URL>> binaryDeps = IndexingController.getDefault().getBinaryRootDependencies();
         return getDependentRootsImpl(root, sourceDeps, binaryDeps, filterNonOpenedProjects);
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     static Set<URL> getDependentRootsImpl (final URL root, final Map<URL, List<URL>> sourceDeps, Map<URL, List<URL>> binaryDeps, boolean filterNonOpenedProjects) {
         Set<URL> urls;
 
diff -r 732289cfaec2 java.source/src/org/netbeans/modules/java/source/JavadocHelper.java
--- a/java.source/src/org/netbeans/modules/java/source/JavadocHelper.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/java.source/src/org/netbeans/modules/java/source/JavadocHelper.java	Fri Jan 25 16:50:12 2013 +0100
@@ -253,7 +253,7 @@
         return getJavadoc(element, null);
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS"/*,justification="URLs have never host part"*/)
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="DMI_COLLECTION_OF_URLS", justification="URLs have never host part")
     private static TextStream doGetJavadoc(final Element element, final boolean allowRemoteJavadoc, final Callable<Boolean> cancel) {
         if (element == null) {
             throw new IllegalArgumentException("Cannot pass null as an argument of the SourceUtils.getJavadoc"); // NOI18N
diff -r 732289cfaec2 java.source/src/org/netbeans/modules/java/source/classpath/SourcePathCheck.java
--- a/java.source/src/org/netbeans/modules/java/source/classpath/SourcePathCheck.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/java.source/src/org/netbeans/modules/java/source/classpath/SourcePathCheck.java	Fri Jan 25 16:50:12 2013 +0100
@@ -80,7 +80,7 @@
     }
 
     @Override
-    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
     public void run(final Result result, final SchedulerEvent event) {
         final CompilationInfo info = CompilationInfo.get(result);
         final ClasspathInfo cpInfo = info.getClasspathInfo();
@@ -125,7 +125,7 @@
 
     public static final class Factory extends TaskFactory {
 
-        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}/*,justification="URLs have never host part"*/)    //NOI18N
+        @org.netbeans.api.annotations.common.SuppressWarnings(value={"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")    //NOI18N
         private final Set<URL> firedFor = new HashSet<URL>();
 
         @Override
diff -r 732289cfaec2 parsing.api/nbproject/project.xml
--- a/parsing.api/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -11,7 +11,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/CacheFolder.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/CacheFolder.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/CacheFolder.java	Fri Jan 25 16:50:12 2013 +0100
@@ -91,8 +91,8 @@
 
     //@NotThreadSafe
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="LI_LAZY_INIT_UPDATE_STATIC"
-        /*,justification="Caller already holds a monitor"*/)
+        value="LI_LAZY_INIT_UPDATE_STATIC",
+        justification="Caller already holds a monitor")
     private static void loadSegments(FileObject folder) throws IOException {
         assert Thread.holdsLock(CacheFolder.class);
         if (segments == null) {
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/DeletedIndexable.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/DeletedIndexable.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/DeletedIndexable.java	Fri Jan 25 16:50:12 2013 +0100
@@ -104,8 +104,8 @@
 
     @Override
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_BLOCKING_METHODS_ON_URL"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_BLOCKING_METHODS_ON_URL",
+    justification="URLs have never host part")
     public boolean equals(Object obj) {
         if (obj == null) {
             return false;
@@ -125,8 +125,8 @@
 
     @Override
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_BLOCKING_METHODS_ON_URL"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_BLOCKING_METHODS_ON_URL",
+    justification="URLs have never host part")
     public int hashCode() {
         int hash = 7;
         hash = 83 * hash + (this.root != null ? this.root.hashCode() : 0);
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/FileEventLog.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/FileEventLog.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/FileEventLog.java	Fri Jan 25 16:50:12 2013 +0100
@@ -67,8 +67,8 @@
     };
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final ThreadLocal<Map<URL,Map<String,Pair<FileEventLog.FileOp,Work>>>> changes;
 
     public FileEventLog() {
@@ -76,8 +76,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public void record (final FileOp operation, final URL root, String relativePath, FileEvent event, final Work work) {
         assert operation != null;
         assert root != null;
@@ -104,8 +104,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL,Map<String,Pair<FileEventLog.FileOp,Work>>> getChanges(final boolean create) {
         Map<URL,Map<String,Pair<FileEventLog.FileOp,Work>>> res = changes.get();
         if (res == null && create) {
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/LongHashMap.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/LongHashMap.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/LongHashMap.java	Fri Jan 25 16:50:12 2013 +0100
@@ -180,8 +180,8 @@
      * the LongHashMap fail-fast.  (See ConcurrentModificationException).
      */
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value={"VO_VOLATILE_INCREMENT"}
-        /*,justification="Only change is required, no need to have correct value"*/)
+        value={"VO_VOLATILE_INCREMENT"},
+        justification="Only change is required, no need to have correct value")
     transient volatile int modCount;
 
     /**
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/PathRegistry.java	Fri Jan 25 16:50:12 2013 +0100
@@ -102,16 +102,16 @@
 
     private Set<ClassPath> activeCps;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL, SourceForBinaryQuery.Result2> sourceResults;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL, URL[]> translatedRoots;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL, WeakValue> unknownRoots;
     private long timeStamp;             //Lamport event ordering
     private volatile Runnable debugCallBack;
@@ -120,12 +120,12 @@
     private Collection<URL> binaryLibraryPath;
     private Collection<URL> unknownSourcePath;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL, PathIds> rootPathIds;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<String, Set<URL>> pathIdToRoots;
 
     private final Listener listener;
@@ -176,8 +176,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public URL[] sourceForBinaryQuery (final URL binaryRoot, final ClassPath definingClassPath, final boolean fire) {
         assert noHostPart(binaryRoot) : binaryRoot;
         URL[] result = this.translatedRoots.get(binaryRoot);
@@ -428,8 +428,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public Set<String> getSourceIdsFor(URL root) {
         assert noHostPart(root) : root;
         PathIds pathIds = getRootPathIds().get(root);
@@ -437,8 +437,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public Set<String> getLibraryIdsFor(URL root) {
         assert noHostPart(root) : root;
         PathIds pathIds = getRootPathIds().get(root);
@@ -446,8 +446,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public Set<URL> getRootsMarkedAs(String... pathIds) {
         final Map<String, Set<URL>> rootsByPathIds = getPathIdToRoots();
         final Set<URL> roots = new HashSet<URL>();
@@ -461,8 +461,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public Set<String> getMimeTypesFor(final URL root) {
         assert noHostPart(root) : root;
         PathIds pathIds = getRootPathIds().get(root);
@@ -513,8 +513,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<URL, PathIds> getRootPathIds () {
         Request request;
         synchronized (this) {
@@ -560,8 +560,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private Map<String, Set<URL>> getPathIdToRoots () {
         Request request;
         synchronized (this) {
@@ -607,8 +607,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static Result createResources (final Request request) {
         assert request != null;
         final Set<URL> sourceResult = new HashSet<URL> ();
@@ -710,8 +710,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static Collection <? extends URL> getSources (final SourceForBinaryQuery.Result2 sr, final Collection<? super URL> cacheDirs, final Map<URL, WeakValue> unknownRoots) {
         assert sr != null;
         if (sr.preferSources()) {
@@ -742,8 +742,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static void updatePathIds(URL root, TaggedClassPath tcp, Map<URL, PathIds> pathIdsResult, Map<String, Set<URL>> pathIdToRootsResult) {
         PathIds pathIds = pathIdsResult.get(root);
         if (pathIds == null) {
@@ -765,8 +765,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static void updateTranslatedPathIds(Collection<? extends URL> roots, TaggedClassPath tcp, Map<URL, PathIds> pathIdsResult, Map<String, Set<URL>> pathIdToRootsResult) {
         Set<String> sids = new HashSet<String>();
         Set<String> mimeTypes = new HashSet<String>();
@@ -948,19 +948,19 @@
         final Collection<TaggedClassPath> binaryLibraryCps;
         final Set<ClassPath> oldCps;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map <URL, SourceForBinaryQuery.Result2> oldSR;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<URL, WeakValue> unknownRoots;
         final PropertyChangeListener propertyListener;
         final ChangeListener changeListener;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public Request (final long timeStamp,
             final Collection<TaggedClassPath> sourceCps, final Collection<TaggedClassPath> libraryCps, final Collection<TaggedClassPath> binaryLibraryCps,
             final Set<ClassPath> oldCps, final Map <URL, SourceForBinaryQuery.Result2> oldSR, final Map<URL, WeakValue> unknownRoots,
@@ -996,29 +996,29 @@
         final Collection<URL> unknownSourcePath;
         final Set<ClassPath> newCps;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<URL, SourceForBinaryQuery.Result2> newSR;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<URL, URL[]> translatedRoots;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<URL, WeakValue> unknownRoots;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<URL, PathIds> rootPathIds;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         final Map<String, Set<URL>> pathIdToRoots;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public Result (final long timeStamp,
             final Collection<URL> sourcePath,
             final Collection<URL> libraryPath,
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/ProxyBinaryIndexerFactory.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/ProxyBinaryIndexerFactory.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/ProxyBinaryIndexerFactory.java	Fri Jan 25 16:50:12 2013 +0100
@@ -75,8 +75,8 @@
     private final String indexerName;
     private final int indexerVersion;
     @org.netbeans.api.annotations.common.SuppressWarnings(
-            value="DMI_COLLECTION_OF_URLS"
-            /*,justification="URLs have never host part"*/)    //NOI18N
+            value="DMI_COLLECTION_OF_URLS",
+            justification="URLs have never host part")    //NOI18N
     private final Set<URL> activeRoots;
 
     public ProxyBinaryIndexerFactory(
@@ -108,8 +108,8 @@
 
     @Override
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater."*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater.")
     public void rootsRemoved(Iterable<? extends URL> removedRoots) {
         final Set<URL> filtered = new HashSet<URL>();
         for (URL removedRoot : removedRoots) {
@@ -126,8 +126,8 @@
 
     @Override
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater."*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater.")
     public boolean scanStarted (final Context context) {
         if (supports(context) != null) {
             return SPIAccessor.getInstance().scanStarted(getDelegate(),context);
@@ -242,8 +242,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater."*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part. Already verified by PathRegistry and RepositoryUpdater.")
         protected void index(@NonNull final Context context) {
             final Map<String,? extends Iterable<? extends FileObject>> matchedFiles = supports(context);
             if (matchedFiles != null) {
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java	Fri Jan 25 16:50:12 2013 +0100
@@ -300,8 +300,8 @@
      *   added/removed, file is modified, editor tabs are switched, etc).
      */
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     public void addIndexingJob(
         @NonNull final URL rootUrl,
         @NullAllowed Collection<? extends URL> fileUrls,
@@ -525,8 +525,8 @@
     // -----------------------------------------------------------------------
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part. Already verified by PathRegistry"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part. Already verified by PathRegistry")
     @Override
     public void pathsChanged(PathRegistryEvent event) {
         assert event != null;
@@ -1222,24 +1222,24 @@
     /* test */ volatile static Source unitTestActiveSource;
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final Map<URL, List<URL>>scannedRoots2Dependencies = Collections.synchronizedMap(new TreeMap<URL, List<URL>>(new LexicographicComparator(true)));
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final Map<URL, List<URL>>scannedBinaries2InvDependencies = Collections.synchronizedMap(new HashMap<URL,List<URL>>());
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final Map<URL, List<URL>>scannedRoots2Peers = Collections.synchronizedMap(new TreeMap<URL, List<URL>>(new LexicographicComparator(true)));
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final Set<URL>scannedUnknown = Collections.synchronizedSet(new HashSet<URL>());
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private final Set<URL>sourcesForBinaryRoots = Collections.synchronizedSet(new HashSet<URL>());
 
     private volatile State state = State.CREATED;
@@ -1621,8 +1621,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_BLOCKING_METHODS_ON_URL"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_BLOCKING_METHODS_ON_URL",
+    justification="URLs have never host part")
     private static ClassPath.Entry getClassPathEntry (final FileObject root) {
         try {
             if (root != null) {
@@ -1677,8 +1677,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value={"DMI_COLLECTION_OF_URLS","DMI_BLOCKING_METHODS_ON_URL"}
-        /*,justification="URLs have never host part"*/)
+        value={"DMI_COLLECTION_OF_URLS","DMI_BLOCKING_METHODS_ON_URL"},
+        justification="URLs have never host part")
     private static boolean findDependencies(
             final URL rootURL,
             final DependenciesContext ctx,
@@ -1973,8 +1973,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static void printMap(Map<URL, List<URL>> deps, Level level) {
         Set<URL> sortedRoots = new TreeSet<URL>(C);
         sortedRoots.addAll(deps.keySet());
@@ -1987,8 +1987,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     private static StringBuilder printMap(Map<URL, List<URL>> deps, StringBuilder sb) {
         Set<URL> sortedRoots = new TreeSet<URL>(C);
         sortedRoots.addAll(deps.keySet());
@@ -3344,8 +3344,8 @@
         private final Map<URL, List<URL>> scannedRoots2Depencencies;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public FileListWork (
                 Map<URL, List<URL>> scannedRoots2Depencencies,
                 URL root, boolean followUpJob,
@@ -3365,8 +3365,8 @@
 
         @SuppressWarnings("LeakingThisInConstructor")
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public FileListWork (
                 Map<URL, List<URL>> scannedRoots2Depencencies,
                 URL root,
@@ -3427,8 +3427,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_BLOCKING_METHODS_ON_URL"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_BLOCKING_METHODS_ON_URL",
+        justification="URLs have never host part")
         public boolean absorb(Work newWork) {
             if (newWork instanceof FileListWork) {
                 FileListWork nflw = (FileListWork) newWork;
@@ -3487,8 +3487,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_BLOCKING_METHODS_ON_URL"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_BLOCKING_METHODS_ON_URL",
+        justification="URLs have never host part")
         public boolean absorb(Work newWork) {
             if (newWork instanceof BinaryWork) {
                 return root.equals(((BinaryWork) newWork).root);
@@ -3562,8 +3562,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_BLOCKING_METHODS_ON_URL"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_BLOCKING_METHODS_ON_URL",
+        justification="URLs have never host part")
         public boolean absorb(Work newWork) {
             if (newWork instanceof DeleteWork) {
                 DeleteWork ndw = (DeleteWork) newWork;
@@ -3587,8 +3587,8 @@
         private final Set<URL> sourcesForBinaryRoots;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public RefreshCifIndices(
                 Collection<? extends IndexerCache.IndexerInfo<CustomIndexerFactory>> cifInfos,
                 Map<URL, List<URL>> scannedRoots2Depencencies,
@@ -3623,8 +3623,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         protected boolean getDone() {
             switchProgressToDeterminate(scannedRoots2Dependencies.size());
             for(URL root : scannedRoots2Dependencies.keySet()) {
@@ -3758,8 +3758,8 @@
         private final Set<URL> sourcesForBinaryRoots;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public RefreshEifIndices(
                 Collection<? extends IndexerCache.IndexerInfo<EmbeddingIndexerFactory>> eifInfos,
                 Map<URL, List<URL>> scannedRoots2Depencencies,
@@ -3794,8 +3794,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         protected boolean getDone() {
             switchProgressToDeterminate(scannedRoots2Dependencies.size());
             for(URL root : scannedRoots2Dependencies.keySet()) {
@@ -3920,8 +3920,8 @@
         private Map<URL, Set<FileObject>> checkTimestampFiles;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public RefreshWork(
                 Map<URL, List<URL>> scannedRoots2Depencencies,
                 Map<URL, List<URL>> scannedBinaries2InvDependencies,
@@ -3954,8 +3954,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         protected @Override boolean getDone() {
             if (depCtx == null) {
                 depCtx = new DependenciesContext(scannedRoots2Dependencies, scannedBinaries2InvDependencies, scannedRoots2Peers, sourcesForBinaryRoots, false);
@@ -4160,8 +4160,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private boolean scanRootFiles(Map<URL, Set<FileObject>> files) {
             if (files != null && files.size() > 0) { // #174887
                 for(Iterator<Map.Entry<URL, Set<FileObject>>> it = files.entrySet().iterator(); it.hasNext(); ) {
@@ -4199,8 +4199,8 @@
         private Level   previousLevel;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public RootsWork(
                 Map<URL, List<URL>> scannedRoots2Depencencies,
                 Map<URL,List<URL>> scannedBinaries2InvDependencies,
@@ -4274,8 +4274,8 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public boolean getDone() {
             TEST_LOGGER.log(Level.FINEST, "RootsWork-started");       //NOI18N
             if (getCancelRequest().isRaised()) {
@@ -4518,8 +4518,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private void notifyRootsRemoved (final Set<URL> binaries, final Set<URL> sources) {
             if (!binaries.isEmpty()) {
                 final Collection<? extends BinaryIndexerFactory> binFactories = MimeLookup.getLookup(MimePath.EMPTY).lookupAll(BinaryIndexerFactory.class);
@@ -4682,8 +4682,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         protected final boolean scanSources(DependenciesContext ctx, SourceIndexers indexers, Map<URL, List<URL>> preregisterIn) {
             assert ctx != null;
             long scannedRootsCnt = 0;
@@ -5057,8 +5057,8 @@
         private final boolean waitForProjects;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public InitialRootsWork(
                 Map<URL, List<URL>> scannedRoots2Depencencies,
                 Map<URL,List<URL>>  scannedBinaries2InvDependencies,
@@ -5477,8 +5477,8 @@
             }
         }
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private Work getWork () {
             synchronized (todo) {
                 Work w;
@@ -5581,8 +5581,8 @@
         private final boolean useInitialState;
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public DependenciesContext (
                 final Map<URL, List<URL>> scannedRoots2Deps,
                 final Map<URL,List<URL>>  scannedBinaries2InvDependencies,
@@ -5718,24 +5718,24 @@
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public synchronized Map<URL, List<URL>> getRootDependencies() {
             return roots2Dependencies;
         }
 
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public synchronized Map<URL, List<URL>> getBinaryRootDependencies() {
             return binRoots2Dependencies;
         }
         
         @Override
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public Map<URL, List<URL>> getRootPeers() {
             return roots2Peers;
         }
@@ -5862,8 +5862,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public synchronized boolean add(
                 @NonNull final URL root,
                 final boolean sourceRoot,
@@ -5911,8 +5911,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public synchronized void remove(final Iterable<? extends URL> roots, final boolean sourceRoot) {
             for (URL root : roots) {
                 if (sourceRoot) {
@@ -6077,32 +6077,32 @@
 
     //Unit test method
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     /* test */ Set<URL> getScannedBinaries () {
         return this.scannedBinaries2InvDependencies.keySet();
     }
 
     //Unit test method
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     /* test */ Set<URL> getScannedSources () {
         return this.scannedRoots2Dependencies.keySet();
     }
 
     //Unit test method
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     /* test */ Map<URL,List<URL>> getScannedRoots2Dependencies() {
         return this.scannedRoots2Dependencies;
     }
 
     //Unit test method
     @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
     /* test */ Set<URL> getScannedUnknowns () {
         return this.scannedUnknown;
     }
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/ErrorAnnotator.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/ErrorAnnotator.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/ErrorAnnotator.java	Fri Jan 25 16:50:12 2013 +0100
@@ -200,8 +200,8 @@
     }
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     public synchronized void updateInError(Set<URL> urls)  {
         Set<FileObject> toRefresh = new HashSet<FileObject>();
         for (Iterator<FileObject> it = knownFiles2Error.keySet().iterator(); it.hasNext(); ) {
@@ -408,8 +408,8 @@
 
                 @Override
                 @org.netbeans.api.annotations.common.SuppressWarnings(
-                value="DMI_COLLECTION_OF_URLS"
-                /*,justification="URLs have never host part"*/)
+                value="DMI_COLLECTION_OF_URLS",
+                justification="URLs have never host part")
                 public void run() {
                     try {
                         Set<URL> toRefresh = new HashSet<URL>();
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java	Fri Jan 25 16:50:12 2013 +0100
@@ -591,12 +591,12 @@
     private static final class TransactionContext {
         private int depth;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private Set<URL> toRefresh = new HashSet<URL>();
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private Set<URL> rootsToRefresh = new HashSet<URL>();
     }
 }
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/friendapi/IndexingController.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/friendapi/IndexingController.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/friendapi/IndexingController.java	Fri Jan 25 16:50:12 2013 +0100
@@ -64,18 +64,18 @@
     public abstract boolean isInProtectedMode();
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     public abstract Map<URL, List<URL>> getRootDependencies();
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     public abstract Map<URL, List<URL>> getBinaryRootDependencies();
 
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     public abstract Map<URL, List<URL>> getRootPeers();
 
     public abstract int getFileLocksDelay();
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/impl/indexing/lucene/DocumentBasedIndexManager.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/lucene/DocumentBasedIndexManager.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/lucene/DocumentBasedIndexManager.java	Fri Jan 25 16:50:12 2013 +0100
@@ -70,8 +70,8 @@
 
     //@GuardedBy("this")
     @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     private final Map<URL, Pair<DocumentIndex.Transactional, DocumentIndexCache>> indexes =
             new HashMap<URL, Pair<DocumentIndex.Transactional, DocumentIndexCache>> ();
     //@GuardedBy("this")
@@ -96,8 +96,8 @@
 
    @CheckForNull
    @org.netbeans.api.annotations.common.SuppressWarnings(
-    value="DMI_COLLECTION_OF_URLS"
-    /*,justification="URLs have never host part"*/)
+    value="DMI_COLLECTION_OF_URLS",
+    justification="URLs have never host part")
     public synchronized DocumentIndex.Transactional getIndex (final URL root, final Mode mode) throws IOException {
         assert root != null;
         assert PathRegistry.noHostPart(root) : root;
diff -r 732289cfaec2 parsing.api/src/org/netbeans/modules/parsing/spi/indexing/support/QuerySupport.java
--- a/parsing.api/src/org/netbeans/modules/parsing/spi/indexing/support/QuerySupport.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/parsing.api/src/org/netbeans/modules/parsing/spi/indexing/support/QuerySupport.java	Fri Jan 25 16:50:12 2013 +0100
@@ -485,8 +485,8 @@
         }
 
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         public Iterable<? extends Pair<URL, LayeredDocumentIndex>> getIndices(List<? extends URL> roots) {
             synchronized (root2index) {
                 List<Pair<URL, LayeredDocumentIndex>> indices = new LinkedList<Pair<URL, LayeredDocumentIndex>>();
@@ -525,8 +525,8 @@
 
         private final String indexerId;
         @org.netbeans.api.annotations.common.SuppressWarnings(
-        value="DMI_COLLECTION_OF_URLS"
-        /*,justification="URLs have never host part"*/)
+        value="DMI_COLLECTION_OF_URLS",
+        justification="URLs have never host part")
         private final Map<URL, Reference<LayeredDocumentIndex>> root2index = new HashMap<URL, Reference<LayeredDocumentIndex>>();
 
         private IndexerQuery(String indexerId) {
diff -r 732289cfaec2 web.clientproject/nbproject/project.xml
--- a/web.clientproject/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.clientproject/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -11,7 +11,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.13</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java	Fri Jan 25 16:50:12 2013 +0100
@@ -668,7 +668,7 @@
 
     }
 
-    @org.netbeans.api.annotations.common.SuppressWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE") // justification="checking return value of createNewFile() is pointless"
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="checking return value of createNewFile() is pointless")
     private static void createZipFile(File templateFile, ClientSideProject project, Node rootNode) throws IOException {
         if (!templateFile.exists()) {
             templateFile.createNewFile();
diff -r 732289cfaec2 web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesDocumentPanel.java
--- a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesDocumentPanel.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesDocumentPanel.java	Fri Jan 25 16:50:12 2013 +0100
@@ -102,7 +102,7 @@
     /** Explorer manager provided by this panel. */
     private ExplorerManager manager = new ExplorerManager();
     /** Lookup of this panel. */
-    @org.netbeans.api.annotations.common.SuppressWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED") // justification="The instances are never serialized." // NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="The instances are never serialized.") // NOI18N
     private transient Lookup lookup = ExplorerUtils.createLookup(getExplorerManager(), getActionMap());
     /** Filter for the tree displayed in this panel. */
     private transient Filter filter = new Filter();
diff -r 732289cfaec2 web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java
--- a/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.inspect/src/org/netbeans/modules/web/inspect/webkit/ui/CSSStylesSelectionPanel.java	Fri Jan 25 16:50:12 2013 +0100
@@ -332,7 +332,7 @@
      *
      * @return Style Cascade section.
      */
-    @org.netbeans.api.annotations.common.SuppressWarnings("SE_NO_SUITABLE_CONSTRUCTOR_FOR_EXTERNALIZATION") // justification="The instances are never serialized." // NOI18N
+    @org.netbeans.api.annotations.common.SuppressWarnings(value="SE_NO_SUITABLE_CONSTRUCTOR_FOR_EXTERNALIZATION", justification="The instances are never serialized.") // NOI18N
     private JPanel initRulePane() {
         rulePane = new ListView() {
             {
diff -r 732289cfaec2 web.webkit.debugging/nbproject/project.xml
--- a/web.webkit.debugging/nbproject/project.xml	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.webkit.debugging/nbproject/project.xml	Fri Jan 25 16:50:12 2013 +0100
@@ -11,7 +11,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.17</specification-version>
+                        <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r 732289cfaec2 web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/dom/DOMTest.java
--- a/web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/dom/DOMTest.java	Fri Jan 25 15:12:15 2013 +0100
+++ b/web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/dom/DOMTest.java	Fri Jan 25 16:50:12 2013 +0100
@@ -412,7 +412,7 @@
         }
 
         @Override
-        @org.netbeans.api.annotations.common.SuppressWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // NOI18N // justification="callback field should be always initialized by registerResponseCallback() method. And if not then it is fine for the method to fail. It is a test anyway."
+        @org.netbeans.api.annotations.common.SuppressWarnings(value="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", justification="callback field should be always initialized by registerResponseCallback() method. And if not then it is fine for the method to fail. It is a test anyway.") // NOI18N
         public void sendCommand(Command command) throws TransportStateException {
             JSONObject jsonCommand = command.getCommand();
             Object id = jsonCommand.get(Command.COMMAND_ID);