From 47bd9ed568a356a2690f83978a52dea3a3644a1e Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 15 Dec 2017 01:02:46 +0000
Subject: [PATCH 1/4] travis: do openjdk8 and openjdk9 builds/tests

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

diff --git a/.travis.yml b/.travis.yml
index dd64a7ac96..144da4aec1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ language: java
 script: ./mvnw clean verify
 jdk:
   - openjdk7
+  - openjdk8
+  - openjdk9
 after_success:
   - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then
       ./mvnw clean deploy --settings .travis/settings.xml;

From 7a61b5101ef8406491fe2d34d04341438900ecb7 Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 15 Dec 2017 01:11:22 +0000
Subject: [PATCH 2/4] travis only seems to support oraclejdk9

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

diff --git a/.travis.yml b/.travis.yml
index 144da4aec1..de0f99b48d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ script: ./mvnw clean verify
 jdk:
   - openjdk7
   - openjdk8
-  - openjdk9
+  - oraclejdk9 
 after_success:
   - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then
       ./mvnw clean deploy --settings .travis/settings.xml;

From 6a439d6eab7532b44a0f44f64f2bed6135da6270 Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 15 Dec 2017 01:26:34 +0000
Subject: [PATCH 3/4] add jamb-api dependency to get tests to run on oraclejdk9

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

diff --git a/pom.xml b/pom.xml
index 9dd89bd345..08e842b111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,6 +415,12 @@
                 <version>${commons-lang-version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb-version}</version>
+                <scope>compile</scope>
+            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
@@ -502,6 +508,7 @@
         <reflections-version>0.9.11</reflections-version>
         <guava-version>20.0</guava-version>
         <javassist-version>3.21.0-GA</javassist-version>
+        <jaxb-version>2.3.0</jaxb-version>
 
         <testng-version>6.10</testng-version>
         <mockito-version>1.9.5</mockito-version>

From 71dade9ea3dd950f1391f028a16070faf6a4053d Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@yahoo.com>
Date: Fri, 10 Aug 2018 20:28:09 +0100
Subject: [PATCH 4/4] make addRequiredItem protected so that it can be used in
 subclasses

---
 .../src/main/java/io/swagger/v3/core/jackson/ModelResolver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
index cdb4705b42..c6d5f68ae6 100644
--- a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
+++ b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java
@@ -1781,7 +1781,7 @@ protected void resolveSchemaMembers(Schema schema, Annotated a, Annotation[] ann
         }
     }
 
-    private void addRequiredItem(Schema model, String propName) {
+    protected void addRequiredItem(Schema model, String propName) {
         if (model == null || propName == null || StringUtils.isBlank(propName)) {
             return;
         }