diff --git a/hbase-noop-htrace/pom.xml b/hbase-noop-htrace/pom.xml
index d1fe2c9..3b78731 100644
--- a/hbase-noop-htrace/pom.xml
+++ b/hbase-noop-htrace/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-noop-htrace</artifactId>
@@ -38,11 +38,9 @@
     <!-- This library is meant to work with whatever HBase and Hadoop combos we still list
          as recommended. The version here is what we'll test out of the box if you run mvn test
       -->
-    <hbase.stable.version>2.3.3</hbase.stable.version>
+    <hbase.stable.version>2.4.8</hbase.stable.version>
     <!-- should match the slf4j-api version used in the above hbase -->
-    <slf4j.version>1.7.25</slf4j.version>
-    <!-- This is also used by branch-1, so make sure we're jdk7 compatible -->
-    <compileSource>1.7</compileSource>
+    <slf4j.version>1.7.30</slf4j.version>
     <!-- These maybe need to match the main repo -->
     <maven.checkstyle.version>3.1.0</maven.checkstyle.version>
     <checkstyle.version>8.28</checkstyle.version>
diff --git a/hbase-shaded-gson/pom.xml b/hbase-shaded-gson/pom.xml
index 38fda1e..c3ceb63 100644
--- a/hbase-shaded-gson/pom.xml
+++ b/hbase-shaded-gson/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-gson</artifactId>
@@ -40,10 +40,6 @@
   <description>
     Pulls down GSON, relocates it and makes a far jar.
   </description>
-  <properties>
-    <!-- This GSON is also used by branch-1, so make sure we're jdk7 compatible -->
-    <compileSource>1.7</compileSource>
-  </properties>
   <build>
     <plugins>
       <plugin>
diff --git a/hbase-shaded-jersey/pom.xml b/hbase-shaded-jersey/pom.xml
index aa6ca28..a13c7aa 100644
--- a/hbase-shaded-jersey/pom.xml
+++ b/hbase-shaded-jersey/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-jersey</artifactId>
diff --git a/hbase-shaded-jetty/pom.xml b/hbase-shaded-jetty/pom.xml
index 81e7bfe..86e1aae 100644
--- a/hbase-shaded-jetty/pom.xml
+++ b/hbase-shaded-jetty/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-jetty</artifactId>
diff --git a/hbase-shaded-miscellaneous/pom.xml b/hbase-shaded-miscellaneous/pom.xml
index b9536b0..f33032d 100644
--- a/hbase-shaded-miscellaneous/pom.xml
+++ b/hbase-shaded-miscellaneous/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-miscellaneous</artifactId>
diff --git a/hbase-shaded-netty/pom.xml b/hbase-shaded-netty/pom.xml
index 5b273d9..78dd915 100644
--- a/hbase-shaded-netty/pom.xml
+++ b/hbase-shaded-netty/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-netty</artifactId>
diff --git a/hbase-shaded-protobuf/pom.xml b/hbase-shaded-protobuf/pom.xml
index cb0ac5d..acbb8c8 100644
--- a/hbase-shaded-protobuf/pom.xml
+++ b/hbase-shaded-protobuf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.hbase.thirdparty</groupId>
     <artifactId>hbase-thirdparty</artifactId>
-    <version>3.5.1</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shaded-protobuf</artifactId>
diff --git a/pom.xml b/pom.xml
index ff81602..a01ab26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
   </parent>
   <groupId>org.apache.hbase.thirdparty</groupId>
   <artifactId>hbase-thirdparty</artifactId>
-  <version>3.5.1</version>
+  <version>4.0.0-SNAPSHOT</version>
   <name>Apache HBase Third-Party Libs</name>
   <packaging>pom</packaging>
   <description>