diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml
index dde5938b0a..26ae864d0b 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml
@@ -86,7 +86,7 @@
                                 <artifactItem>
                                     <groupId>edu.wpi.first.wpilib.networktables.java</groupId>
                                     <artifactId>NetworkTables</artifactId>
-                                    <version>0.1.0-SNAPSHOT</version>
+                                    <version>3.0.0-SNAPSHOT</version>
                                     <classifier>sources</classifier>
                                     <outputDirectory>${java-zip}/lib</outputDirectory>
                                     <destFileName>NetworkTables-sources.jar</destFileName>
@@ -142,7 +142,7 @@
                                 <artifactItem>
                                     <groupId>edu.wpi.first.wpilib.networktables.java</groupId>
                                     <artifactId>NetworkTables</artifactId>
-                                    <version>0.1.0-SNAPSHOT</version>
+                                    <version>3.0.0-SNAPSHOT</version>
                                 </artifactItem>
 
                                 <artifactItem>
@@ -309,7 +309,7 @@
         <dependency>
             <groupId>edu.wpi.first.wpilib.networktables.java</groupId>
             <artifactId>NetworkTables</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -347,7 +347,7 @@
         <dependency>
             <groupId>edu.wpi.first.wpilib.networktables.java</groupId>
             <artifactId>NetworkTables</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
             <classifier>sources</classifier>
         </dependency>
         <!--<dependency>-->
diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle
index 4cb6f8aa2b..dee28cfb62 100644
--- a/wpilibc/build.gradle
+++ b/wpilibc/build.gradle
@@ -197,24 +197,25 @@ task wpilibcSimZip(type: Zip) {
 // Add the dependency on the wpilib_nonsharedStaticLibrary task to the wpilibc task. Because of the gradle lifecycle,
 // this cannot be done purely with dependsOn in the task, as the static library task doesn't exist yet. Same goes for
 // the networkTablesStaticLibrary task and the two HAL tasks below
-tasks.whenTaskAdded { task ->
-    if (task.name == 'wpilib_nonsharedStaticLibrary') {
-        wpilibcZip.dependsOn task
-    }
+tasks.findAll {
+  it.name == 'wpilib_nonsharedStaticLibrary'
+}.each {
+  wpilibcZip.dependsOn it
 }
 
 // Add the networktables static library as a dependency
-project(':networktables:ntcore').tasks.whenTaskAdded { task ->
-    if (task.name == 'networkTablesStaticLibrary') {
-        wpilibcZip.dependsOn task
-    }
+project(':networktables:ntcore').tasks.findAll {
+  it.name == 'armNtcoreStaticLibrary'
+}.each {
+    wpilibcZip.dependsOn it
 }
 
+
 // Add the hal static and shared libraries as a dependency
-project(':hal').tasks.whenTaskAdded { task ->
-    if (task.name == 'hALAthenaStaticLibrary' || task.name == 'hALAthenaSharedLibrary') {
-        wpilibcZip.dependsOn task
-    }
+project(':hal').tasks.findAll {
+  it.name == 'hALAthenaStaticLibrary' || it.name == 'hALAthenaSharedLibrary'
+}.each {
+  wpilibcZip.dependsOn it
 }
 
 // If doxygen exists on the command line, then add the doxygen task as dependency of the wpilibcZip task