You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/03/22 20:15:08 UTC
incubator-geode git commit: GEODE-178: Handle renamed geode projects
in the spark connector build
Repository: incubator-geode
Updated Branches:
refs/heads/develop f1c667b59 -> 54050ceb2
GEODE-178: Handle renamed geode projects in the spark connector build
The spark connector code was no longer building and running tests
because it was referring to old gemfire- dependencies. Fixing the
dependencies in the spark build.
Also, updating the gitignore, rat excludes, and source distribution tasks
to exclude spark output files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/54050ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/54050ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/54050ceb
Branch: refs/heads/develop
Commit: 54050ceb20078a4f50aa45e42595b210a701ff22
Parents: f1c667b
Author: Dan Smith <up...@apache.org>
Authored: Mon Mar 21 10:17:38 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Mar 22 12:14:40 2016 -0700
----------------------------------------------------------------------
.gitignore | 3 ++-
geode-assembly/build.gradle | 2 ++
geode-spark-connector/doc/1_building.md | 3 +--
.../pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala | 2 +-
geode-spark-connector/project/Dependencies.scala | 2 +-
gradle/rat.gradle | 3 +++
6 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3f17c16..1b9dd0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ build-eclipse/
*.patch
*.diff
*.dat
-
+geode-spark-connector/**/target/
+geode-spark-connector/project/project/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index c393cd8..7e61d1d 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -256,6 +256,8 @@ distributions {
exclude 'gradle/wrapper/gradle-wrapper.jar'
exclude '.gradle'
exclude '**/build/**'
+ exclude 'geode-spark-connector/**/target/**'
+ exclude 'geode-spark-connector/project/project'
exclude '**/.project'
exclude '**/.classpath'
exclude '**/.settings/**'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/geode-spark-connector/doc/1_building.md
----------------------------------------------------------------------
diff --git a/geode-spark-connector/doc/1_building.md b/geode-spark-connector/doc/1_building.md
index eabceaa..9b4d69e 100644
--- a/geode-spark-connector/doc/1_building.md
+++ b/geode-spark-connector/doc/1_building.md
@@ -8,8 +8,7 @@ To build against Apache Geode, you need to build Geode first and publish the jar
to local repository. In the root of Geode directory, run:
```
-./gradlew clean build -Dskip.tests=true
-./gradlew publishToMavenLocal
+./gradlew clean build install -Dskip.tests=true
```
In the root directory of connector project, run:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/geode-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
----------------------------------------------------------------------
diff --git a/geode-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala b/geode-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
index 1d296c2..b4ee572 100644
--- a/geode-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
+++ b/geode-spark-connector/gemfire-spark-connector/src/it/scala/ittest/io/pivotal/gemfire/spark/connector/testkit/GemFireRunner.scala
@@ -28,7 +28,7 @@ import org.apache.commons.io.filefilter.IOFileFilter
* start and stop the locator and servers.
*/
class GemFireRunner(settings: Properties) {
- val gfshCmd = new File(getCurrentDirectory, "../../gemfire-assembly/build/install/apache-geode/bin/gfsh").toString
+ val gfshCmd = new File(getCurrentDirectory, "../../geode-assembly/build/install/apache-geode/bin/gfsh").toString
val cacheXMLFile = settings.get("cache-xml-file")
val numServers: Int = settings.get("num-of-servers").asInstanceOf[String].toInt
val cwd = new File(".").getAbsolutePath
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/geode-spark-connector/project/Dependencies.scala
----------------------------------------------------------------------
diff --git a/geode-spark-connector/project/Dependencies.scala b/geode-spark-connector/project/Dependencies.scala
index c48d26f..c77c158 100644
--- a/geode-spark-connector/project/Dependencies.scala
+++ b/geode-spark-connector/project/Dependencies.scala
@@ -22,7 +22,7 @@ object Dependencies {
object Compile {
val sparkStreaming = "org.apache.spark" %% "spark-streaming" % "1.3.0"
val sparkSql = "org.apache.spark" %% "spark-sql" % "1.3.0"
- val gemfire = "org.apache.geode" % "gemfire-core" % "1.0.0-incubating-SNAPSHOT" excludeAll(ExclusionRule(organization = "org.jboss.netty") )
+ val gemfire = "org.apache.geode" % "geode-core" % "1.0.0-incubating.M2-SNAPSHOT" excludeAll(ExclusionRule(organization = "org.jboss.netty") )
}
object Test {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54050ceb/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index d54f9c4..4e3a9d9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -38,6 +38,9 @@ rat {
'wrapper/**',
'**/build/**',
+ // SBT
+ 'geode-spark-connector/**/target/**',
+
// IDE
'etc/eclipseFormatterProfile.xml',
'etc/intellijIdeaCodeStyle.xml',