Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SNOW-760569 Bump spark connector and dependencies versions #493

Merged
merged 1 commit into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ClusterTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
DOCKER_IMAGE_TAG: 'snowflakedb/spark-base:3.3.0'
TEST_SCALA_VERSION: '2.12'
TEST_COMPILE_SCALA_VERSION: '2.12.11'
TEST_SPARK_CONNECTOR_VERSION: '2.11.1'
TEST_JDBC_VERSION: '3.13.24'
TEST_SPARK_CONNECTOR_VERSION: '2.11.2'
TEST_JDBC_VERSION: '3.13.28'

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions ClusterTest/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

val sparkConnectorVersion = "2.11.1"
val sparkConnectorVersion = "2.11.2"
val scalaVersionMajor = "2.12"
val sparkVersionMajor = "3.3"
val sparkVersion = s"${sparkVersionMajor}.0"
Expand All @@ -37,7 +37,7 @@ lazy val root = project.withId("spark-snowflake").in(file("."))
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"net.snowflake" % "snowflake-ingest-sdk" % "0.10.8",
"net.snowflake" % "snowflake-jdbc" % "3.13.24",
"net.snowflake" % "snowflake-jdbc" % "3.13.28",
// "net.snowflake" %% "spark-snowflake" % "2.8.0-spark_3.0",
// "com.google.guava" % "guava" % "14.0.1" % Test,
// "org.scalatest" %% "scalatest" % "3.0.5" % Test,
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ val testSparkVersion = sys.props.get("spark.testVersion").getOrElse("3.3.0")
* Tests/jenkins/BumpUpSparkConnectorVersion/run.sh
* in snowflake repository.
*/
val sparkConnectorVersion = "2.11.1"
val sparkConnectorVersion = "2.11.2"

lazy val ItTest = config("it") extend Test

Expand Down Expand Up @@ -60,12 +60,12 @@ lazy val root = project.withId("spark-snowflake").in(file("."))
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(
"net.snowflake" % "snowflake-ingest-sdk" % "0.10.8",
"net.snowflake" % "snowflake-jdbc" % "3.13.24",
"net.snowflake" % "snowflake-jdbc" % "3.13.28",
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.mockito" % "mockito-core" % "1.10.19" % Test,
"org.apache.commons" % "commons-lang3" % "3.5" % "provided",
// For test to read/write from postgresql
"org.postgresql" % "postgresql" % "42.4.1" % Test,
"org.postgresql" % "postgresql" % "42.5.4" % Test,
// Below is for Spark Streaming from Kafka test only
// "org.apache.spark" %% "spark-sql-kafka-0-10" % "2.4.0",
"org.apache.spark" %% "spark-core" % testSparkVersion % "provided, test",
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/net/snowflake/spark/snowflake/Utils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ object Utils {
*/
val SNOWFLAKE_SOURCE_SHORT_NAME = "snowflake"

val VERSION = "2.11.1"
val VERSION = "2.11.2"

/**
* The certified JDBC version to work with this spark connector version.
*/
val CERTIFIED_JDBC_VERSION = "3.13.24"
val CERTIFIED_JDBC_VERSION = "3.13.28"

/**
* Important:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,7 @@ class UtilsSuite extends FunSuite with Matchers {
}
}

test("verify JDBC version is updated for release") {
assert(Utils.CERTIFIED_JDBC_VERSION.equals(Utils.jdbcVersion))
}
}