From 9764df56146e0df49d5e1a5947ad38115558d50a Mon Sep 17 00:00:00 2001
From: Matt Brown <matt@mattnworb.com>
Date: Mon, 10 Sep 2018 13:11:43 -0400
Subject: [PATCH 1/4] travis: add openjdk10

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 855614915..98424e34f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ language: java
 
 jdk:
   - oraclejdk8
+  - openjdk10
 
 env:
   global:

From 1715eb21127ee7f057e8cdd10d5286f5d97932e8 Mon Sep 17 00:00:00 2001
From: Matt Brown <mattbrown@spotify.com>
Date: Wed, 3 Oct 2018 15:09:42 -0400
Subject: [PATCH 2/4] update jacoco-maven-plugin to latest version

first version with support for Java 9 is 0.7.8:
https://groups.google.com/forum/#!msg/jacoco/Zf0Cwj13G2g/wpyrYAEECAAJ

this commit updates to latest available
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 83c18dfcf..1767fc21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,7 +390,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.5.201505241946</version>
+        <version>0.8.2</version>
         <executions>
           <execution>
             <id>jacoco-initialize</id>

From 186e198a6c4438db745490c7ae435fc545c59e3d Mon Sep 17 00:00:00 2001
From: Matt Brown <mattbrown@spotify.com>
Date: Wed, 3 Oct 2018 15:18:48 -0400
Subject: [PATCH 3/4] add javax.activation, was removed in Java 9

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

diff --git a/pom.xml b/pom.xml
index 1767fc21b..42c456aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,11 @@
       <artifactId>jersey-media-json-jackson</artifactId>
       <version>2.22.2</version>
     </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>

From 5799070fa09147f5815e023f485ab327ff23b752 Mon Sep 17 00:00:00 2001
From: Matt Brown <mattbrown@spotify.com>
Date: Wed, 3 Oct 2018 15:39:04 -0400
Subject: [PATCH 4/4] update CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1109856b2..b0831eda1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ Not yet released
 
 - Change maven-compiler-plugin source and target from 1.7 to 1.8 to prepare for Java 8.
   JAR should still be compatible with JRE 1.7.
+- Updates to allow docker-client to function on Java 9+ ([1068][])
+
+[1068]: https://github.com/spotify/docker-client/pull/1068
 
 ## 8.13.0