Merge pull request google#710 from Bhasmithal/master

Updating the ProtoTypeAdapter to support custom field names/values annotations
arriolac · Oct 7, 2015 · 2b15334 · 2b15334
2 parents 51082b4 + 503a9e5
commit 2b15334
Show file tree

Hide file tree

Showing 8 changed files with 641 additions and 56 deletions.
diff --git a/proto/pom.xml b/proto/pom.xml
@@ -7,9 +7,12 @@
   <groupId>com.google.code.gson</groupId>
   <artifactId>proto</artifactId>
   <packaging>jar</packaging>
-  <version>0.5</version>
+  <version>0.6-SNAPSHOT</version>
   <name>Gson Protobuf Support</name>
   <description>Gson support for Protobufs</description>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
   <distributionManagement>
     <repository>
       <id>local.repo</id>
@@ -52,21 +55,35 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>1.7.1</version>
+      <version>2.4</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
+      <version>2.6.1</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>18.0</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.27</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -76,6 +93,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
         <executions>
           <execution>
             <id>compile-protoc</id>
@@ -91,6 +109,7 @@
                 <pathconvert pathsep=" " property="proto.files" refid="proto.path" />
                 <exec executable="protoc" failonerror="true">
                   <arg value="--java_out=src/main/java" />
+                  <arg value="--proto_path=/usr/include" />
                   <arg value="-I${project.basedir}/src/main/protobuf" />
                   <arg line="${proto.files}" />
                 </exec>
@@ -125,6 +144,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
+        <version>2.5.2</version>
         <!-- configuration>
           <updateReleaseInfo>true</updateReleaseInfo>
           <createChecksum>true</createChecksum>
@@ -182,7 +202,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptor>src/main/resources/assembly-descriptor.xml</descriptor>
-          <finalName>proto-${version}</finalName>
+          <finalName>proto-${project.version}</finalName>
           <outputDirectory>target/dist</outputDirectory>
           <workDirectory>target/assembly/work</workDirectory>
         </configuration>