Skip to content

Commit 4624450

Browse files
committed
Updted the Spark to 3.5.2 and Almaren to 0.9.11
1 parent 533cada commit 4624450

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.github/workflows/Jdbc.almaren-githubactions.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
Build:
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-22.04
77
services:
88
postgres:
99
image: postgres:13.4
@@ -33,7 +33,6 @@ jobs:
3333
PGPASSWORD="postgres" psql -c 'create role runner;' -U postgres -h localhost
3434
PGPASSWORD="postgres" psql -h localhost -U postgres -d almaren -f src/test/resources/tables.ddl
3535
sbt ++2.12.10 test
36-
sbt ++2.13.9 test
3736
rm -rf "$HOME/.ivy2/local" || true
3837
find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true
3938
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ JDBC Connector allow you to execute any SQL statement using Apache Spark.
77
To add JDBC connector dependency to your sbt build:
88

99
```
10-
libraryDependencies += "com.github.music-of-the-ainur" %% "jdbc-almaren" % "0.0.6-3.4"
10+
libraryDependencies += "com.github.music-of-the-ainur" %% "jdbc-almaren" % "0.0.6-3.5"
1111
1212
```
1313
To run in spark-shell:
1414

1515
For scala-version(2.12):
1616
```
17-
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.12:0.9.10-3.4,com.github.music-of-the-ainur:jdbc-almaren_2.12:0.0.6-3.4"
17+
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.12:0.9.11-3.5,com.github.music-of-the-ainur:jdbc-almaren_2.12:0.0.6-3.5"
1818
```
1919
For scala-version(2.13):
2020
```
21-
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.13:0.9.10-3.4,com.github.music-of-the-ainur:jdbc-almaren_2.13:0.0.6-3.4"
21+
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.13:0.9.11-3.5,com.github.music-of-the-ainur:jdbc-almaren_2.13:0.0.6-3.5"
2222
2323
```
2424

@@ -32,6 +32,8 @@ repository. It can be used using the `--packages` option or the
3232

3333
| version | Connector Artifact |
3434
|----------------------------|-------------------------------------------------------------|
35+
| Spark 3.5.x and scala 2.13 | `com.github.music-of-the-ainur:jdbc-almaren_2.13:0.0.6-3.5` |
36+
| Spark 3.5.x and scala 2.12 | `com.github.music-of-the-ainur:jdbc-almaren_2.12:0.0.6-3.5` | |
3537
| Spark 3.4.x and scala 2.13 | `com.github.music-of-the-ainur:jdbc-almaren_2.13:0.0.6-3.4` |
3638
| Spark 3.4.x and scala 2.12 | `com.github.music-of-the-ainur:jdbc-almaren_2.12:0.0.6-3.4` |
3739
| Spark 3.3.x and scala 2.13 | `com.github.music-of-the-ainur:jdbc-almaren_2.13:0.0.6-3.3` |

build.sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ ThisBuild / name := "jdbc.almaren"
22
ThisBuild / organization := "com.github.music-of-the-ainur"
33

44
lazy val scala212 = "2.12.10"
5-
lazy val scala213 = "2.13.9"
5+
//lazy val scala213 = "2.13.9"
66

7-
crossScalaVersions := Seq(scala212,scala213)
8-
ThisBuild / scalaVersion := scala213
7+
//crossScalaVersions := Seq(scala212,scala213)
8+
crossScalaVersions := Seq(scala212)
9+
ThisBuild / scalaVersion := scala212
910

10-
val sparkVersion = "3.4.1"
11+
val sparkVersion = "3.5.2"
1112
val majorVersionReg = "([0-9]+\\.[0-9]+).{0,}".r
1213
val majorVersionReg(majorVersion) = sparkVersion
1314

@@ -16,7 +17,7 @@ scalacOptions ++= Seq("-deprecation", "-feature")
1617
libraryDependencies ++= Seq(
1718
"org.apache.spark" %% "spark-core" % sparkVersion % "provided",
1819
"org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
19-
"com.github.music-of-the-ainur" %% "almaren-framework" % s"0.9.10-${majorVersion}" % "provided",
20+
"com.github.music-of-the-ainur" %% "almaren-framework" % s"0.9.11-${majorVersion}" % "provided",
2021
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
2122
"org.scalikejdbc" %% "scalikejdbc" % "3.4.0",
2223
"org.scalatest" %% "scalatest" % "3.2.14" % "test",

0 commit comments

Comments
 (0)