From ebcda12102f2beaa630a81f5675854abb44746c1 Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Tue, 20 Sep 2016 21:29:02 +0000
Subject: Bump version number to 3.1.0-alpha-1.

---
 java/util/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/util/pom.xml')

diff --git a/java/util/pom.xml b/java/util/pom.xml
index 58cc4b30..4d6ad7fa 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0-alpha-1</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
-- 
cgit v1.2.3


From 6cb6bd9f213a7610ff180dbac7226a22a9f71867 Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Tue, 20 Sep 2016 22:04:48 +0000
Subject: Fix gson dependency. gson 2.3 has internal bug that it doesn't work
 with some versions of maven.

---
 WORKSPACE         | 2 +-
 java/util/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/util/pom.xml')

diff --git a/WORKSPACE b/WORKSPACE
index df919ad1..2a49e372 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -44,7 +44,7 @@ bind(
 
 maven_jar(
     name = "gson_maven",
-    artifact = "com.google.code.gson:gson:2.3",
+    artifact = "com.google.code.gson:gson:2.7",
 )
 
 bind(
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 4d6ad7fa..56a4e528 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.3</version>
+      <version>2.7</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-- 
cgit v1.2.3


From 8c88762e3ef78b81435ecfba973c2e9d3b74f13b Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Thu, 22 Sep 2016 19:24:19 -0700
Subject: Update version number.

---
 java/util/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/util/pom.xml')

diff --git a/java/util/pom.xml b/java/util/pom.xml
index 56a4e528..6b07bcdf 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.1.0-alpha-1</version>
+    <version>3.1.0</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
-- 
cgit v1.2.3


From eb7f3a3ad1e89ab5de0846c354bbc682e63bd837 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Fri, 4 Nov 2016 02:11:55 -0400
Subject: Use latest maven-compiler-plugin (2.6.0)

* Uses build-helper-maven-plugin to add generated sources to the classpath
* Fixes an issue building with newer versions of the maven-compiler-plugin
  (See https://issues.apache.org/jira/browse/MCOMPILER-240)
---
 java/compatibility_tests/v2.5.0/protos/pom.xml |  2 +-
 java/core/pom.xml                              | 33 ++++++++++++++++++++++----
 java/lite/pom.xml                              | 32 +++++++++++++++++++++++--
 java/pom.xml                                   |  2 +-
 java/util/pom.xml                              | 22 +++++++++++++----
 5 files changed, 77 insertions(+), 14 deletions(-)

(limited to 'java/util/pom.xml')

diff --git a/java/compatibility_tests/v2.5.0/protos/pom.xml b/java/compatibility_tests/v2.5.0/protos/pom.xml
index 24447bdc..a22e91ed 100644
--- a/java/compatibility_tests/v2.5.0/protos/pom.xml
+++ b/java/compatibility_tests/v2.5.0/protos/pom.xml
@@ -28,7 +28,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.6.0</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 8a83eb4e..cced344e 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -92,11 +92,34 @@
 
       <!-- Add the generated sources to the build -->
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <generatedSourcesDirectory>${generated.sources.dir}</generatedSourcesDirectory>
-          <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>
-        </configuration>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-generated-sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${generated.sources.dir}</source>
+              </sources>
+            </configuration>
+          </execution>
+          <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>
       </plugin>
 
       <!-- OSGI bundle configuration -->
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 9862cd94..d7b15097 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -75,11 +75,39 @@
       </plugin>
 
       <!-- Only compile a subset of the files -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-generated-sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${generated.sources.lite.dir}</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-generated-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${generated.testsources.lite.dir}</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <generatedSourcesDirectory>${generated.sources.lite.dir}</generatedSourcesDirectory>
-          <generatedTestSourcesDirectory>${generated.testsources.lite.dir}</generatedTestSourcesDirectory>
           <includes>
             <include>**/AbstractMessageLite.java</include>
             <include>**/AbstractParser.java</include>
diff --git a/java/pom.xml b/java/pom.xml
index 881473f3..6789e7c1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -94,7 +94,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.6.0</version>
           <configuration>
             <source>1.6</source>
             <target>1.6</target>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 6b07bcdf..0ccfc848 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -79,12 +79,24 @@
         </executions>
       </plugin>
 
+      <!-- Add the generated test sources to the build -->
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <!-- Add the generated test sources to the build -->
-          <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>
-        </configuration>
+        <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>
       </plugin>
 
       <!-- Configure the OSGI bundle -->
-- 
cgit v1.2.3