From 1cbfec66e8d3a26082a853fa990c957994e72f68 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Sun, 28 Jan 2018 19:36:35 +0100
Subject: [PATCH] Add jdk9 build to travis (#562)

* Add jdk9 build to travis
* Add jaxb-api dependency for jdk9 compatibility
---
 .travis.yml  | 6 ++++++
 CHANGELOG.md | 2 ++
 core/pom.xml | 8 ++++++++
 3 files changed, 16 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d886f219b5f..aa2400ce261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,12 @@ jobs:
       env: [ NAME=core ]
       script: ./mvnw -pl core test
 
+    - stage: test
+      env: [ NAME=core ]
+      jdk: oraclejdk9
+      script:
+        - ./mvnw -pl core test
+
     - env: [ NAME=selenium ]
       script: ./mvnw -pl modules/selenium test
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eca3bcb8ae8..bb5c592a41f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 All notable changes to this project will be documented in this file.
 
 ### Fixed
+- Fixed incompatibility of Docker-Compose container with JDK9. ([\#562](https://github.com/testcontainers/testcontainers-java/pull/562))
 - Fixed retrieval of Docker host IP when running inside Docker. ([\#479](https://github.com/testcontainers/testcontainers-java/issues/479))
 - Compose is now able to pull images from private repositories. ([\#536](https://github.com/testcontainers/testcontainers-java/issues/536))
 - Fixed overriding MySQL image command. ([\#534](https://github.com/testcontainers/testcontainers-java/issues/534))
 
 ### Changed
+- Added JDK9 build and tests to Travis-CI. ([\#562](https://github.com/testcontainers/testcontainers-java/pull/562))
 - Added Kafka module ([\#546](https://github.com/testcontainers/testcontainers-java/pull/546))
 - Added "Death Note" to track & kill spawned containers even if the JVM was "kill -9"ed ([\#545](https://github.com/testcontainers/testcontainers-java/pull/545))
 - Environment variables are now stored as Map instead of List ([\#550](https://github.com/testcontainers/testcontainers-java/pull/550))
diff --git a/core/pom.xml b/core/pom.xml
index 00cc48d8e6d..390450b2bb3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -48,6 +48,14 @@
             </exclusions>
         </dependency>
 
+
+        <!-- Added for JDK9 compatibility since it's missing this package -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
         <dependency>
             <!-- docker-java uses SslConfigurator from jersey-common for TLS -->
             <groupId>org.glassfish.jersey.core</groupId>