From a7e88995523b4973c28545491dfe734375838a71 Mon Sep 17 00:00:00 2001
From: Guillaume Scheibel <gscheibel@expedia.com>
Date: Mon, 18 Feb 2019 20:05:02 +0100
Subject: [PATCH 1/4] Add JDK11 build step

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77da348206..f6e9f77844 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,9 @@ deploy:
     on:
       repo: ExpediaDotCom/graphql-kotlin
       branch: master
-      jdk: oraclejdk8
+      jdk:
+        - oraclejdk8
+        - openjdk11
   -
     provider: script
     script: .travis/deploy.sh
@@ -31,7 +33,9 @@ deploy:
     on:
       repo: ExpediaDotCom/graphql-kotlin
       tags: true
-      jdk: oraclejdk8
+      jdk:
+        - oraclejdk8
+        - openjdk11
 
 after_deploy:
   - .travis/update-version.sh

From 2138e3cbe81c713fec47de0f313456ed4c0213f3 Mon Sep 17 00:00:00 2001
From: Guillaume Scheibel <gscheibel@expedia.com>
Date: Mon, 18 Feb 2019 20:20:22 +0100
Subject: [PATCH 2/4] Switch to openjdk 8 instead of oracle jdk 8

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6e9f77844..bfb7bbcf52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ deploy:
       repo: ExpediaDotCom/graphql-kotlin
       branch: master
       jdk:
-        - oraclejdk8
+        - openjdk8
         - openjdk11
   -
     provider: script
@@ -34,7 +34,7 @@ deploy:
       repo: ExpediaDotCom/graphql-kotlin
       tags: true
       jdk:
-        - oraclejdk8
+        - openjdk8
         - openjdk11
 
 after_deploy:

From 2303064ee9da4a34c1787d95093044748dff4a6f Mon Sep 17 00:00:00 2001
From: Guillaume Scheibel <gscheibel@expedia.com>
Date: Mon, 18 Feb 2019 20:24:49 +0100
Subject: [PATCH 3/4] Switch default build to openjdks

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bfb7bbcf52..aa8a838eb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
 dist: trusty
 
 language: java
-jdk: oraclejdk8
+jdk:
+  - openjdk8
+  - openjdk11
 
 cache:
   directories:

From 727e7eb79ab1edf2a3e77deeeea154c3591d69b9 Mon Sep 17 00:00:00 2001
From: Guillaume Scheibel <gscheibel@expedia.com>
Date: Tue, 19 Feb 2019 09:46:24 +0100
Subject: [PATCH 4/4] Only activate the dokka plugin when the JDK8 is used

---
 pom.xml | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb1140b819..6478111c2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,19 +105,6 @@
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <plugins>
-            <plugin>
-                <groupId>org.jetbrains.dokka</groupId>
-                <artifactId>dokka-maven-plugin</artifactId>
-                <version>${dokka-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>javadocJar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
@@ -410,5 +397,28 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+          <id>jdk8</id>
+          <activation>
+            <jdk>1.8</jdk>
+          </activation>
+          <build>
+            <plugins>
+              <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+                <version>${dokka-maven-plugin.version}</version>
+                <executions>
+                  <execution>
+                    <phase>prepare-package</phase>
+                    <goals>
+                      <goal>javadocJar</goal>
+                    </goals>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+          </build>
+        </profile>
     </profiles>
 </project>