checkpoint- sbt working

.gitignore

@@ -6,3 +6,7 @@ target
 tf-sandbox
 spark-warehouse/
 metastore_db/
+derby.log
+dependencyTree.txt
+effective-pom.xml
+build

build.sbt

@@ -1,9 +1,8 @@
-scalaVersion in Global := "2.11.4" 
+scalaVersion in Global := "2.11.8"
 
 def ProjectName(name: String,path:String): Project =  Project(name, file(path))
 
-resolvers in Global ++= Seq(Resolver.mavenLocal, "http://central1.maven.org/maven2" at "http://central1.maven.org/maven2" ,
-           "https://tap.jfrog.io/tap/public" at "https://tap.jfrog.io/tap/public" ,
+resolvers in Global ++= Seq("https://tap.jfrog.io/tap/public" at "https://tap.jfrog.io/tap/public" ,
            "https://tap.jfrog.io/tap/public-snapshots" at "https://tap.jfrog.io/tap/public-snapshots" ,
            "https://repo.maven.apache.org/maven2" at "https://repo.maven.apache.org/maven2" )
 
@@ -21,20 +20,24 @@ 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"
 
-
 version := "1.0-SNAPSHOT"
 
 name := "spark-tensorflow-connector"
 
 organization := "org.trustedanalytics"
 
-libraryDependencies in Global ++= Seq(`org.tensorflow_tensorflow-hadoop`,
+libraryDependencies in Global ++= Seq(`org.tensorflow_tensorflow-hadoop` classifier "shaded-protobuf",
    `org.scalatest_scalatest_2.11` % "test" ,
    `org.apache.spark_spark-sql_2.11` % "provided" ,
    `org.apache.spark_spark-mllib_2.11` % "test" classifier "tests" ,
    `org.apache.spark_spark-core_2.11` % "provided" ,
    `org.apache.hadoop_hadoop-yarn-api` % "provided" ,
    `junit_junit` % "test" )
 
-
-
+assemblyMergeStrategy in assembly := {
+  case PathList("org", "apache", xs @ _*) => MergeStrategy.last
+  case PathList("com", "google", xs @ _*) => MergeStrategy.last
+  case x =>
+    val oldStrategy = (assemblyMergeStrategy in assembly).value
+    oldStrategy(x)
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.13

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")

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 {