diff --git a/extras/pom.xml b/extras/pom.xml
index cca6ebc7..170b3e7f 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.sonatype.oss</groupId>
     <artifactId>oss-parent</artifactId>
-    <version>5</version>
+    <version>7</version>
   </parent>
   <url>http://code.google.com/p/google-gson/</url>
   <description>Google Gson grab bag of utilities, type adapters, etc.</description>
diff --git a/extras/src/main/java/com/google/gson/extras/examples/rawcollections/RawCollectionsExample.java b/extras/src/main/java/com/google/gson/extras/examples/rawcollections/RawCollectionsExample.java
index 3d595cda..bd7c2d24 100644
--- a/extras/src/main/java/com/google/gson/extras/examples/rawcollections/RawCollectionsExample.java
+++ b/extras/src/main/java/com/google/gson/extras/examples/rawcollections/RawCollectionsExample.java
@@ -36,7 +36,7 @@ public class RawCollectionsExample {
     }
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   public static void main(String[] args) {
     Gson gson = new Gson();
     Collection collection = new ArrayList();
diff --git a/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java b/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
index 377934cc..2daa158d 100644
--- a/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
+++ b/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
@@ -40,6 +40,7 @@ import java.util.Queue;
  * Writes a graph of objects as a list of named nodes.
  */
 // TODO: proper documentation
+@SuppressWarnings("rawtypes")
 public final class GraphAdapterBuilder {
   private final ConstructorConstructor constructorConstructor = new ConstructorConstructor();
   private final Map<Type, InstanceCreator<?>> instanceCreators
@@ -207,6 +208,7 @@ public final class GraphAdapterBuilder {
      * <p>Gson should only ever call this method when we're expecting it to;
      * that is only when we've called back into Gson to deserialize a tree.
      */
+    @SuppressWarnings("unchecked")
     public Object createInstance(Type type) {
       Graph graph = graphThreadLocal.get();
       if (graph == null || graph.nextCreate == null) {
diff --git a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
index ea7b0cd4..93ec7858 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
@@ -216,6 +216,7 @@ public class CustomTypeAdaptersTest extends TestCase {
     assertEquals("true", gson.toJson(true, Boolean.class));
   }
 
+  @SuppressWarnings("rawtypes")
   public void testCustomDeserializerInvokedForPrimitives() {
     Gson gson = new GsonBuilder()
         .registerTypeAdapter(boolean.class, new JsonDeserializer() {