diff --git a/README.md b/README.md index c30ef38..2e22187 100644 --- a/README.md +++ b/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 diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle index 8f67143..2f9d230 100644 --- a/java/gradle/dse/build.gradle +++ b/java/gradle/dse/build.gradle @@ -13,7 +13,7 @@ repositories { } } -def dseVersion = "5.1.0" +def dseVersion = "5.1.1" // The assembly configuration will cause jar to be included in assembled fat-jar configurations { @@ -31,14 +31,9 @@ configurations { // Please make sure that following dependencies have versions corresponding to the ones in your cluster. // Note that spark-cassandra-connector should be provided with '--packages' flag to spark-submit command. dependencies { - provided("com.datastax.dse:dse-spark-dependencies:$dseVersion") { - exclude group: 'com.datastax.dse', module: 'dse-java-driver-core' - exclude group: 'org.apache.solr', module: 'solr-solrj' - } + provided "com.datastax.dse:dse-spark-dependencies:$dseVersion" // assembly "org.apache.commons:commons-math3:3.6.1" // assembly "org.apache.commons:commons-csv:1.0" - provided "com.datastax.dse:dse-java-driver-core:1.2.3" - provided "org.apache.solr:solr-solrj:6.0.1" } shadowJar { diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle index d5b8208..3549391 100644 --- a/java/gradle/oss/build.gradle +++ b/java/gradle/oss/build.gradle @@ -10,8 +10,8 @@ repositories { mavenCentral() } -def sparkVersion = "2.0.0" -def connectorVersion = "2.0.1" +def sparkVersion = "2.0.2" +def connectorVersion = "2.0.2" // The assembly configuration will cause jar to be included in assembled fat-jar configurations { diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml index 0631fbd..6db168d 100644 --- a/java/maven/dse/pom.xml +++ b/java/maven/dse/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 5.1.0 + 5.1.1 @@ -18,16 +18,6 @@ dse-spark-dependencies ${dse.version} provided - - - com.datastax.dse - dse-java-driver-core - - - org.apache.solr - solr-solrj - - @@ -40,16 +30,6 @@ - - com.datastax.dse - dse-java-driver-core - 1.2.3 - - - org.apache.solr - solr-solrj - 6.0.1 - diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml index d8aead9..c828bad 100644 --- a/java/maven/oss/pom.xml +++ b/java/maven/oss/pom.xml @@ -9,8 +9,8 @@ UTF-8 - 2.0.0 - 2.0.1 + 2.0.2 + 2.0.2 @@ -54,16 +46,7 @@ - - com.datastax.dse - dse-java-driver-core - 1.2.3 - - - org.apache.solr - solr-solrj - 6.0.1 - + com.datastax.spark diff --git a/scala/maven/oss/pom.xml b/scala/maven/oss/pom.xml index 52439a9..7e1c670 100644 --- a/scala/maven/oss/pom.xml +++ b/scala/maven/oss/pom.xml @@ -11,9 +11,9 @@ UTF-8 2.11.8 2.11 - 2.0.0 + 2.0.2 3.0.0 - 2.0.1 + 2.0.2 3.2 4.12 @@ -27,6 +27,7 @@ org.scala-lang scala-library ${scala.version} + provided org.apache.spark diff --git a/scala/sbt/dse/build.sbt b/scala/sbt/dse/build.sbt index 5b9b2f5..61822f7 100644 --- a/scala/sbt/dse/build.sbt +++ b/scala/sbt/dse/build.sbt @@ -7,35 +7,33 @@ scalaVersion := "2.11.8" resolvers += "DataStax Repo" at "https://repo.datastax.com/public-repos/" -val dseVersion = "5.1.0" +val dseVersion = "5.1.1" // Please make sure that following DSE version matches your DSE cluster version. // Exclusions are solely for running integrated testing // Warning Sbt 0.13.13 or greater is required due to a bug with dependency resolution -libraryDependencies += "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" excludeAll ( - ExclusionRule("org.slf4j","slf4j-log4j12"), - ExclusionRule("org.mortbay.jetty"), - ExclusionRule("javax.servlet"), - ExclusionRule("org.apache.cassandra"), - ExclusionRule("com.datastax.dse", "dse-java-driver-core"), - ExclusionRule("org.apache.solr", "solr-solrj") +libraryDependencies += ( + "com.datastax.dse" % "dse-spark-dependencies" % dseVersion % "provided" excludeAll ( + ExclusionRule("org.slf4j","slf4j-log4j12"), + ExclusionRule("org.mortbay.jetty"), + ExclusionRule("javax.servlet"), + ExclusionRule("org.apache.cassandra") + ) ) // Test Dependencies // The 'test/resources' Directory in should match the resources directory in the `it` directory // for the version of the Spark Cassandra Connector in use. val scalaTestVersion = "3.0.0" -val connectorVersion = "2.0.1" +val connectorVersion = "2.0.2" 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.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")) @@ -44,15 +42,12 @@ libraryDependencies ++= Seq( //Forking is required for the Embedded Cassandra fork in Test := true -assemblyMergeStrategy in assembly := { - case "META-INF/io.netty.versions.properties" => MergeStrategy.discard - case x => (assemblyMergeStrategy in assembly).value(x) -} //Your dependencies //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 //) diff --git a/scala/sbt/dse/project/assembly.sbt b/scala/sbt/dse/project/assembly.sbt index 39c1bb8..15a88b0 100644 --- a/scala/sbt/dse/project/assembly.sbt +++ b/scala/sbt/dse/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5") diff --git a/scala/sbt/oss/build.sbt b/scala/sbt/oss/build.sbt index 235f600..51d9b39 100644 --- a/scala/sbt/oss/build.sbt +++ b/scala/sbt/oss/build.sbt @@ -4,8 +4,8 @@ version := "0.1" scalaVersion := "2.11.8" -val sparkVersion = "2.0.0" -val connectorVersion = "2.0.1" +val sparkVersion = "2.0.2" +val connectorVersion = "2.0.2" //The 'test/resources' Directory in should match the resources directory in the `it` directory //for the version of the Spark Cassandra Connector in use. @@ -38,6 +38,7 @@ fork in Test := true //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 //) diff --git a/scala/sbt/oss/project/assembly.sbt b/scala/sbt/oss/project/assembly.sbt index 39c1bb8..15a88b0 100644 --- a/scala/sbt/oss/project/assembly.sbt +++ b/scala/sbt/oss/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")