From f12cb6b0468a75d8d039683b1c093eeaae52f6e7 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Mon, 31 Aug 2020 14:13:31 -0400
Subject: [PATCH] Still trying to figure out why Travis is refusing to build.

---
 .travis.yml | 137 +++++++++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 67 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce9f33184a..03773c206f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,67 +1,70 @@
-language: java
-sudo: required
-
-jobs:
-  include:
-    - os: linux
-      dist: bionic
-    - os: osx
-
-env:
- global:
-  - TSK_HOME=$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit
-
-addons:
-  apt:
-    update: true
-    packages:
-    - testdisk
-    - libafflib-dev
-    - libewf-dev
-    - libpq-dev
-    - autopoint
-    - libsqlite3-dev
-    - ant
-    - ant-optional
-    - libcppunit-dev
-    - wget
-  homebrew:
-    update: true
-    packages:
-    - ant
-    - wget
-    - libpq
-    - libewf
-    - gettext
-    - cppunit
-    - afflib
-    - testdisk
-
-python:
-  - "2.7"
-
-before_install:
- - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit
- - python setupSleuthkitBranch.py
-
-install:
- - pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd
-
-before_script:
-  - if [ $TRAVIS_OS_NAME = linux ]; then 
-        wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
-        echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list
-        sudo apt-get update
-        sudo apt-get install bellsoft-java11-full
-        export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64
-    fi
-  - if [ $TRAVIS_OS_NAME = osx ]; then
-        brew uninstall java --force;
-        brew cask uninstall java --force;
-        brew tap bell-sw/liberica;
-        brew cask install liberica-jdk11-full;
-        #export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11.0.8/Contents/Home;
-    fi
-  - java -version
-
-script: ./travis_build.sh
+{
+  "language": "java",
+  "os": [
+    "linux"
+  ],
+  "dist": "bionic",
+  "jobs": {
+    "include": [
+      {
+        "os": "linux",
+        "dist": "bionic"
+      },
+      {
+        "os": "osx"
+      }
+    ]
+  },
+  "env": {
+    "global": [
+      {
+        "TSK_HOME": "$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit"
+      }
+    ]
+  },
+  "addons": {
+    "apt": {
+      "update": true,
+      "packages": [
+        "testdisk",
+        "libafflib-dev",
+        "libewf-dev",
+        "libpq-dev",
+        "autopoint",
+        "libsqlite3-dev",
+        "ant",
+        "ant-optional",
+        "libcppunit-dev",
+        "wget"
+      ]
+    },
+    "homebrew": {
+      "update": true,
+      "packages": [
+        "ant",
+        "wget",
+        "libpq",
+        "libewf",
+        "gettext",
+        "cppunit",
+        "afflib",
+        "testdisk"
+      ]
+    }
+  },
+  "python": [
+    "2.7"
+  ],
+  "before_install": [
+    "git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit",
+    "python setupSleuthkitBranch.py"
+  ],
+  "install": [
+    "pushd sleuthkit/sleuthkit && ./travis_install_libs.sh && popd"
+  ],
+  "before_script": [
+    "if [ $TRAVIS_OS_NAME = linux ]; then wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add - echo \"deb [arch=amd64] https://apt.bell-sw.com/ stable main\" | sudo tee /etc/apt/sources.list.d/bellsoft.list sudo apt-get update sudo apt-get install bellsoft-java11-full export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64 fi",
+    "if [ $TRAVIS_OS_NAME = osx ]; then brew uninstall java --force; brew cask uninstall java --force; brew tap bell-sw/liberica; brew cask install liberica-jdk11-full; fi",
+    "java -version"
+  ]
+}
\ No newline at end of file