From 7f9762db633dde22b801e365d4ae02d50acaa6bf Mon Sep 17 00:00:00 2001
From: Inderjeet Singh <inder123@gmail.com>
Date: Tue, 12 Apr 2011 16:16:35 +0000
Subject: [PATCH] Updated Maven dependencies and license notice in
 ProtoTypeAdapter.

---
 proto/pom.xml                                 | 84 ++++---------------
 .../gson/protobuf/ProtoTypeAdapter.java       | 16 +++-
 2 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/proto/pom.xml b/proto/pom.xml
index ad40111a..9bf44c56 100644
--- a/proto/pom.xml
+++ b/proto/pom.xml
@@ -7,7 +7,7 @@
   <groupId>com.google.code.gson</groupId>
   <artifactId>proto</artifactId>
   <packaging>jar</packaging>
-  <version>0.1</version>
+  <version>0.5</version>
   <name>Gson Protobuf Support</name>
   <description>Gson support for Protobufs</description>
   <distributionManagement>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>1.6</version>
+      <version>1.7-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
@@ -105,6 +105,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -113,12 +114,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.8</version>
         <configuration>
           <downloadSources>true</downloadSources>
           <downloadJavadocs>true</downloadJavadocs>
           <workspace>../eclipse-ws</workspace>
           <workspaceCodeStylesURL>file:///${basedir}/../lib/gson-formatting-styles.xml</workspaceCodeStylesURL>
-          <wtpversion>1.5</wtpversion>
         </configuration>
       </plugin>
       <plugin>
@@ -136,24 +137,21 @@
         </configuration -->
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <arguments>-DenableCiProfile=true</arguments>
+          <tagBase>https://google-gson.googlecode.com/svn/tags/</tagBase>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-      <plugin>
-      <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
         <executions>
           <execution>
             <id>attach-sources</id>
-            <phase>verify</phase>
             <goals>
               <goal>jar</goal>
             </goals>
@@ -161,69 +159,23 @@
         </executions>
       </plugin>
       <plugin>
-        <!-- TODO(inder): add manifest entry for maven group, artifact, and classifier ids -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>	
-          <archive>src/main/resources/javadoc-descriptor.xml</archive>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-          </links>
-          <version>true</version>
-          <useDefaultManifestFile>true</useDefaultManifestFile>
-          <show>public</show>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <targetJdk>1.5</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/imports.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-            <ruleset>/rulesets/finalizers.xml</ruleset>
-          </rulesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <!-- configLocation>config/sun_checks.xml</configLocation -->
-          <configLocation>config/maven_checks.xml</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>@todo</tag>
-            <tag>FIXME</tag>
-            <tag>XXX</tag>
-          </tags>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.7</version>
         <executions>
           <execution>
-            <id>clean</id>
+            <id>attach-javadocs</id>
             <goals>
-              <goal>clean</goal>
+              <goal>jar</goal>
             </goals>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
         <configuration>
-          <arguments>-DenableCiProfile=true</arguments>
+          <links>
+            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+          </links>
+          <version>true</version>
+          <show>public</show>
         </configuration>
       </plugin>
       <plugin>
diff --git a/proto/src/main/java/com/google/gson/protobuf/ProtoTypeAdapter.java b/proto/src/main/java/com/google/gson/protobuf/ProtoTypeAdapter.java
index 20eef36f..7a6be05f 100644
--- a/proto/src/main/java/com/google/gson/protobuf/ProtoTypeAdapter.java
+++ b/proto/src/main/java/com/google/gson/protobuf/ProtoTypeAdapter.java
@@ -1,4 +1,18 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * 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.protobuf;