diff --git a/build.gradle b/build.gradle
index d50f88a..c0c76f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,14 +78,31 @@ tasks.withType(Javadoc) {
 // Relocated dependencies are removed from the generated pom
 shadowJar {
     configurations = [project.configurations.jdk]
-    classifier = null
-    relocate 'com.sun', 'com.netflix.devinsight.shaded.com.sun'
-    relocate 'sun', 'com.netflix.devinsight.shaded.sun'
+    classifier = 'jdkbundle'
 
+    exclude 'sun/**/*'
+    exclude 'org/relaxng/**/*'
+    exclude 'META-INF/services/*'
+    exclude 'com/sun/xml/**/*'
+    exclude 'com/sun/jarsigner/**/*'
+    exclude 'com/sun/javadoc/**/*'
+    exclude 'com/sun/istack/**/*'
+    exclude 'com/sun/xml/**/*'
+    
+    relocate 'com.sun', 'com.netflix.devinsight.shaded.com.sun'
+    
+    
     mergeServiceFiles {
         exclude 'META-INF/services/com.sun.*'
     }
 }
 
-jar.deleteAllActions()
-jar.dependsOn shadowJar
+publishing {
+    publications {
+        nebula(MavenPublication) {
+            artifact shadowJar {
+                classifier = 'jdkbundle'
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/com/netflix/java/refactor/ast/MethodMatcherTest.kt b/src/test/kotlin/com/netflix/java/refactor/ast/MethodMatcherTest.kt
index c38c67b..703074c 100644
--- a/src/test/kotlin/com/netflix/java/refactor/ast/MethodMatcherTest.kt
+++ b/src/test/kotlin/com/netflix/java/refactor/ast/MethodMatcherTest.kt
@@ -77,7 +77,7 @@ class MethodMatcherTest: AbstractRefactorTest() {
     fun matchOnInnerClass() {
         val b = java("""
             |public class B {
-            |   public class C {
+            |   public static class C {
             |       public void foo() {}
             |   }
             |}