Merge pull request #1951 from apache/master

sync master to release 113 branch for vc1

Author: ebarboni

.travis.yml

@@ -518,7 +518,12 @@ matrix:
             - ant $BUILD_OPTS clean
             - ant $BUILD_OPTS build
           script:
+            #- ant $TEST_OPTS -f groovy/groovy test
+            #- ant $TEST_OPTS -f groovy/groovy.java test
             - ant $TEST_OPTS -f groovy/groovy.editor test
+            - ant $TEST_OPTS -f groovy/groovy.gsp test
+            #- ant $TEST_OPTS -f groovy/groovy.kit test
+            - ant $TEST_OPTS -f groovy/groovy.support test
 
         - name: Test php modules
           jdk: openjdk8

java/maven/src/org/netbeans/modules/maven/newproject/ChooseArchetypePanel.form

@@ -230,7 +230,7 @@
           <Properties>
             <Property name="editable" type="boolean" value="false"/>
             <Property name="background" type="java.awt.Color" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="(java.awt.Color)(UIManager.get(&quot;textArea.background&quot;)!=null?&#xa;    UIManager.get(&quot;textArea.background&quot;):new java.awt.Color(238, 238, 238))" type="code"/>
+              <Connection code="(java.awt.Color)(UIManager.get(&quot;TextArea.background&quot;)!=null?&#xa;    UIManager.get(&quot;TextArea.background&quot;):new java.awt.Color(238, 238, 238))" type="code"/>
             </Property>
             <Property name="columns" type="int" value="20"/>
             <Property name="lineWrap" type="boolean" value="true"/>

java/maven/src/org/netbeans/modules/maven/newproject/ChooseArchetypePanel.java

@@ -245,8 +245,8 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
         org.openide.awt.Mnemonics.setLocalizedText(labelDesc, org.openide.util.NbBundle.getMessage(ChooseArchetypePanel.class, "LBL_Description")); // NOI18N
 
         taDescription.setEditable(false);
-        taDescription.setBackground((java.awt.Color)(UIManager.get("textArea.background")!=null?
-            UIManager.get("textArea.background"):new java.awt.Color(238, 238, 238)));
+        taDescription.setBackground((java.awt.Color)(UIManager.get("TextArea.background")!=null?
+            UIManager.get("TextArea.background"):new java.awt.Color(238, 238, 238)));
     taDescription.setColumns(20);
     taDescription.setLineWrap(true);
     taDescription.setRows(5);

platform/api.annotations.common/apichanges.xml

@@ -90,7 +90,7 @@ is the proper place.
             <compatibility addition="yes"/>
             <description>
                 <p>
-                    Introduced justificatio attribute to specify why it is ok to
+                    Introduced justification attribute to specify why it is ok to
                     suppress a warning.
                 </p>
             </description>

platform/api.annotations.common/arch.xml

@@ -53,7 +53,7 @@
    <api group="java" name="CommonAnnotationsAPI" type="export" category="stable" url="@TOP@org/netbeans/api/annotations/common/package-summary.html"/>
    that contains annotations usable across the IDE sources. One such type
    of annotations can guard (together with <a href="http://findbugs.sourceforge.net">FindBugs</a>)
-   your code against <code>null</code> related defect.
+   your code against <code>null</code> related defects.
   </p>
   <p>
    In case your module is using <code>projectized.xml</code> you can simply run
@@ -126,14 +126,14 @@
     When the method return value is important value to check (or the only effect
     the method has) the method can be annotated with
     <a href="@TOP@org/netbeans/api/annotations/common/CheckReturnValue.html">CheckReturnValue</a>.
-    Annotation servers as documentation as well as a hint for static code analysis.
+    Annotation serves as documentation as well as a hint for static code analysis.
    </p>
   </usecase>
   <usecase id="check-for-null" name="CheckForNull annotated method">
    <p>
     Method annotated with
     <a href="@TOP@org/netbeans/api/annotations/common/CheckForNull.html">CheckForNull</a>
-    may return <code>null</code> value. Annotation servers as documentation
+    may return <code>null</code> value. Annotation serves as documentation
     as well as a hint for static code analysis.
    </p>
   </usecase>
@@ -142,7 +142,7 @@
     When the field, parameter, local variable or return value of the method
     must not be <code>null</code> the
     <a href="@TOP@org/netbeans/api/annotations/common/NonNull.html">NonNull</a>
-    annotation can be used to clearly express this. It servers as documentation
+    annotation can be used to clearly express this. It serves as documentation
     as well as a hint for static code analysis.
    </p>
   </usecase>
@@ -151,15 +151,15 @@
     Field, parameter or local variable annotated with
     <a href="@TOP@org/netbeans/api/annotations/common/NullAllowed.html">NullAllowed</a>
     can contain <code>null</code> value so <code>null</code> check should
-    occur before any dereference. Annotation servers as documentation
+    occur before any dereference. Annotation serves as documentation
     as well as a hint for static code analysis.
    </p>
   </usecase>
   <usecase id="null-unknown" name="NullUnknown annotated element">
    <p>
     Annotation
     <a href="@TOP@org/netbeans/api/annotations/common/NullUnknown.html">NullUnknown</a>
-    complementing other nullness annotations servers for cases where
+    complementing other nullness annotations serves for cases where
     the element may or may not be <code>null</code> under certain
     <i>defined</i> circumstances (usage).
    </p>

platform/api.annotations.common/src/org/netbeans/api/annotations/common/SuppressWarnings.java

@@ -25,7 +25,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Supress the warning reported by the code analyzing tool.
+ * Suppress the warning reported by the code analyzing tool.
  *
  * @author Petr Hejl
  */
@@ -40,7 +40,7 @@
     String[] value() default {};
 
     /**
-     * The justification for the suppression. Should be human readable
+     * The justification for the suppression. Should be a human readable
      * description explaining why it is ok to suppress the message(s).
      *
      * @return the justification for the suppression

platform/api.annotations.common/src/org/netbeans/api/annotations/common/package-info.java

@@ -18,11 +18,10 @@
  */
 
 /**
- * The API containg common annotations (namely for defect detection)
+ * The API containing common annotations (namely for defect detection)
  * to be used across the IDE sources.
  * <p>
  * Annotations are respected (and so annotated elements may be checked)
- * by FindBugs tool.
+ * by the FindBugs tool.
  */
 package org.netbeans.api.annotations.common;
-