Skip to content
This repository was archived by the owner on Feb 27, 2025. It is now read-only.

PR for spark3.0/Scala2.12 #76

Merged
merged 3 commits into from
May 19, 2021
+47 −49
Merged

PR for spark3.0/Scala2.12 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
138936f
added profiles for spark24 and spark30 as profiles. This build on cha…
Jul 29, 2020
7a2409d
removed workflow fixes
shivsood May 19, 2021
97857d2
fixes to pom.xml
shivsood May 19, 2021
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,4 @@ MigrationBackup/
project/project/
project/target/
target/

.idea
32 changes: 0 additions & 32 deletions build.sbt
View file
Open in desktop

This file was deleted.

58 changes: 44 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.12</scala.version>
<spark.version>2.4.6</spark.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -56,23 +53,12 @@
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.novocode</groupId>
<artifactId>junit-interface</artifactId>
<version>0.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
</dependencies>
<developers>
<developer>
Expand Down Expand Up @@ -213,4 +199,48 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>spark24</id>
<properties>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.12</scala.version>
<spark.version>2.4.6</spark.version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version we have in Synapse is 2.4.5 but I think that shouldn't be a problem

</properties>
<dependencies>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>spark30</id>
<properties>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.11</scala.version>
<spark.version>3.0.0</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>3.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions src/test/scala/com/microsoft/sqlserver/jdbc/spark/bulkwrite/DataSourceTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import java.sql.Connection

import org.scalatest.Matchers
import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.test.SharedSQLContext
import org.apache.spark.sql.test.SharedSparkSession

class DataSourceTest extends SparkFunSuite with Matchers with SharedSQLContext {
class DataSourceTest extends SparkFunSuite with Matchers with SharedSparkSession {

test("Schema validation between Spark DataFrame and SQL Server ResultSet") {}

Expand Down