diff --git a/groovy/libs.groovy/external/binaries-list b/groovy/libs.groovy/external/binaries-list
index 8eba45ac18ff..9ad744a7f819 100644
--- a/groovy/libs.groovy/external/binaries-list
+++ b/groovy/libs.groovy/external/binaries-list
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-59FA6B2237A01CF380B27CB091D5F095DFE1AC5B org.codehaus.groovy:groovy:3.0.23
-D21A9C81632F804C514D48C45D560B8004890E30 org.codehaus.groovy:groovy-ant:3.0.23
+0AFC7F7A3B2E3E86482D1F636AA3C1733F9C7473 org.codehaus.groovy:groovy:3.0.25
+4C334F0023049A377447B187A53DF90F450C2AC8 org.codehaus.groovy:groovy-ant:3.0.25
diff --git a/groovy/libs.groovy/external/groovy-3.0.23-license.txt b/groovy/libs.groovy/external/groovy-3.0.25-license.txt
similarity index 89%
rename from groovy/libs.groovy/external/groovy-3.0.23-license.txt
rename to groovy/libs.groovy/external/groovy-3.0.25-license.txt
index 8bedfc8f1172..276bf729fd7c 100644
--- a/groovy/libs.groovy/external/groovy-3.0.23-license.txt
+++ b/groovy/libs.groovy/external/groovy-3.0.25-license.txt
@@ -1,6 +1,6 @@
 Name: Groovy
-Version: 3.0.23
-Files: groovy-3.0.23.jar groovy-ant-3.0.23.jar
+Version: 3.0.25
+Files: groovy-3.0.25.jar groovy-ant-3.0.25.jar
 Description: Groovy Language distribution.
 License: Apache-2.0-groovy
 Origin: http://groovy-lang.org/
@@ -267,3 +267,38 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------
+
+ASM License
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/groovy/libs.groovy/external/groovy-3.0.23-notice.txt b/groovy/libs.groovy/external/groovy-3.0.25-notice.txt
similarity index 100%
rename from groovy/libs.groovy/external/groovy-3.0.23-notice.txt
rename to groovy/libs.groovy/external/groovy-3.0.25-notice.txt
diff --git a/groovy/libs.groovy/nbproject/project.properties b/groovy/libs.groovy/nbproject/project.properties
index 4b89242302f9..ecbb221454d3 100644
--- a/groovy/libs.groovy/nbproject/project.properties
+++ b/groovy/libs.groovy/nbproject/project.properties
@@ -23,5 +23,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
 # For more information, please see http://wiki.netbeans.org/SignatureTest
 sigtest.gen.fail.on.error=false
 
-release.external/groovy-3.0.23.jar=modules/ext/groovy-3.0.23.jar
-release.external/groovy-ant-3.0.23.jar=modules/ext/groovy-ant-3.0.23.jar
+release.external/groovy-3.0.25.jar=modules/ext/groovy-3.0.25.jar
+release.external/groovy-ant-3.0.25.jar=modules/ext/groovy-ant-3.0.25.jar
diff --git a/groovy/libs.groovy/nbproject/project.xml b/groovy/libs.groovy/nbproject/project.xml
index 214653148b01..c5ee8f123306 100644
--- a/groovy/libs.groovy/nbproject/project.xml
+++ b/groovy/libs.groovy/nbproject/project.xml
@@ -76,12 +76,12 @@
                 <package>org.codehaus.groovy.transform.trait</package>
             </friend-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/groovy-3.0.23.jar</runtime-relative-path>
-                <binary-origin>external/groovy-3.0.23.jar</binary-origin>
+                <runtime-relative-path>ext/groovy-3.0.25.jar</runtime-relative-path>
+                <binary-origin>external/groovy-3.0.25.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/groovy-ant-3.0.23.jar</runtime-relative-path>
-                <binary-origin>external/groovy-ant-3.0.23.jar</binary-origin>
+                <runtime-relative-path>ext/groovy-ant-3.0.25.jar</runtime-relative-path>
+                <binary-origin>external/groovy-ant-3.0.25.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
index f4588573a5f8..3808a85fc598 100644
--- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
+++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
@@ -16,5 +16,5 @@
 # under the License.
 OpenIDE-Module-Name=Groovy Binaries
 
-groovy=Groovy 3.0.23
-groovy-ant=Groovy Ant 3.0.23
+groovy=Groovy 3.0.25
+groovy-ant=Groovy Ant 3.0.25
diff --git a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
index 6d38f96a7fe8..40563e896290 100644
--- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
+++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
@@ -27,15 +27,15 @@
     <localizing-bundle>org/netbeans/modules/libs/groovy/Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-3.0.23.jar!/</resource>
-        <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-ant-3.0.23.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-3.0.25.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-ant-3.0.25.jar!/</resource>
     </volume>
     <properties>
         <property>
             <name>maven-dependencies</name>
             <value>
-                org.codehaus.groovy:groovy:3.0.23
-                org.codehaus.groovy:groovy-ant:3.0.23
+                org.codehaus.groovy:groovy:3.0.25
+                org.codehaus.groovy:groovy-ant:3.0.25
             </value>
         </property>
     </properties>
diff --git a/nbbuild/licenses/Apache-2.0-groovy b/nbbuild/licenses/Apache-2.0-groovy
index 7e7d42242564..e695cb99e97e 100644
--- a/nbbuild/licenses/Apache-2.0-groovy
+++ b/nbbuild/licenses/Apache-2.0-groovy
@@ -261,3 +261,38 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------
+
+ASM License
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.