DSP-13218 fix assembling

Author: jtgrabowski

README.md

@@ -51,7 +51,7 @@ run (Java)   | `dse spark-submit --class com.datastax.spark.example.WriteRead ta
 
 Task                | Command
 --------------------|------------
-build               | `gradle build`
+build               | `gradle shadowJar`
 run (Scala, Java)   | `dse spark-submit --class com.datastax.spark.example.WriteRead build/libs/writeRead-0.1-all.jar`
 
 ### Maven

java/maven/dse/pom.xml

@@ -44,11 +44,13 @@
       <groupId>com.datastax.dse</groupId>
       <artifactId>dse-java-driver-core</artifactId>
       <version>1.2.3</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>6.0.1</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 

java/sbt/dse/build.sbt

@@ -19,8 +19,8 @@ libraryDependencies ++= Seq(
     ExclusionRule("com.datastax.dse", "dse-java-driver-core"),
     ExclusionRule("org.apache.solr", "solr-solrj")
   ),
-  "com.datastax.dse" % "dse-java-driver-core" % "1.2.3",
-  "org.apache.solr" % "solr-solrj" % "6.0.1"
+  "com.datastax.dse" % "dse-java-driver-core" % "1.2.3" % "provided",
+  "org.apache.solr" % "solr-solrj" % "6.0.1" % "provided"
 )
 
 //Your dependencies
@@ -32,6 +32,7 @@ assemblyMergeStrategy in assembly := {
   case x => (assemblyMergeStrategy in assembly).value(x)
 }
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)

java/sbt/dse/project/assembly.sbt

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

java/sbt/oss/build.sbt

@@ -24,6 +24,7 @@ libraryDependencies ++= Seq(
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)

java/sbt/oss/project/assembly.sbt

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

scala/maven/dse/pom.xml

@@ -58,11 +58,13 @@
       <groupId>com.datastax.dse</groupId>
       <artifactId>dse-java-driver-core</artifactId>
       <version>1.2.3</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>6.0.1</version>
+      <scope>provided</scope>
     </dependency>
     <!-- Test Dependencies -->
     <dependency>

scala/maven/oss/pom.xml

@@ -27,6 +27,7 @@
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>

scala/sbt/dse/build.sbt

@@ -30,12 +30,12 @@ val jUnitVersion = "4.12"
 val cassandraVersion = "3.2"
 
 libraryDependencies ++= Seq(
-  "com.datastax.dse" % "dse-java-driver-core" % "1.2.3",
-  "org.apache.solr" % "solr-solrj" % "6.0.1",
+  "com.datastax.dse" % "dse-java-driver-core" % "1.2.3" % "provided",
+  "org.apache.solr" % "solr-solrj" % "6.0.1" % "provided",
   "com.datastax.spark" %% "spark-cassandra-connector-embedded" % connectorVersion % "test",
   "org.apache.cassandra" % "cassandra-all" % cassandraVersion % "test",
   "org.scalatest" %% "scalatest" % scalaTestVersion % "test",
-  "junit" % "junit" % "4.12"
+  "junit" % "junit" % "4.12" % "test"
 ).map(_.excludeAll(
   ExclusionRule("org.slf4j","log4j-over-slf4j"),
   ExclusionRule("org.slf4j","slf4j-log4j12"))
@@ -53,6 +53,7 @@ assemblyMergeStrategy in assembly := {
 //libraryDependencies += "org.apache.commons" % "commons-math3" % "3.6.1"
 //libraryDependencies += "org.apache.commons" % "commons-csv" % "1.0"
 
+assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 //assemblyShadeRules in assembly := Seq(
 //  ShadeRule.rename("org.apache.commons.csv.**" -> "shaded.org.apache.commons.csv.@1").inAll
 //)

scala/sbt/dse/project/assembly.sbt

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