Merge pigpen-local and pigpen-tests into pigpen-core

Netflix · Mar 30, 2015 · 4991f91 · 4991f91
1 parent e7c6c56
commit 4991f91
Show file tree

Hide file tree

Showing 29 changed files with 22 additions and 30 deletions.
diff --git a/pigpen-cascading/build.gradle b/pigpen-cascading/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'java'
 
 dependencies {
     compile project(':pigpen')
-    testCompile project(':pigpen-tests')
 
     // Should these be provided?
     compile 'cascading:cascading-core:2.5.1'
@@ -11,4 +10,5 @@ dependencies {
     compile 'org.slf4j:slf4j-log4j12:1.6.1'
 
     testCompile 'criterium:criterium:0.4.3'
+    testCompile project(path: ':pigpen', configuration: 'testOutput')
 }
diff --git a/pigpen-core/build.gradle b/pigpen-core/build.gradle
@@ -6,3 +6,16 @@ dependencies {
     compile 'com.taoensso:nippy:2.8.0'
     compile 'prismatic:schema:0.3.3'
 }
+
+configurations {
+    testOutput.extendsFrom (testCompile)
+}
+
+task jarTest (type: Jar, dependsOn: testClasses) {
+    from sourceSets.test.clojure.srcDirs
+    classifier = 'test'
+}
+
+artifacts {
+    testOutput jarTest
+}
diff --git a/...en-local/src/main/clojure/pigpen/core.clj → pigpen-core/src/main/clojure/pigpen/core.clj b/...en-local/src/main/clojure/pigpen/core.clj → pigpen-core/src/main/clojure/pigpen/core.clj
diff --git a/...local/src/main/clojure/pigpen/core/fn.clj → ...-core/src/main/clojure/pigpen/core/fn.clj b/...local/src/main/clojure/pigpen/core/fn.clj → ...-core/src/main/clojure/pigpen/core/fn.clj
diff --git a/...local/src/main/clojure/pigpen/core/op.clj → ...-core/src/main/clojure/pigpen/core/op.clj b/...local/src/main/clojure/pigpen/core/op.clj → ...-core/src/main/clojure/pigpen/core/op.clj
diff --git a/...n-local/src/main/clojure/pigpen/local.clj → ...en-core/src/main/clojure/pigpen/local.clj b/...n-local/src/main/clojure/pigpen/local.clj → ...en-core/src/main/clojure/pigpen/local.clj
diff --git a/.../src/test/clojure/pigpen/core/fn_test.clj → .../src/test/clojure/pigpen/core/fn_test.clj b/.../src/test/clojure/pigpen/core/fn_test.clj → .../src/test/clojure/pigpen/core/fn_test.clj
diff --git a/.../src/test/clojure/pigpen/core/op_test.clj → .../src/test/clojure/pigpen/core/op_test.clj b/.../src/test/clojure/pigpen/core/op_test.clj → .../src/test/clojure/pigpen/core/op_test.clj
diff --git a/...cal/src/test/clojure/pigpen/core_test.clj → ...ore/src/test/clojure/pigpen/core_test.clj b/...cal/src/test/clojure/pigpen/core_test.clj → ...ore/src/test/clojure/pigpen/core_test.clj
diff --git a/...n/clojure/pigpen/functional/code_test.clj → ...t/clojure/pigpen/functional/code_test.clj b/...n/clojure/pigpen/functional/code_test.clj → ...t/clojure/pigpen/functional/code_test.clj
diff --git a/...clojure/pigpen/functional/filter_test.clj → ...clojure/pigpen/functional/filter_test.clj b/...clojure/pigpen/functional/filter_test.clj → ...clojure/pigpen/functional/filter_test.clj
diff --git a/...n/clojure/pigpen/functional/fold_test.clj → ...t/clojure/pigpen/functional/fold_test.clj b/...n/clojure/pigpen/functional/fold_test.clj → ...t/clojure/pigpen/functional/fold_test.clj
diff --git a/...ain/clojure/pigpen/functional/io_test.clj → ...est/clojure/pigpen/functional/io_test.clj b/...ain/clojure/pigpen/functional/io_test.clj → ...est/clojure/pigpen/functional/io_test.clj
diff --git a/...n/clojure/pigpen/functional/join_test.clj → ...t/clojure/pigpen/functional/join_test.clj b/...n/clojure/pigpen/functional/join_test.clj → ...t/clojure/pigpen/functional/join_test.clj
diff --git a/...in/clojure/pigpen/functional/map_test.clj → ...st/clojure/pigpen/functional/map_test.clj b/...in/clojure/pigpen/functional/map_test.clj → ...st/clojure/pigpen/functional/map_test.clj
diff --git a/...in/clojure/pigpen/functional/set_test.clj → ...st/clojure/pigpen/functional/set_test.clj b/...in/clojure/pigpen/functional/set_test.clj → ...st/clojure/pigpen/functional/set_test.clj
diff --git a/.../main/clojure/pigpen/functional_suite.clj → .../test/clojure/pigpen/functional_suite.clj b/.../main/clojure/pigpen/functional_suite.clj → .../test/clojure/pigpen/functional_suite.clj
diff --git a/...c/main/clojure/pigpen/functional_test.clj → ...c/test/clojure/pigpen/functional_test.clj b/...c/main/clojure/pigpen/functional_test.clj → ...c/test/clojure/pigpen/functional_test.clj
diff --git a/.../clojure/pigpen/local/functional_test.clj → .../clojure/pigpen/local/functional_test.clj b/.../clojure/pigpen/local/functional_test.clj → .../clojure/pigpen/local/functional_test.clj
diff --git a/...est/clojure/pigpen/local/test_harness.clj → ...est/clojure/pigpen/local/test_harness.clj b/...est/clojure/pigpen/local/test_harness.clj → ...est/clojure/pigpen/local/test_harness.clj
diff --git a/...al/src/test/clojure/pigpen/local_test.clj → ...re/src/test/clojure/pigpen/local_test.clj b/...al/src/test/clojure/pigpen/local_test.clj → ...re/src/test/clojure/pigpen/local_test.clj
diff --git a/pigpen-local/build.gradle b/pigpen-local/build.gradle
diff --git a/pigpen-parquet-pig/build.gradle b/pigpen-parquet-pig/build.gradle
@@ -1,7 +1,6 @@
 dependencies {
     compile project(':pigpen-parquet')
     compile project(':pigpen-pig')
-    testCompile project(':pigpen-tests')
 
     compile 'com.twitter:parquet-pig:1.5.0'
 
@@ -10,6 +9,7 @@ dependencies {
     provided 'org.antlr:antlr:3.5.2'
     provided 'log4j:log4j:1.2.17'
 
-    testCompile project(path: ':pigpen-parquet', configuration: 'testOutput')
+    testCompile project(path: ':pigpen', configuration: 'testOutput')
     testCompile project(path: ':pigpen-pig', configuration: 'testOutput')
+    testCompile project(path: ':pigpen-parquet', configuration: 'testOutput')
 }
diff --git a/pigpen-parquet/build.gradle b/pigpen-parquet/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
     compile project(':pigpen')
     compile project(':pigpen-hadoop')
-    testCompile project(':pigpen-tests')
 
     compile 'com.twitter:parquet-tools:1.5.0'
+
     testCompile project(path: ':pigpen', configuration: 'testOutput')
 }
 

diff --git a/pigpen-pig/build.gradle b/pigpen-pig/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'java'
 dependencies {
     compile project(':pigpen')
     compile project(':pigpen-hadoop')
-    testCompile project(':pigpen-tests')
 
     compile 'joda-time:joda-time:2.4' // pig needs this to run locally
     compile 'org.clojure:core.async:0.1.267.0-0d7780-alpha'
 
     provided 'org.apache.pig:pig:0.13.0'
     provided 'org.apache.hadoop:hadoop-core:1.1.2'
 
+    testCompile project(path: ':pigpen', configuration: 'testOutput')
     testCompile 'org.apache.pig:pigunit:0.13.0'
     testCompile 'jline:jline:0.9.94'
     testCompile 'org.antlr:antlr:3.5.2'

diff --git a/pigpen-rx/build.gradle b/pigpen-rx/build.gradle
@@ -1,7 +1,8 @@
 dependencies {
     compile project(':pigpen')
-    testCompile project(':pigpen-tests')
 
     compile 'io.reactivex:rxjava:1.0.4'
     compile 'io.reactivex:rxclojure:1.0.0'
+
+    testCompile project(path: ':pigpen', configuration: 'testOutput')
 }
diff --git a/pigpen-tests/build.gradle b/pigpen-tests/build.gradle
diff --git a/pigpen-viz/build.gradle b/pigpen-viz/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':pigpen-core')
+    compile project(':pigpen')
 
     compile 'rhizome:rhizome:0.1.9'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,5 @@
 rootProject.name='pigpen-multi'
 include 'pigpen-core', \
-        'pigpen-tests', \
-        'pigpen-local', \
         'pigpen-rx', \
         'pigpen-pig', \
         'pigpen-cascading', \
@@ -11,4 +9,4 @@ include 'pigpen-core', \
         'pigpen-avro', \
         'pigpen-avro-pig', \
         'pigpen-viz'
-project(':pigpen-local').name = 'pigpen'
+project(':pigpen-core').name = 'pigpen'