diff --git a/gson/pom.xml b/gson/pom.xml
index 20315e71..411d1f4f 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -7,9 +7,15 @@
   <version>1.7-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <name>Gson</name>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>5</version>
+  </parent>
   <url>http://code.google.com/p/google-gson/</url>
   <description>Google Gson library</description>
-  <distributionManagement>
+  <!--  distributionManagement>
+  // Disabled for automatic integration with Sonatype
     <repository>
       <id>local.repo</id>
       <name>file repository to svn</name>
@@ -21,7 +27,7 @@
       <id>gson</id>
       <url> http://google-gson.googlecode.com/svn/mavenrepo/ </url>
     </repository>
-  </repositories>
+  </repositories-->
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
diff --git a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java b/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
deleted file mode 100644
index a76d5612..00000000
--- a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.gson.reflect;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.RandomAccess;
-import java.util.Set;
-import junit.framework.TestCase;
-
-/**
- * @author Jesse Wilson
- */
-@SuppressWarnings({"UnusedDeclaration", "deprecation"})
-public final class TypeTokenTest extends TestCase {
-
-  List<Integer> listOfInteger = null;
-  List<Number> listOfNumber = null;
-  List<String> listOfString = null;
-  List<?> listOfUnknown = null;
-  List<Set<String>> listOfSetOfString = null;
-  List<Set<?>> listOfSetOfUnknown = null;
-
-  public void testIsAssignableFromRawTypes() {
-    assertTrue(TypeToken.get(Object.class).isAssignableFrom(String.class));
-    assertFalse(TypeToken.get(String.class).isAssignableFrom(Object.class));
-    assertTrue(TypeToken.get(RandomAccess.class).isAssignableFrom(ArrayList.class));
-    assertFalse(TypeToken.get(ArrayList.class).isAssignableFrom(RandomAccess.class));
-  }
-
-  public void testIsAssignableFromWithTypeParameters() throws Exception {
-    Type a = getClass().getDeclaredField("listOfInteger").getGenericType();
-    Type b = getClass().getDeclaredField("listOfNumber").getGenericType();
-    assertTrue(TypeToken.get(a).isAssignableFrom(a));
-    assertTrue(TypeToken.get(b).isAssignableFrom(b));
-
-    // listOfInteger = listOfNumber; // doesn't compile; must be false
-    assertFalse(TypeToken.get(a).isAssignableFrom(b));
-    // listOfNumber = listOfInteger; // doesn't compile; must be false
-    assertFalse(TypeToken.get(b).isAssignableFrom(a));
-  }
-
-  public void testIsAssignableFromWithBasicWildcards() throws Exception {
-    Type a = getClass().getDeclaredField("listOfString").getGenericType();
-    Type b = getClass().getDeclaredField("listOfUnknown").getGenericType();
-    assertTrue(TypeToken.get(a).isAssignableFrom(a));
-    assertTrue(TypeToken.get(b).isAssignableFrom(b));
-
-    // listOfString = listOfUnknown  // doesn't compile; must be false
-    assertFalse(TypeToken.get(a).isAssignableFrom(b));
-    listOfUnknown = listOfString; // compiles; must be true
-    assertTrue(TypeToken.get(b).isAssignableFrom(a));
-  }
-
-  public void testIsAssignableFromWithNestedWildcards() throws Exception {
-    Type a = getClass().getDeclaredField("listOfSetOfString").getGenericType();
-    Type b = getClass().getDeclaredField("listOfSetOfUnknown").getGenericType();
-    assertTrue(TypeToken.get(a).isAssignableFrom(a));
-    assertTrue(TypeToken.get(b).isAssignableFrom(b));
-
-    // listOfSetOfString = listOfSetOfUnknown; // doesn't compile; must be false
-    assertFalse(TypeToken.get(a).isAssignableFrom(b));
-    // listOfSetOfUnknown = listOfSetOfString; // doesn't compile; must be false
-    assertFalse(TypeToken.get(b).isAssignableFrom(a));
-  }
-}