POM-49. Introduce compile and test platform for library platform depe…

…ndency. issue: https://jira.kiji.org/browse/POM-49 review: https://review.kiji.org/r/2211
kijiproject · Sep 2, 2014 · d20a958 · d20a958
1 parent 8d07a48
commit d20a958
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 54 deletions.
diff --git a/kiji-express-examples/pom.xml b/kiji-express-examples/pom.xml
@@ -39,6 +39,13 @@
       <groupId>org.kiji.schema</groupId>
       <artifactId>kiji-schema</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kiji.platforms</groupId>
+      <artifactId>kiji-compile-platform</artifactId>
+      <type>pom</type>
+      <version>${kiji-platforms.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Normal dependencies. -->
     <dependency>
@@ -62,10 +69,6 @@
       <artifactId>log4j</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
-    </dependency>
 
     <!-- Testing -->
     <dependency>

diff --git a/kiji-express-tools/pom.xml b/kiji-express-tools/pom.xml
@@ -62,6 +62,13 @@
       <groupId>org.kiji.mapreduce</groupId>
       <artifactId>kiji-mapreduce</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kiji.platforms</groupId>
+      <artifactId>kiji-compile-platform</artifactId>
+      <type>pom</type>
+      <version>${kiji-platforms.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Normal dependencies. -->
     <dependency>
@@ -80,10 +87,6 @@
       <groupId>com.twitter</groupId>
       <artifactId>scalding-args_${scala.version}</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-client</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -106,14 +109,11 @@
 
     <!-- Test dependencies. -->
     <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-testing-util</artifactId>
+      <groupId>org.kiji.platforms</groupId>
+      <artifactId>kiji-test-platform</artifactId>
+      <type>pom</type>
+      <version>${kiji-platforms.version}</version>
       <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-test</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kiji.schema</groupId>
@@ -128,11 +128,6 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
-      <version>${hadoop.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.version}</artifactId>

diff --git a/kiji-express/pom.xml b/kiji-express/pom.xml
@@ -94,18 +94,13 @@
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
-      <version>${hadoop.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
+      <groupId>org.kiji.platforms</groupId>
+      <artifactId>kiji-compile-platform</artifactId>
+      <type>pom</type>
+      <version>${kiji-platforms.version}</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -141,43 +136,27 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Test dependencies. -->
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-testing-util</artifactId>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>
-    <!--
-      Keep this dependency in compile scope so that users can depend on the KijiExpress testing
-      framework by only depending on the KijiExpress test jar.
-    -->
     <dependency>
+      <!-- TODO(EXP-469): Make this test scope.  -->
       <groupId>org.kiji.schema</groupId>
       <artifactId>kiji-schema</artifactId>
       <type>test-jar</type>
       <scope>compile</scope>
     </dependency>
-    <!--
-      Keep this dependency in compile scope so that users can depend on the KijiExpress testing
-      framework by only depending on the KijiExpress test jar.
-    -->
+
     <dependency>
+      <!-- TODO(EXP-469): Make this test scope.  -->
       <groupId>org.kiji.testing</groupId>
       <artifactId>fake-hbase</artifactId>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
+      <groupId>org.kiji.platforms</groupId>
+      <artifactId>kiji-test-platform</artifactId>
+      <type>pom</type>
+      <version>${kiji-platforms.version}</version>
       <scope>test</scope>
-      <optional>true</optional>
-      <version>${hadoop.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-test</artifactId>
     </dependency>
 
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -36,6 +36,7 @@
     <kiji-mapreduce.version>1.3.0-SNAPSHOT</kiji-mapreduce.version>
     <fake-hbase.version>0.3.0-SNAPSHOT</fake-hbase.version>
     <kiji-annotations.version>1.1.2-SNAPSHOT</kiji-annotations.version>
+    <kiji-platforms.version>1.4.0-SNAPSHOT</kiji-platforms.version>
 
     <!-- Dependency versions. -->
     <elephant-bird.version>4.4</elephant-bird.version>