diff --git a/.travis.yml b/.travis.yml index 317b5cd9..d9161aae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ matrix: # Scala 2.10.5 tests: - jdk: openjdk7 scala: 2.10.5 - env: HADOOP_VERSION="2.2.0" SPARK_VERSION="2.0.0" SPARK_AVRO_VERSION="3.0.0-preview2" + env: HADOOP_VERSION="2.2.0" SPARK_VERSION="2.0.0" SPARK_AVRO_VERSION="3.0.0" # Scala 2.11 tests: - jdk: openjdk7 scala: 2.11.7 - env: HADOOP_VERSION="2.2.0" SPARK_VERSION="2.0.0" SPARK_AVRO_VERSION="3.0.0-preview2" + env: HADOOP_VERSION="2.2.0" SPARK_VERSION="2.0.0" SPARK_AVRO_VERSION="3.0.0" env: global: # AWS_REDSHIFT_JDBC_URL diff --git a/README.md b/README.md index 9507ee87..e499a8c9 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,14 @@ You may use this library in your applications with the following dependency info ``` groupId: com.databricks artifactId: spark-redshift_2.10 -version: 2.0.0-preview1 +version: 2.0.0 ``` **Scala 2.11** ``` groupId: com.databricks artifactId: spark-redshift_2.11 -version: 2.0.0-preview1 +version: 2.0.0 ``` You will also need to provide a JDBC driver that is compatible with Redshift. Amazon recommend that you use [their driver](http://docs.aws.amazon.com/redshift/latest/mgmt/configure-jdbc-connection.html), which is distributed as a JAR that is hosted on Amazon's website. This library has also been successfully tested using the Postgres JDBC driver. @@ -514,4 +514,4 @@ If the deprecated `usestagingtable` setting is set to `false` then this library ## Migration Guide -- Version 2.0 removed a number of deprecated APIs; for details, see https://github.com/databricks/spark-redshift/pull/239 \ No newline at end of file +- Version 2.0 removed a number of deprecated APIs; for details, see https://github.com/databricks/spark-redshift/pull/239 diff --git a/project/SparkRedshiftBuild.scala b/project/SparkRedshiftBuild.scala index 7a552d37..cee809a3 100644 --- a/project/SparkRedshiftBuild.scala +++ b/project/SparkRedshiftBuild.scala @@ -46,7 +46,7 @@ object SparkRedshiftBuild extends Build { crossScalaVersions := Seq("2.10.5", "2.11.7"), sparkVersion := "2.0.0", testSparkVersion := sys.props.get("spark.testVersion").getOrElse(sparkVersion.value), - testSparkAvroVersion := sys.props.get("sparkAvro.testVersion").getOrElse("3.0.0-preview2"), + testSparkAvroVersion := sys.props.get("sparkAvro.testVersion").getOrElse("3.0.0"), testHadoopVersion := sys.props.get("hadoop.testVersion").getOrElse("2.2.0"), spName := "databricks/spark-redshift", sparkComponents ++= Seq("sql", "hive"), @@ -73,7 +73,7 @@ object SparkRedshiftBuild extends Build { "com.amazonaws" % "aws-java-sdk-sts" % "1.10.22" % "test" exclude("com.fasterxml.jackson.core", "jackson-databind"), // We require spark-avro, but avro-mapred must be provided to match Hadoop version. // In most cases, avro-mapred will be provided as part of the Spark assembly JAR. - "com.databricks" %% "spark-avro" % "3.0.0-preview2", + "com.databricks" %% "spark-avro" % "3.0.0", if (testHadoopVersion.value.startsWith("1")) { "org.apache.avro" % "avro-mapred" % "1.7.7" % "provided" classifier "hadoop1" exclude("org.mortbay.jetty", "servlet-api") } else {