Skip to content

Commit 01d9463

Browse files
committed
chore: sets spark 2.4.1 for scala 2.12 and 2.4.0 for scala 2.11
1 parent dcbc4e9 commit 01d9463

File tree

8 files changed

+13
-11
lines changed

8 files changed

+13
-11
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,5 +374,5 @@ csvpath/
374374
orcpath/
375375

376376
.env
377-
/kotlin-spark-api-3.0.0_2.12/.allure/
378-
/kotlin-spark-api-3.0.0_2.12/allure-results/
377+
**/.allure/
378+
**/allure-results/

core/2.4/pom_2.11.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-sql_${scala.compat.version}</artifactId>
26-
<version>${spark2.version}</version>
26+
<version>${spark2-scala-2.11.version}</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>

core/2.4/pom_2.12.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-sql_${scala.compat.version}</artifactId>
26-
<version>${spark2.version}</version>
26+
<version>${spark2-scala-2.12.version}</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>

examples/pom-2.4_2.11.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-sql_${scala.compat.version}</artifactId>
25-
<version>${spark2.version}</version>
25+
<version>${spark2-scala-2.11.version}</version>
2626
</dependency>
2727
</dependencies>
2828

examples/pom-2.4_2.12.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
<dependency>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-sql_${scala.compat.version}</artifactId>
25-
<version>${spark2.version}</version>
25+
<version>${spark2-scala-2.12.version}</version>
2626
</dependency>
2727
</dependencies>
2828

2929
<build>
3030
<sourceDirectory>src/main/kotlin</sourceDirectory>
31-
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
3231
<directory>target/2.4/${scala.compat.version}</directory>
3332
<plugins>
3433
<plugin>

kotlin-spark-api/2.4/pom_2.11.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.apache.spark</groupId>
3838
<artifactId>spark-sql_${scala.compat.version}</artifactId>
39-
<version>${spark2.version}</version>
39+
<version>${spark2-scala-2.11.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

kotlin-spark-api/2.4/pom_2.12.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.apache.spark</groupId>
3838
<artifactId>spark-sql_${scala.compat.version}</artifactId>
39-
<version>${spark2.version}</version>
39+
<version>${spark2-scala-2.12.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<kotlin.version>1.4.10</kotlin.version>
1414
<dokka.version>1.4.10</dokka.version>
1515
<atrium.version>0.13.0</atrium.version>
16-
<dokka.version>1.4.0</dokka.version>
1716
<kotest.version>4.2.5</kotest.version>
1817
<kotlin.version>1.4.10</kotlin.version>
19-
<spark2.version>2.4.0</spark2.version>
18+
<spark2-scala-2.11.version>2.4.0</spark2-scala-2.11.version>
19+
<spark2-scala-2.12.version>2.4.1</spark2-scala-2.12.version>
2020
<spark3.version>3.0.0</spark3.version>
2121

2222
<!-- Plugin versions -->
@@ -283,6 +283,9 @@
283283
<profiles>
284284
<profile>
285285
<id>scala-2.11</id>
286+
<activation>
287+
<activeByDefault>true</activeByDefault>
288+
</activation>
286289
<modules>
287290
<module>pom_2.11.xml</module>
288291
</modules>

0 commit comments

Comments
 (0)