From 1d9e86e27c97cd85d898104b4ac42bb487d0d7d0 Mon Sep 17 00:00:00 2001
From: Inderjeet Singh <inder123@gmail.com>
Date: Thu, 4 Dec 2014 22:07:13 +0000
Subject: [PATCH] fixed extras build

---
 extras/pom.xml                                    | 15 +++++++--------
 .../google/gson/graph/GraphAdapterBuilder.java    |  9 ++++++---
 gson/pom.xml                                      |  1 -
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/extras/pom.xml b/extras/pom.xml
index 170b3e7f..41e6c9c9 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.sonatype.oss</groupId>
     <artifactId>oss-parent</artifactId>
-    <version>7</version>
+    <version>9</version>
   </parent>
   <url>http://code.google.com/p/google-gson/</url>
   <description>Google Gson grab bag of utilities, type adapters, etc.</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.3-SNAPSHOT</version>
+      <version>2.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -65,7 +65,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>3.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -113,7 +113,7 @@
       <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <version>2.1.2</version>
+         <version>2.4</version>
          <executions>
            <execution>
              <id>attach-sources</id>
@@ -127,7 +127,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-javadoc-plugin</artifactId>
-         <version>2.8.1</version>
+         <version>2.10.1</version>
          <executions>
            <execution>
              <id>attach-javadocs</id>
@@ -173,7 +173,6 @@
   <developers>
     <developer>
       <name>Inderjeet Singh</name>
-      <organization>Trymph Inc.</organization>
     </developer>
     <developer>
       <name>Joel Leitch</name>
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 2daa158d..cd8ea00f 100644
--- a/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
+++ b/extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
@@ -42,10 +42,13 @@ import java.util.Queue;
 // TODO: proper documentation
 @SuppressWarnings("rawtypes")
 public final class GraphAdapterBuilder {
-  private final ConstructorConstructor constructorConstructor = new ConstructorConstructor();
-  private final Map<Type, InstanceCreator<?>> instanceCreators
-      = new HashMap<Type, InstanceCreator<?>>();
+  private final Map<Type, InstanceCreator<?>> instanceCreators;
+  private final ConstructorConstructor constructorConstructor;
 
+  public GraphAdapterBuilder() {
+      this.instanceCreators = new HashMap<Type, InstanceCreator<?>>();
+      this.constructorConstructor = new ConstructorConstructor(instanceCreators);
+  }
   public GraphAdapterBuilder addType(Type type) {
     final ObjectConstructor<?> objectConstructor = constructorConstructor.get(TypeToken.get(type));
     InstanceCreator<Object> instanceCreator = new InstanceCreator<Object>() {
diff --git a/gson/pom.xml b/gson/pom.xml
index dc18df69..66c302b5 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -232,7 +232,6 @@
   <developers>
     <developer>
       <name>Inderjeet Singh</name>
-      <organization>Trymph Inc.</organization>
     </developer>
     <developer>
       <name>Joel Leitch</name>