Updated Branches: refs/heads/trunk 188f6ed72 -> 831e9eaad
GIRAPH-545: Improve Facebook Hadoop dependency (nitay) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/831e9eaa Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/831e9eaa Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/831e9eaa Branch: refs/heads/trunk Commit: 831e9eaada9dd5ce0a6b3e30150e707a1733110c Parents: 188f6ed Author: Nitay Joffe <[email protected]> Authored: Thu Feb 28 23:08:17 2013 -0500 Committer: Nitay Joffe <[email protected]> Committed: Fri Mar 1 17:07:27 2013 -0500 ---------------------------------------------------------------------- CHANGELOG | 2 ++ giraph-accumulo/pom.xml | 6 ++---- giraph-hbase/pom.xml | 6 ++---- giraph-hcatalog/pom.xml | 6 ++---- lib/facebook-hadoop-0.20-core.jar | Bin 4534731 -> 0 bytes lib/facebook-hadoop-0.20-test.jar | Bin 2493046 -> 0 bytes pom.xml | 19 ++++++++++++++----- 7 files changed, 22 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 54f9207..4cd66b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-545: Improve Facebook Hadoop dependency (nitay) + GIRAPH-541: Log before observers (nitay) GIRAPH-535: Range-partitioning and edge locality benchmark (apresta) http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/giraph-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml index 2734f71..1f7e84a 100644 --- a/giraph-accumulo/pom.xml +++ b/giraph-accumulo/pom.xml @@ -178,11 +178,9 @@ under the License. <id>hadoop_facebook</id> <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> - <scope>system</scope> - <systemPath>${lib.dir}/facebook-hadoop-0.20-test.jar</systemPath> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/giraph-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml index 3d24f3b..8eafff1 100644 --- a/giraph-hbase/pom.xml +++ b/giraph-hbase/pom.xml @@ -178,11 +178,9 @@ under the License. <id>hadoop_facebook</id> <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> - <scope>system</scope> - <systemPath>${lib.dir}/facebook-hadoop-0.20-test.jar</systemPath> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/giraph-hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml index b4ca06c..73359e3 100644 --- a/giraph-hcatalog/pom.xml +++ b/giraph-hcatalog/pom.xml @@ -143,11 +143,9 @@ under the License. <id>hadoop_facebook</id> <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> - <scope>system</scope> - <systemPath>${lib.dir}/facebook-hadoop-0.20-test.jar</systemPath> + <scope>test</scope> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/lib/facebook-hadoop-0.20-core.jar ---------------------------------------------------------------------- diff --git a/lib/facebook-hadoop-0.20-core.jar b/lib/facebook-hadoop-0.20-core.jar deleted file mode 100644 index 29b00cd..0000000 Binary files a/lib/facebook-hadoop-0.20-core.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/lib/facebook-hadoop-0.20-test.jar ---------------------------------------------------------------------- diff --git a/lib/facebook-hadoop-0.20-test.jar b/lib/facebook-hadoop-0.20-test.jar deleted file mode 100644 index b88ae27..0000000 Binary files a/lib/facebook-hadoop-0.20-test.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/giraph/blob/831e9eaa/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4be0bd0..901e31f 100644 --- a/pom.xml +++ b/pom.xml @@ -600,17 +600,14 @@ under the License. <module>giraph-hcatalog</module> </modules> <properties> - <hadoop.version>0.20.1</hadoop.version> + <hadoop.version>0.20.0</hadoop.version> <munge.symbols>HADOOP_NON_SECURE,HADOOP_NON_JOBCONTEXT_IS_INTERFACE</munge.symbols> </properties> <dependencies> <!-- sorted lexicographically --> <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>${hadoop.version}</version> - <scope>system</scope> - <systemPath>${lib.dir}/facebook-hadoop-0.20-core.jar</systemPath> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -998,6 +995,12 @@ under the License. <version>3.1</version> </dependency> <dependency> + <groupId>com.facebook.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> <version>1.4.0</version> @@ -1056,6 +1059,12 @@ under the License. <!-- test dependencies. sorted lexicographically. --> <dependency> + <groupId>com.facebook.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8</version>
