From ad217d11d6aa7205c202ed4cb3bffb4a996718ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Tue, 22 Aug 2017 11:18:56 +0200
Subject: [PATCH 1/8] [BEAM-2530] Upgrade byte-buddy to version 1.7.5

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ccd8d888941..297efeb39d2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,7 @@
     <avro.version>1.8.2</avro.version>
     <bigquery.version>v2-rev355-1.22.0</bigquery.version>
     <bigtable.version>1.0.0-pre3</bigtable.version>
+    <byte-buddy.version>1.7.5</byte-buddy.version>
     <cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version>
     <pubsubgrpc.version>0.1.18</pubsubgrpc.version>
     <clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version>
@@ -1140,7 +1141,7 @@
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
-        <version>1.6.8</version>
+        <version>${byte-buddy.version}</version>
       </dependency>
 
       <dependency>

From 5258a395bc18d3994517699efd60bb4135ff0773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 23 Aug 2017 09:15:05 +0200
Subject: [PATCH 2/8] [BEAM-2530] Upgrade maven-shade-plugin to version 3.1.0

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

diff --git a/pom.xml b/pom.xml
index 297efeb39d2a..09a2a74cb370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
     <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
     <maven-license-plugin.version>1.13</maven-license-plugin.version>
     <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
-    <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.1.0</maven-shade-plugin.version>
     <reproducible-build-maven-plugin.version>0.3</reproducible-build-maven-plugin.version>
 
     <compiler.error.flag>-Werror</compiler.error.flag>

From ddcea4b02d2f8b98efec0c5cdf17db2695126aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 8 Sep 2017 09:42:10 +0200
Subject: [PATCH 3/8] [BEAM-2530] Update maven-compiler-plugin to version 3.7.0

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

diff --git a/pom.xml b/pom.xml
index 09a2a74cb370..26440634e4f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
     <surefire-plugin.version>2.20</surefire-plugin.version>
     <failsafe-plugin.version>2.20</failsafe-plugin.version>
-    <maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-dependency-plugin.version>3.0.1</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
     <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>

From b2b02eb59655c96398f0b48f98a12e833b7e1d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Mon, 11 Sep 2017 21:58:25 +0200
Subject: [PATCH 4/8] [BEAM-2530] Add Java 9 profile to fix javadoc,
 google-value and findbugs issues

---
 pom.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pom.xml b/pom.xml
index 26440634e4f5..b028a0e97c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,6 +338,34 @@
       </build>
     </profile>
 
+    <profile>
+      <id>java9</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <!-- Disable until findbugs supports Java 9 -->
+        <findbugs.skip>true</findbugs.skip>
+        <!-- Disable because google.auto produces a warning on compilation
+          with Java 9. https://github.com/google/auto/issues/503 -->
+        <compiler.error.flag></compiler.error.flag>
+        <!-- Disable failOnError for javadoc until the issue with the classpath
+          and @Nullable is resolved -->
+        <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>--add-modules ALL-SYSTEM</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>eclipse-jdt</id>
       <properties>

From 9158a02ad0e889e086966f7b851901ff1e81223d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Thu, 14 Sep 2017 22:16:32 +0200
Subject: [PATCH 5/8] [BEAM-2530] Update maven-dependency-plugin to version
 3.0.2

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

diff --git a/pom.xml b/pom.xml
index b028a0e97c4d..eba19c13be30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
     <surefire-plugin.version>2.20</surefire-plugin.version>
     <failsafe-plugin.version>2.20</failsafe-plugin.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-    <maven-dependency-plugin.version>3.0.1</maven-dependency-plugin.version>
+    <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
     <maven-exec-plugin.version>1.6.0</maven-exec-plugin.version>
     <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>

From 52b3b57e407c2dea22c6245bc06a5f07c6d7d45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 15 Sep 2017 18:12:19 +0200
Subject: [PATCH 6/8] [BEAM-2530] Update maven-surefire-plugin to version
 2.20.1

---
 pom.xml                                                     | 6 +++---
 .../src/main/resources/archetype-resources/pom.xml          | 2 +-
 .../examples/src/main/resources/archetype-resources/pom.xml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index eba19c13be30..53a295b55473 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
 
     <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
     <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
-    <surefire-plugin.version>2.20</surefire-plugin.version>
+    <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
     <failsafe-plugin.version>2.20</failsafe-plugin.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
@@ -1606,7 +1606,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire-plugin.version}</version>
+          <version>${maven-surefire-plugin.version}</version>
           <configuration>
             <useManifestOnlyJar>false</useManifestOnlyJar>
             <trimStackTrace>false</trimStackTrace>
@@ -1617,7 +1617,7 @@
             <dependency>
               <groupId>org.apache.maven.surefire</groupId>
               <artifactId>surefire-junit47</artifactId>
-              <version>${surefire-plugin.version}</version>
+              <version>${maven-surefire-plugin.version}</version>
             </dependency>
           </dependencies>
         </plugin>
diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
index ffdb06604666..d480143e43a3 100644
--- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
@@ -44,7 +44,7 @@
     <pubsub.version>@pubsub.version@</pubsub.version>
     <slf4j.version>@slf4j.version@</slf4j.version>
     <spark.version>@spark.version@</spark.version>
-    <surefire-plugin.version>@surefire-plugin.version@</surefire-plugin.version>
+    <surefire-plugin.version>@maven-surefire-plugin.version@</surefire-plugin.version>
   </properties>
 
   <repositories>
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index b8b9c9f0fa49..aec87dfd4e01 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -43,7 +43,7 @@
     <pubsub.version>@pubsub.version@</pubsub.version>
     <slf4j.version>@slf4j.version@</slf4j.version>
     <spark.version>@spark.version@</spark.version>
-    <surefire-plugin.version>@surefire-plugin.version@</surefire-plugin.version>
+    <surefire-plugin.version>@maven-surefire-plugin.version@</surefire-plugin.version>
   </properties>
 
   <repositories>

From a201fe106a290f110606f1e0b34214465809b2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Fri, 15 Sep 2017 18:17:00 +0200
Subject: [PATCH 7/8] [BEAM-2530] Update maven-failsafe-plugin to version
 2.20.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53a295b55473..75480afec1b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
     <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
     <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
     <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
-    <failsafe-plugin.version>2.20</failsafe-plugin.version>
+    <maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
@@ -1625,7 +1625,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${failsafe-plugin.version}</version>
+          <version>${maven-failsafe-plugin.version}</version>
           <configuration>
             <trimStackTrace>false</trimStackTrace>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>

From 1a4404e602b5a3b08146f016c59be56a0c7f2e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= <iemejia@gmail.com>
Date: Wed, 27 Sep 2017 10:50:35 +0200
Subject: [PATCH 8/8] [BEAM-2530] Fix SolrIO test compile on Java 9

---
 sdks/java/io/solr/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sdks/java/io/solr/pom.xml b/sdks/java/io/solr/pom.xml
index a757a5721fbf..de94c45f3ff6 100644
--- a/sdks/java/io/solr/pom.xml
+++ b/sdks/java/io/solr/pom.xml
@@ -113,6 +113,13 @@
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-test-framework</artifactId>
             <version>5.5.4</version>
+            <exclusions>
+                <!-- Fix build on JDK-9 -->
+                <exclusion>
+                    <groupId>jdk.tools</groupId>
+                    <artifactId>jdk.tools</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>