Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/util/pom.xml

Index: third_party/protobuf/java/util/pom.xml
diff --git a/third_party/protobuf/java/util/pom.xml b/third_party/protobuf/java/util/pom.xml
index 0ccfc848d9530d0f4d24fa914256572ebd8f50cc..9236f90759f486245a1a051f8f7590c23c53f592 100644
--- a/third_party/protobuf/java/util/pom.xml
+++ b/third_party/protobuf/java/util/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.0.0-beta-3</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.7</version>
+      <version>2.3</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -79,24 +79,12 @@
         </executions>
       </plugin>
 
-      <!-- Add the generated test sources to the build -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <!-- Add the generated test sources to the build -->
+          <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>
+        </configuration>
       </plugin>
 
       <!-- Configure the OSGI bundle -->