Fixes #71

Author: alexanderdean

java-scala/CHANGELOG

@@ -1,5 +1,6 @@
 Version 0.3.0 (2014-07-02)
 --------------------------
 Added configurable list of domains which should count as "internal" (#18)
+Remove sbt-assembly and legacy Maven publish code (#71)
 Made tests JSON-driven (#4)
 Added CHANGELOG (#68)

java-scala/project/BuildSettings.scala

@@ -29,33 +29,11 @@ object BuildSettings {
     resolvers     ++= Dependencies.resolutionRepos
   )
 
-  // sbt-assembly settings for building a fat jar
-  import sbtassembly.Plugin._
-  import AssemblyKeys._
-  lazy val sbtAssemblySettings = assemblySettings ++ Seq(
-    assembleArtifact in packageScala := false,
-    jarName in assembly <<= (name, version) { (name, version) => name + "-" + version + ".jar" },
-    mergeStrategy in assembly <<= (mergeStrategy in assembly) {
-      (old) => {
-        case x if x.startsWith("META-INF/") => MergeStrategy.discard
-        case x => old(x)
-      }
-    }
-  )
-
   // Publish settings
   // TODO: update with ivy credentials etc when we start using Nexus
   lazy val publishSettings = Seq[Setting[_]](
-   
-    crossPaths := false,
-    publishTo <<= version { version =>
-      val keyFile = (Path.userHome / ".ssh" / "admin_keplar.osk")
-      val basePath = "/var/www/maven.snplow.com/prod/public/%s".format {
-        if (version.trim.endsWith("SNAPSHOT")) "snapshots/" else "releases/"
-      }
-      Some(Resolver.sftp("SnowPlow Analytics Maven repository", "prodbox", 8686, basePath) as ("admin", keyFile))
-    }
+    crossPaths := false
   )
 
-  lazy val buildSettings = basicSettings ++ sbtAssemblySettings ++ publishSettings
+  lazy val buildSettings = basicSettings ++ publishSettings
 }

java-scala/project/plugins.sbt

@@ -1,3 +0,0 @@
-resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
-
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.2")