diff --git a/.gitignore b/.gitignore
index 30985d3..7e7f77a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gson-parent-2.8.2.tar.gz
+SOURCES/gson-parent-2.8.6.tar.gz
diff --git a/.google-gson.metadata b/.google-gson.metadata
index 9ab5084..fa5764e 100644
--- a/.google-gson.metadata
+++ b/.google-gson.metadata
@@ -1 +1 @@
-c02483c2eda72438c98bad44c6519a0b788337ad SOURCES/gson-parent-2.8.2.tar.gz
+54c266e474fb83a3b7f957e472f60c5cab7b5bb2 SOURCES/gson-parent-2.8.6.tar.gz
diff --git a/SOURCES/java-eight-build.patch b/SOURCES/java-eight-build.patch
new file mode 100644
index 0000000..f2c701e
--- /dev/null
+++ b/SOURCES/java-eight-build.patch
@@ -0,0 +1,15 @@
+diff --git a/pom.xml b/pom.xml
+index 4774e70..c7941b2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -69,9 +69,8 @@
+ default-compile
+
+
+- 9
++ 8
+
+- 9
+
+
+
diff --git a/SOURCES/no-templating-maven-plugin.patch b/SOURCES/no-templating-maven-plugin.patch
new file mode 100644
index 0000000..f58e07f
--- /dev/null
+++ b/SOURCES/no-templating-maven-plugin.patch
@@ -0,0 +1,261 @@
+diff --git a/gson/pom.xml b/gson/pom.xml
+index ffe41ac..5ce5d96 100644
+--- a/gson/pom.xml
++++ b/gson/pom.xml
+@@ -56,23 +56,6 @@
+ org.apache.felix
+ maven-bundle-plugin
+
+-
+- org.codehaus.mojo
+- templating-maven-plugin
+- 1.0.0
+-
+-
+- filtering-java-templates
+-
+- filter-sources
+-
+-
+- ${basedir}/src/main/java-templates
+- ${project.build.directory}/generated-sources/java-templates
+-
+-
+-
+-
+
+
+
+diff --git a/gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java b/gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java
+deleted file mode 100644
+index a94c96b..0000000
+--- a/gson/src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright (C) 2018 The Gson authors
+- *
+- * 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.internal;
+-
+-/**
+- * Build configuration for Gson. This file is automatically populated by
+- * templating-maven-plugin and .java/.class files are generated for use in Gson.
+- *
+- * @author Inderjeet Singh
+- */
+-public final class GsonBuildConfig {
+- // Based on https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven
+-
+- /** This field is automatically populated by Maven when a build is triggered */
+- public static final String VERSION = "${project.version}";
+-
+- private GsonBuildConfig() { }
+-}
+diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
+index 27f3ee9..d584ece 100644
+--- a/gson/src/main/java/com/google/gson/Gson.java
++++ b/gson/src/main/java/com/google/gson/Gson.java
+@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicLongArray;
+
+ import com.google.gson.internal.ConstructorConstructor;
+ import com.google.gson.internal.Excluder;
+-import com.google.gson.internal.GsonBuildConfig;
+ import com.google.gson.internal.Primitives;
+ import com.google.gson.internal.Streams;
+ import com.google.gson.internal.bind.ArrayTypeAdapter;
+@@ -462,7 +461,7 @@ public final class Gson {
+ return candidate;
+ }
+ }
+- throw new IllegalArgumentException("GSON (" + GsonBuildConfig.VERSION + ") cannot handle " + type);
++ throw new IllegalArgumentException("GSON cannot handle " + type);
+ } finally {
+ threadCalls.remove(type);
+
+@@ -704,10 +703,6 @@ public final class Gson {
+ ((TypeAdapter