diff --git a/gpars.jar b/gpars.jar
index 6e1ca9f..3b11970 100644
--- a/gpars.jar
+++ b/gpars.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f88f713504bb6b45477de1d6e1a79d0a4a895c9e42a72faa91b062e313c441b2
-size 634127
+oid sha256:2596ada4af955e3c67c1cf3118afea826ddd1570a0e6cf98a7ac8699953deb3f
+size 634129
diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz
index f3beba5..7945c9e 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:b23cacaad6dba98561f99c12519c3cdb425345826a5cf74f558ebb9a3fb7d2a9
-size 50188228
+oid sha256:833c36445c2ad592db1beafcec7035269b130761fe0d85b506455877b9db7b39
+size 50356672
diff --git a/gradle-bootstrap.changes b/gradle-bootstrap.changes
index 75c24d5..966a5ba 100644
--- a/gradle-bootstrap.changes
+++ b/gradle-bootstrap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  7 22:01:43 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Regenerate to account for groovy upgrade to 2.4.21
+
 -------------------------------------------------------------------
 Mon Dec  9 12:18:31 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec
index 9de3af7..9fce881 100644
--- a/gradle-bootstrap.spec
+++ b/gradle-bootstrap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gradle-bootstrap
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %global short_name gradle
 %global gradle_version 4.4.1
-%global groovy_version 2.4.16
+%global groovy_version 2.4.21
 %global gpars_version 1.2.1
 Name:           %{short_name}-bootstrap
 Version:        %{gradle_version}
diff --git a/groovy-all.pom b/groovy-all.pom
index cff537f..492e816 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.16</version>
+  <version>2.4.21</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -24,7 +24,7 @@
     <developer>
       <id>glaforge</id>
       <name>Guillaume Laforge</name>
-      <organization>org.apache.maven.model.Organization@1b374774</organization>
+      <organization>Google</organization>
       <roles>
         <role>Project Manager</role>
         <role>Despot</role>
@@ -35,7 +35,7 @@
       <id>bob</id>
       <name>bob mcwhirter</name>
       <email>bob@werken.com</email>
-      <organization>org.apache.maven.model.Organization@4ef55508</organization>
+      <organization>The Werken Company</organization>
       <roles>
         <role>Founder</role>
       </roles>
@@ -44,7 +44,7 @@
       <id>jstrachan</id>
       <name>James Strachan</name>
       <email>james@coredevelopers.com</email>
-      <organization>org.apache.maven.model.Organization@66984649</organization>
+      <organization>Core Developers Network</organization>
       <roles>
         <role>Founder</role>
       </roles>
@@ -52,7 +52,7 @@
     <developer>
       <id>joe</id>
       <name>Joe Walnes</name>
-      <organization>org.apache.maven.model.Organization@1f1fde0f</organization>
+      <organization>ThoughtWorks</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -60,7 +60,7 @@
     <developer>
       <id>skizz</id>
       <name>Chris Stevenson</name>
-      <organization>org.apache.maven.model.Organization@51e7beff</organization>
+      <organization>ThoughtWorks</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -68,7 +68,7 @@
     <developer>
       <id>jamiemc</id>
       <name>Jamie McCrindle</name>
-      <organization>org.apache.maven.model.Organization@7f4b3afd</organization>
+      <organization>Three</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -76,7 +76,7 @@
     <developer>
       <id>mattf</id>
       <name>Matt Foemmel</name>
-      <organization>org.apache.maven.model.Organization@2ec31e53</organization>
+      <organization>ThoughtWorks</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -128,7 +128,7 @@
       <id>jwilson</id>
       <name>John Wilson</name>
       <email>tug@wilson.co.uk</email>
-      <organization>org.apache.maven.model.Organization@4c9bd035</organization>
+      <organization>The Wilson Partnership</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -145,7 +145,7 @@
       <id>ckl</id>
       <name>Christiaan ten Klooster</name>
       <email>ckl@dacelo.nl</email>
-      <organization>org.apache.maven.model.Organization@5c8288b8</organization>
+      <organization>Dacelo WebDevelopment</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -154,7 +154,7 @@
       <id>goetze</id>
       <name>Steve Goetze</name>
       <email>goetze@dovetail.com</email>
-      <organization>org.apache.maven.model.Organization@563ed1ff</organization>
+      <organization>Dovetailed Technologies, LLC</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -163,7 +163,7 @@
       <id>bran</id>
       <name>Bing Ran</name>
       <email>b55r@sina.com</email>
-      <organization>org.apache.maven.model.Organization@5b26cb82</organization>
+      <organization>Leadingcare</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -172,7 +172,7 @@
       <id>jez</id>
       <name>Jeremy Rayner</name>
       <email>jeremy.rayner@gmail.com</email>
-      <organization>org.apache.maven.model.Organization@622f08db</organization>
+      <organization>javanicus</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -197,8 +197,8 @@
     <developer>
       <id>russel</id>
       <name>Russel Winder</name>
-      <email>russel@russel.org.uk</email>
-      <organization>org.apache.maven.model.Organization@7ac15e93</organization>
+      <email>russel@winder.org.uk</email>
+      <organization>Concertant LLP &amp; It'z Interactive Ltd</organization>
       <roles>
         <role>Developer</role>
         <role>Founder of Gant</role>
@@ -216,7 +216,7 @@
       <id>cstein</id>
       <name>Christian Stein</name>
       <email>sormuras@gmx.de</email>
-      <organization>org.apache.maven.model.Organization@5dae96f4</organization>
+      <organization>CTSR.de</organization>
       <roles>
         <role>Developer Emeritus</role>
       </roles>
@@ -224,8 +224,7 @@
     <developer>
       <id>mittie</id>
       <name>Dierk Koenig</name>
-      <email>dierk.koenig@canoo.com</email>
-      <organization>org.apache.maven.model.Organization@387c3f98</organization>
+      <organization>Karakun AG</organization>
       <roles>
         <role>Developer</role>
       </roles>
@@ -234,7 +233,7 @@
       <id>paulk</id>
       <name>Paul King</name>
       <email>paulk@asert.com.au</email>
-      <organization>org.apache.maven.model.Organization@45b5e01</organization>
+      <organization>OCI, Australia</organization>
       <roles>
         <role>Developer</role>
         <role>Despot</role>
@@ -297,7 +296,7 @@
       <id>jimwhite</id>
       <name>Jim White</name>
       <email>jim@pagesmiths.com</email>
-      <organization>org.apache.maven.model.Organization@705ea75a</organization>
+      <organization>IFCX.org</organization>
       <roles>
         <role>Developer</role>
       </roles>
@@ -344,12 +343,33 @@
     <developer>
       <id>sunlan</id>
       <name>Daniel Sun</name>
-      <email>realbluesun@hotmail.com</email>
       <roles>
         <role>Developer</role>
         <role>Despot</role>
       </roles>
     </developer>
+    <developer>
+      <id>rpopma</id>
+      <name>Remko Popma</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>grocher</id>
+      <name>Graeme Rocher</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>emilles</id>
+      <name>Eric Milles</name>
+      <organization>Thomson Reuters</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
@@ -615,14 +635,14 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.4</version>
+      <version>1.9.15</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-junit</artifactId>
-      <version>1.9.4</version>
+      <version>1.9.15</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -635,14 +655,14 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.9.4</version>
+      <version>1.9.15</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-antlr</artifactId>
-      <version>1.9.4</version>
+      <version>1.9.15</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -703,7 +723,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -734,7 +754,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.4</version>
+      <version>1.9.15</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>