Skip to content
Permalink
Browse files

Revert "Merge branch 'master' into master"

This reverts commit c1a6c0e, reversing
changes made to 655f435.
  • Loading branch information...
romitgirdhar committed Apr 3, 2019
1 parent d07b7c9 commit 7f9d67d5a830c218d955a4c04993fd22d878b6c5
51 pom.xml
@@ -17,21 +17,13 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.binary.version>2.11</scala.binary.version>
<spark.version>2.3.1</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.11.8</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -46,35 +38,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.11</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.11</artifactId>
<version>${spark.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<type>test-jar</type>
<scope>test</scope>
<version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.scalactic</groupId>
@@ -117,19 +81,6 @@
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>

This file was deleted.

@@ -53,7 +53,7 @@ private[spark] object ConnectionUtils {
* @param url the string url without the JDBC prefix
* @return the url with the added JDBC prefix
*/
def createJDBCUrl(url: String, port: Option[String] = None): String = SqlDBConfig.JDBCUrlPrefix + url + ":" + port.getOrElse("1433").toString()
def createJDBCUrl(url: String): String = SqlDBConfig.JDBCUrlPrefix + url

/**
* Gets a JDBC connection based on Config properties

This file was deleted.

This file was deleted.

0 comments on commit 7f9d67d

Please sign in to comment.
You can’t perform that action at this time.