Skip to content

Remove MySQL, Rserve, REngine dependencies #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Huandao0812 wants to merge 6 commits into
base: adatao
Choose a base branch
from
Open

Remove MySQL, Rserve, REngine dependencies #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2b75d0
remove R dependencies
Huandao0812 May 23, 2017
0f4f985
ignore some test
Huandao0812 May 25, 2017
1a495f4
add plugin
Huandao0812 May 25, 2017
ac60c54
merge w adatao
Huandao0812 May 25, 2017
b2bbb17
fix RootBuild
Huandao0812 May 25, 2017
8222899
remove mysql dependency
Huandao0812 May 30, 2017
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
13 changes: 1 addition & 12 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand Down Expand Up @@ -350,12 +345,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -387,4 +376,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
13 changes: 1 addition & 12 deletions ddf-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand All @@ -314,12 +309,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -351,4 +340,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
13 changes: 1 addition & 12 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand All @@ -315,12 +310,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -352,4 +341,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
13 changes: 1 addition & 12 deletions hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand Down Expand Up @@ -342,12 +337,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -379,4 +368,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
10 changes: 2 additions & 8 deletions project/RootBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ object RootBuild extends Build {
val excludeEverthing = ExclusionRule(organization = "*", name = "*")
val excludeEverythingHackForMakePom = ExclusionRule(organization = "_MAKE_POM_EXCLUDE_ALL_", name = "_MAKE_POM_EXCLUDE_ALL_")

// We define this explicitly rather than via unmanagedJars, so that make-pom will generate it in pom.xml as well
// org % package % version
val rforge = Seq(
"net.rforge" % "REngine" % "2.1.1.compiled",
"net.rforge" % "Rserve" % "1.8.2.compiled"
)

val scalaArtifacts = Seq("jline", "scala-compiler", "scala-library", "scala-reflect")
val scalaDependencies = scalaArtifacts.map( artifactId => "org.scala-lang" % artifactId % theScalaVersion)
Expand Down Expand Up @@ -165,7 +159,7 @@ object RootBuild extends Build {
List("sh", "-c", "touch spark/" + targetDir + "/*timestamp")
},
testOptions in Test += Tests.Argument("-oI"),
libraryDependencies ++= rforge,

libraryDependencies ++= spark_dependencies,
if (isLocal) {
initialCommands in console :=
Expand Down Expand Up @@ -251,7 +245,7 @@ object RootBuild extends Build {
"net.sf" % "jsqlparser" % "0.9.8.8",
"commons-io" % "commons-io" % "1.3.2",
"org.easymock" % "easymock" % "3.1" % "test",
"mysql" % "mysql-connector-java" % "5.1.25",
//"mysql" % "mysql-connector-java" % "5.1.25",
"org.python" % "jython-standalone" % "2.7.0",
"joda-time" % "joda-time" % "2.8.1",
"org.joda" % "joda-convert" % "1.7"
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")

addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0")

addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")

resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"

//addSbtPlugin("io.spray" %% "sbt-twirl" % "0.6.1")
Expand Down
13 changes: 1 addition & 12 deletions s3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand Down Expand Up @@ -339,12 +334,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -376,4 +365,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
Binary file removed spark/lib/net/rforge/REngine-2.1.1.compiled.jar
View file
Open in desktop
Binary file not shown.
Binary file removed spark/lib/net/rforge/Rserve-1.8.2.compiled.jar
View file
Open in desktop
Binary file not shown.
23 changes: 1 addition & 22 deletions spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
Expand All @@ -330,16 +325,6 @@
<artifactId>joda-convert</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>net.rforge</groupId>
<artifactId>REngine</artifactId>
<version>2.1.1.compiled</version>
</dependency>
<dependency>
<groupId>net.rforge</groupId>
<artifactId>Rserve</artifactId>
<version>1.8.2.compiled</version>
</dependency>
<dependency>
<groupId>com.databricks</groupId>
<artifactId>spark-csv_2.10</artifactId>
Expand Down Expand Up @@ -471,12 +456,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>typesafereleases</id>
<name>typesafe-releases</name>
<url>http://repo.typesafe.com/typesafe/releases/</url>
<layout>default</layout>
</repository>
<repository>
<id>AdataoMvnreposSnapshots</id>
<name>Adatao Mvnrepos Snapshots</name>
Expand Down Expand Up @@ -508,4 +487,4 @@
<layout>default</layout>
</repository>
</repositories>
</project>
</project>
24 changes: 0 additions & 24 deletions spark/rlibs/Rserve/DESCRIPTION
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions spark/rlibs/Rserve/INDEX
View file
Open in desktop

This file was deleted.

Loading