From 895c1e145646bc175e7631c3e4dab0237e585f1a Mon Sep 17 00:00:00 2001 From: Ruslan Iushchenko Date: Mon, 13 Jan 2025 09:43:53 +0100 Subject: [PATCH] Update Scala and Spark versions. --- .github/workflows/scala.yml | 10 +++++----- README.md | 6 +++--- pramen/build.sbt | 2 +- pramen/project/Versions.scala | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index ff6b1e1b..57a0a1ee 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -22,18 +22,18 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.11.12, 2.12.20, 2.13.14] - spark: [2.4.8, 3.3.4, 3.4.2, 3.5.1] + scala: [2.11.12, 2.12.20, 2.13.15] + spark: [2.4.8, 3.3.4, 3.4.4, 3.5.2] exclude: - scala: 2.11.12 spark: 3.3.4 - scala: 2.11.12 - spark: 3.4.2 + spark: 3.4.4 - scala: 2.11.12 - spark: 3.5.1 + spark: 3.5.2 - scala: 2.12.20 spark: 2.4.8 - - scala: 2.13.14 + - scala: 2.13.15 spark: 2.4.8 name: Test Spark ${{matrix.spark}} on Scala ${{matrix.scala}} steps: diff --git a/README.md b/README.md index 9a7fb019..df213240 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ In addition to basic error notification, typical operational warnings are genera ```sh git clone https://github.com/AbsaOSS/pramen cd pramen - sbt -DSPARK_VERSION="3.3.2" ++2.12.18 assembly + sbt -DSPARK_VERSION="3.3.4" ++2.12.18 assembly ``` (You need JDK 1.8 installed to run this) @@ -207,7 +207,7 @@ Creating an uber jar for Pramen is very easy. Just clone the repository and run ```sh sbt ++2.11.12 assembly sbt ++2.12.20 assembly -sbt ++2.13.14 assembly +sbt ++2.13.15 assembly ``` You can collect the uber jar of Pramen either at @@ -220,7 +220,7 @@ in your bundle, use one of example commands specifying your Spark version: ```sh sbt -DSPARK_VERSION="2.4.8" -Dassembly.features="includeDelta" ++2.11.12 assembly sbt -DSPARK_VERSION="3.3.4" -Dassembly.features="includeDelta" ++2.12.20 assembly -sbt -DSPARK_VERSION="3.5.2" -Dassembly.features="includeDelta" ++2.13.14 assembly +sbt -DSPARK_VERSION="3.5.2" -Dassembly.features="includeDelta" ++2.13.15 assembly ``` Then, run `spark-shell` or `spark-submit` adding the fat jar as the option. diff --git a/pramen/build.sbt b/pramen/build.sbt index ee6ccd19..a8601334 100644 --- a/pramen/build.sbt +++ b/pramen/build.sbt @@ -21,7 +21,7 @@ import com.github.sbt.jacoco.report.JacocoReportSettings val scala211 = "2.11.12" val scala212 = "2.12.20" -val scala213 = "2.13.14" +val scala213 = "2.13.15" ThisBuild / organization := "za.co.absa.pramen" diff --git a/pramen/project/Versions.scala b/pramen/project/Versions.scala index 1c0312d9..a954095b 100644 --- a/pramen/project/Versions.scala +++ b/pramen/project/Versions.scala @@ -19,7 +19,7 @@ import sbt.* object Versions { val defaultSparkVersionForScala211 = "2.4.8" val defaultSparkVersionForScala212 = "3.3.4" - val defaultSparkVersionForScala213 = "3.4.2" + val defaultSparkVersionForScala213 = "3.4.4" val typesafeConfigVersion = "1.4.0" val postgreSqlDriverVersion = "42.7.3" @@ -30,7 +30,6 @@ object Versions { val scoptVersion = "3.7.1" val channelVersion = "0.2.1" val requestsVersion = "0.8.0" - val kafkaClientVersion = "2.5.1" val javaXMailVersion = "1.6.2" val embeddedMongoDbVersion = "2.2.0" val scalatestVersion = "3.2.14"