From d86171489722e5812022f3b16ebf6e5c4ea382ec Mon Sep 17 00:00:00 2001
From: Zoe Chitty <19900057+vpsx@users.noreply.github.com>
Date: Mon, 22 Apr 2019 13:31:55 -0500
Subject: [PATCH 1/5] bump sqlalchemy and sqlalchemy-utils

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d42633fa..87c8a5d7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 flask==0.12.4
 jsonschema==2.5.1
-sqlalchemy==1.0.8
-sqlalchemy-utils>=0.32.21
+sqlalchemy==1.3.3
+sqlalchemy-utils>=0.33.11
 psycopg2>=2.7
 future>=0.16.0,<1.0.0
 git+https://github.com/uc-cdis/cdislogging.git@0.0.2#egg=cdislogging

From e0307da62f08cd30a85a3aca1a51f634903964f4 Mon Sep 17 00:00:00 2001
From: Zoe Chitty <19900057+vpsx@users.noreply.github.com>
Date: Mon, 22 Apr 2019 13:56:10 -0500
Subject: [PATCH 2/5] java8 to java9

---
 .travis.yml    | 2 +-
 TestDockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33f73027..791acefa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
 addons:
   apt:
     packages:
-      - oracle-java8-set-default
+      - oracle-java9-set-default
 
 sudo: false
 
diff --git a/TestDockerfile b/TestDockerfile
index f835b047..76ca6d25 100644
--- a/TestDockerfile
+++ b/TestDockerfile
@@ -10,8 +10,8 @@ RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | te
   && apt-get update && \
   mkdir -p /usr/share/man/man1/ \
   && apt-get install -y software-properties-common && \
-  (echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) && \
-  apt-get install -y oracle-java8-set-default && \
+  (echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) && \
+  apt-get install -y oracle-java9-set-default && \
   apt-get clean && \
   rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

From 31e309565f020e23c73ec3b7a12919982bcf6908 Mon Sep 17 00:00:00 2001
From: Zoe Chitty <19900057+vpsx@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:15:57 -0500
Subject: [PATCH 3/5] use travis trusty and do jdk_switcher use oraclejdk8

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

diff --git a/.travis.yml b/.travis.yml
index 791acefa..983c38f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,14 @@
+dist: trusty
 language: python
 
 python:
   - "2.7"
   - "3.4"
-addons:
-  apt:
-    packages:
-      - oracle-java9-set-default
 
 sudo: false
 
+before_install:
+    - jdk_switcher use oraclejdk8
 install:
     - "wget https://oss.sonatype.org/content/repositories/releases/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar"
     - "java -jar swagger-codegen-cli-2.3.1.jar generate -i openapis/swagger.yaml -l python -o swagger_client"

From 28865791a8216db89852a24b1572212d35f49eb2 Mon Sep 17 00:00:00 2001
From: Zoe Chitty <19900057+vpsx@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:28:29 -0500
Subject: [PATCH 4/5] use travis xenial and specify jdk oraclejdk8

---
 .travis.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 983c38f0..b0915ad6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 language: python
 
 python:
@@ -7,8 +7,12 @@ python:
 
 sudo: false
 
-before_install:
-    - jdk_switcher use oraclejdk8
+services:
+    - postgresql
+
+jdk:
+    - oraclejdk8
+
 install:
     - "wget https://oss.sonatype.org/content/repositories/releases/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar"
     - "java -jar swagger-codegen-cli-2.3.1.jar generate -i openapis/swagger.yaml -l python -o swagger_client"

From 39e5daf4eeb1f7e7957e755668e337441abf93dc Mon Sep 17 00:00:00 2001
From: Zoe Chitty <19900057+vpsx@users.noreply.github.com>
Date: Mon, 22 Apr 2019 15:14:41 -0500
Subject: [PATCH 5/5] revert TestDockerfile to java8

---
 TestDockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TestDockerfile b/TestDockerfile
index 76ca6d25..f835b047 100644
--- a/TestDockerfile
+++ b/TestDockerfile
@@ -10,8 +10,8 @@ RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main" | te
   && apt-get update && \
   mkdir -p /usr/share/man/man1/ \
   && apt-get install -y software-properties-common && \
-  (echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) && \
-  apt-get install -y oracle-java9-set-default && \
+  (echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections) && \
+  apt-get install -y oracle-java8-set-default && \
   apt-get clean && \
   rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*