From ee16f57a1b233c86b96177c719e62bf846e7d648 Mon Sep 17 00:00:00 2001
From: Joyesh Mishra <joyesh.mishra@intel.com>
Date: Wed, 15 Feb 2017 01:30:01 -0800
Subject: [PATCH 1/5] Add classifier to bring in correct shaded jar and class

---
 build.sbt                                                      | 2 +-
 .../spark/datasources/tensorflow/serde/FeatureEncoder.scala    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index f104ffb..da0054b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ val `org.apache.spark_spark-mllib_2.11` = "org.apache.spark" % "spark-mllib_2.11
 
 val `org.scalatest_scalatest_2.11` = "org.scalatest" % "scalatest_2.11" % "2.2.6"
 
-val `org.tensorflow_tensorflow-hadoop` = "org.tensorflow" % "tensorflow-hadoop" % "1.0-01232017-SNAPSHOT"
+val `org.tensorflow_tensorflow-hadoop` = "org.tensorflow" % "tensorflow-hadoop" % "1.0-01232017-SNAPSHOT" classifier "shaded-protobuf"
 
 
 version := "1.0-SNAPSHOT"
diff --git a/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala b/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala
index a267a64..667d28d 100644
--- a/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala
+++ b/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala
@@ -15,9 +15,8 @@
  */
 package org.trustedanalytics.spark.datasources.tensorflow.serde
 
-import com.google.protobuf.ByteString
 import org.tensorflow.example.{BytesList, Feature, FloatList, Int64List}
-//import org.tensorflow.hadoop.shaded.protobuf.ByteString
+import org.tensorflow.hadoop.shaded.protobuf.ByteString
 import org.trustedanalytics.spark.datasources.tensorflow.DataTypesConvertor
 
 trait FeatureEncoder {

From 2cc06c3a5908c8e748780b3fcbb7f7d8607c3bfc Mon Sep 17 00:00:00 2001
From: Joyesh Mishra <joyesh.mishra@intel.com>
Date: Wed, 15 Feb 2017 01:55:29 -0800
Subject: [PATCH 2/5] Add travis.yml file

---
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..86feda9
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,20 @@
+language: scala
+sudo: false
+# Cache settings here are based on latest SBT documentation.
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt/boot/
+before_cache:
+  # Tricks to avoid unnecessary cache updates
+  - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
+  - find $HOME/.sbt -name "*.lock" -delete
+
+scala:
+   - 2.11.8
+
+jdk:
+  - openjdk8
+
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION clean publish-local

From e2f5add8f1f1e21158c4940d0436f4d98ddb4ea9 Mon Sep 17 00:00:00 2001
From: Joyesh Mishra <joyesh.mishra@intel.com>
Date: Wed, 15 Feb 2017 02:01:14 -0800
Subject: [PATCH 3/5] Refactor travis file

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

diff --git a/.travis.yml b/.travis.yml
index 86feda9..3f039c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,13 @@
 language: scala
+
 sudo: false
+
 # Cache settings here are based on latest SBT documentation.
 cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
+
 before_cache:
   # Tricks to avoid unnecessary cache updates
   - find $HOME/.ivy2 -name "ivydata-*.properties" -delete

From 5645965937ab38f348d547a9dcd9334dfd853fa0 Mon Sep 17 00:00:00 2001
From: Joyesh Mishra <joyesh.mishra@intel.com>
Date: Wed, 15 Feb 2017 02:12:45 -0800
Subject: [PATCH 4/5] Refactor travis file

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

diff --git a/.travis.yml b/.travis.yml
index 3f039c3..2fe4ba4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ scala:
    - 2.11.8
 
 jdk:
-  - openjdk8
+  - oraclejdk8
 
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean publish-local

From d7da13c35a9b070ae67f24eb88454337562d2fa1 Mon Sep 17 00:00:00 2001
From: Joyesh Mishra <joyesh.mishra@intel.com>
Date: Wed, 15 Feb 2017 02:29:12 -0800
Subject: [PATCH 5/5] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2d0fdac..4fff129 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/tapanalyticstoolkit/spark-tensorflow-connector.svg?branch=sbt)](https://travis-ci.org/tapanalyticstoolkit/spark-tensorflow-connector)
+
 # spark-tensorflow-connector
 
 This repo contains a library for loading and storing TensorFlow records with [Apache Spark](http://spark.apache.org/).