diff --git a/gpars.jar b/gpars.jar
index 649d825..6e1ca9f 100644
--- a/gpars.jar
+++ b/gpars.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f6902e9f53379996e200acf072295827e5d56088d9f34ce9181fde0243105c7
-size 633259
+oid sha256:f88f713504bb6b45477de1d6e1a79d0a4a895c9e42a72faa91b062e313c441b2
+size 634127
diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz
index c589447..f3beba5 100644
--- a/gradle-4.4.1-built.tar.xz
+++ b/gradle-4.4.1-built.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55d35382ff60d5433b2e4cbad45d76b511db28253c7514fb8c4096e6516feca8
-size 50077852
+oid sha256:b23cacaad6dba98561f99c12519c3cdb425345826a5cf74f558ebb9a3fb7d2a9
+size 50188228
diff --git a/groovy-all.pom b/groovy-all.pom
index 1f7135f..cff537f 100644
--- a/groovy-all.pom
+++ b/groovy-all.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-all</artifactId>
-  <version>2.4.8</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -20,21 +20,11 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  <mailingLists>
-    <mailingList>
-      <name>Groovy Developer List</name>
-      <archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Groovy User List</name>
-      <archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive>
-    </mailingList>
-  </mailingLists>
   <developers>
     <developer>
       <id>glaforge</id>
       <name>Guillaume Laforge</name>
-      <organization>org.apache.maven.model.Organization@239556d2</organization>
+      <organization>org.apache.maven.model.Organization@1b374774</organization>
       <roles>
         <role>Project Manager</role>
         <role>Despot</role>
@@ -45,7 +35,7 @@
       <id>bob</id>
       <name>bob mcwhirter</name>
       <email>bob@werken.com</email>
-      <organization>org.apache.maven.model.Organization@4e6ce75d</organization>
+      <organization>org.apache.maven.model.Organization@4ef55508</organization>
       <roles>
         <role>Founder</role>
       </roles>
@@ -54,7 +44,7 @@
       <id>jstrachan</id>
       <name>James Strachan</name>
       <email>james@coredevelopers.com</email>
-      <organization>org.apache.maven.model.Organization@4fe62df6</organization>
+      <organization>org.apache.maven.model.Organization@66984649</organization>
       <roles>
         <role>Founder</role>
       </roles>
@@ -62,7 +52,7 @@
     <developer>
       <id>joe</id>
       <name>Joe Walnes</name>
-      <organization>org.apache.maven.model.Organization@de11305</organization>
+      <organization>org.apache.maven.model.Organization@1f1fde0f</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -70,7 +60,7 @@
     <developer>
       <id>skizz</id>
       <name>Chris Stevenson</name>
-      <organization>org.apache.maven.model.Organization@537b56c0</organization>
+      <organization>org.apache.maven.model.Organization@51e7beff</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -78,7 +68,7 @@
     <developer>
       <id>jamiemc</id>
       <name>Jamie McCrindle</name>
-      <organization>org.apache.maven.model.Organization@b90883</organization>
+      <organization>org.apache.maven.model.Organization@7f4b3afd</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -86,7 +76,7 @@
     <developer>
       <id>mattf</id>
       <name>Matt Foemmel</name>
-      <organization>org.apache.maven.model.Organization@4606b967</organization>
+      <organization>org.apache.maven.model.Organization@2ec31e53</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -138,7 +128,7 @@
       <id>jwilson</id>
       <name>John Wilson</name>
       <email>tug@wilson.co.uk</email>
-      <organization>org.apache.maven.model.Organization@6a83e630</organization>
+      <organization>org.apache.maven.model.Organization@4c9bd035</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -155,7 +145,7 @@
       <id>ckl</id>
       <name>Christiaan ten Klooster</name>
       <email>ckl@dacelo.nl</email>
-      <organization>org.apache.maven.model.Organization@6323304f</organization>
+      <organization>org.apache.maven.model.Organization@5c8288b8</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -164,7 +154,7 @@
       <id>goetze</id>
       <name>Steve Goetze</name>
       <email>goetze@dovetail.com</email>
-      <organization>org.apache.maven.model.Organization@5905025</organization>
+      <organization>org.apache.maven.model.Organization@563ed1ff</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -173,7 +163,7 @@
       <id>bran</id>
       <name>Bing Ran</name>
       <email>b55r@sina.com</email>
-      <organization>org.apache.maven.model.Organization@2903fbf0</organization>
+      <organization>org.apache.maven.model.Organization@5b26cb82</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -182,7 +172,7 @@
       <id>jez</id>
       <name>Jeremy Rayner</name>
       <email>jeremy.rayner@gmail.com</email>
-      <organization>org.apache.maven.model.Organization@1f0323f2</organization>
+      <organization>org.apache.maven.model.Organization@622f08db</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -208,7 +198,7 @@
       <id>russel</id>
       <name>Russel Winder</name>
       <email>russel@russel.org.uk</email>
-      <organization>org.apache.maven.model.Organization@e16b27c</organization>
+      <organization>org.apache.maven.model.Organization@7ac15e93</organization>
       <roles>
         <role>Developer</role>
         <role>Founder of Gant</role>
@@ -226,7 +216,7 @@
       <id>cstein</id>
       <name>Christian Stein</name>
       <email>sormuras@gmx.de</email>
-      <organization>org.apache.maven.model.Organization@5aa9f2d</organization>
+      <organization>org.apache.maven.model.Organization@5dae96f4</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -235,7 +225,7 @@
       <id>mittie</id>
       <name>Dierk Koenig</name>
       <email>dierk.koenig@canoo.com</email>
-      <organization>org.apache.maven.model.Organization@655941d0</organization>
+      <organization>org.apache.maven.model.Organization@387c3f98</organization>
       <roles>
         <role>Developer</role>
       </roles>
@@ -244,7 +234,7 @@
       <id>paulk</id>
       <name>Paul King</name>
       <email>paulk@asert.com.au</email>
-      <organization>org.apache.maven.model.Organization@25ff91b5</organization>
+      <organization>org.apache.maven.model.Organization@45b5e01</organization>
       <roles>
         <role>Developer</role>
         <role>Despot</role>
@@ -307,7 +297,7 @@
       <id>jimwhite</id>
       <name>Jim White</name>
       <email>jim@pagesmiths.com</email>
-      <organization>org.apache.maven.model.Organization@7106c88b</organization>
+      <organization>org.apache.maven.model.Organization@705ea75a</organization>
       <roles>
         <role>Developer</role>
       </roles>
@@ -351,6 +341,15 @@
         <role>Developer</role>
       </roles>
     </developer>
+    <developer>
+      <id>sunlan</id>
+      <name>Daniel Sun</name>
+      <email>realbluesun@hotmail.com</email>
+      <roles>
+        <role>Developer</role>
+        <role>Despot</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
@@ -538,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -574,29 +579,44 @@
     <contributor>
       <name>Alan Green</name>
     </contributor>
+    <contributor>
+      <name>Alex Popescu</name>
+    </contributor>
+    <contributor>
+      <name>Martin Kempf</name>
+    </contributor>
+    <contributor>
+      <name>Stephane Landelle</name>
+    </contributor>
+    <contributor>
+      <name>Vladimir Vivien</name>
+    </contributor>
   </contributors>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/GROOVY</url>
-  </issueManagement>
+  <mailingLists>
+    <mailingList>
+      <name>Groovy Developer List</name>
+      <archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Groovy User List</name>
+      <archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive>
+    </mailingList>
+  </mailingLists>
   <scm>
     <connection>scm:git:https://github.com/apache/groovy.git</connection>
     <developerConnection>scm:git:https://github.com/apache/groovy.git</developerConnection>
     <url>https://github.com/apache/groovy.git</url>
   </scm>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/GROOVY</url>
+  </issueManagement>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
-      <artifactId>ant-launcher</artifactId>
+      <artifactId>ant</artifactId>
       <version>1.9.4</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-antlr</artifactId>
-      <version>1.9.4</version>
-      <scope>runtime</scope>
+      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -614,9 +634,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
+      <artifactId>ant-launcher</artifactId>
       <version>1.9.4</version>
-      <scope>compile</scope>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-antlr</artifactId>
+      <version>1.9.4</version>
+      <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -661,15 +688,15 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -705,29 +732,16 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.fusesource.jansi</groupId>
-      <artifactId>jansi</artifactId>
-      <version>1.11</version>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.9.4</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.gpars</groupId>
-      <artifactId>gpars</artifactId>
-      <version>1.2.1</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>groovy-all</artifactId>
-          <groupId>org.codehaus.groovy</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.7</version>
+      <version>1.4.10</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -746,17 +760,36 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.ivy</groupId>
-      <artifactId>ivy</artifactId>
-      <version>2.4.0</version>
+      <groupId>org.fusesource.jansi</groupId>
+      <artifactId>jansi</artifactId>
+      <version>1.11</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.9.4</version>
+      <groupId>org.apache.ivy</groupId>
+      <artifactId>ivy</artifactId>
+      <version>2.4.0</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.gpars</groupId>
+      <artifactId>gpars</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>groovy-all</artifactId>
+          <groupId>org.codehaus.groovy</groupId>
+        </exclusion>
+      </exclusions>
       <optional>true</optional>
     </dependency>
   </dependencies>