incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1177122 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/mahout/patch deb/mahout/rules rpm/mahout/SPECS/mahout.spec
Date Thu, 29 Sep 2011 00:28:23 GMT
Author: rvs
Date: Thu Sep 29 00:28:23 2011
New Revision: 1177122

URL: http://svn.apache.org/viewvc?rev=1177122&view=rev
Log:
Enabling Mahout

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/patch
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/mahout/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/patch?rev=1177122&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/patch (added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/patch Thu Sep
29 00:28:23 2011
@@ -0,0 +1,199 @@
+Index: mahout-distribution-0.5/core/pom.xml
+===================================================================
+--- mahout-distribution-0.5.orig/core/pom.xml	2011-09-27 11:46:02.336086231 -0700
++++ mahout-distribution-0.5/core/pom.xml	2011-09-27 11:46:46.166088670 -0700
+@@ -141,7 +141,15 @@
+     <!-- Third Party -->
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-core</artifactId>
++      <artifactId>hadoop-common</artifactId>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.hadoop</groupId>
++      <artifactId>hadoop-hdfs</artifactId>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.hadoop</groupId>
++      <artifactId>hadoop-mapred</artifactId>
+     </dependency>
+ 
+     <dependency>
+Index: mahout-distribution-0.5/pom.xml
+===================================================================
+--- mahout-distribution-0.5.orig/pom.xml	2011-09-27 11:46:02.366087510 -0700
++++ mahout-distribution-0.5/pom.xml	2011-09-27 11:48:01.487338359 -0700
+@@ -196,8 +196,150 @@
+       
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-core</artifactId>
+-        <version>0.20.2</version>
++        <artifactId>hadoop-common</artifactId>
++        <version>0.23.0-SNAPSHOT</version>
++        <exclusions>
++          <exclusion>
++            <groupId>net.sf.kosmosfs</groupId>
++            <artifactId>kfs</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jetty</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jetty-util</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>hsqldb</groupId>
++            <artifactId>hsqldb</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>commons-el</groupId>
++            <artifactId>commons-el</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>junit</groupId>
++            <artifactId>junit</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>oro</groupId>
++            <artifactId>oro</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jsp-2.1</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jsp-api-2.1</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>servlet-api-2.5</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>commons-net</groupId>
++            <artifactId>commons-net</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>tomcat</groupId>
++            <artifactId>jasper-runtime</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>tomcat</groupId>
++            <artifactId>jasper-compiler</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>xmlenc</groupId>
++            <artifactId>xmlenc</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>net.java.dev.jets3t</groupId>
++            <artifactId>jets3t</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.eclipse.jdt</groupId>
++            <artifactId>core</artifactId>
++          </exclusion>
++        </exclusions>
++      </dependency>
++      <dependency>
++        <groupId>org.apache.hadoop</groupId>
++        <artifactId>hadoop-hdfs</artifactId>
++        <version>0.23.0-SNAPSHOT</version>
++        <exclusions>
++          <exclusion>
++            <groupId>net.sf.kosmosfs</groupId>
++            <artifactId>kfs</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jetty</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jetty-util</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>hsqldb</groupId>
++            <artifactId>hsqldb</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>commons-el</groupId>
++            <artifactId>commons-el</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>junit</groupId>
++            <artifactId>junit</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>oro</groupId>
++            <artifactId>oro</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jsp-2.1</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>jsp-api-2.1</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.mortbay.jetty</groupId>
++            <artifactId>servlet-api-2.5</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>commons-net</groupId>
++            <artifactId>commons-net</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>tomcat</groupId>
++            <artifactId>jasper-runtime</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>tomcat</groupId>
++            <artifactId>jasper-compiler</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>xmlenc</groupId>
++            <artifactId>xmlenc</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>net.java.dev.jets3t</groupId>
++            <artifactId>jets3t</artifactId>
++          </exclusion>
++          <exclusion>
++            <groupId>org.eclipse.jdt</groupId>
++            <artifactId>core</artifactId>
++          </exclusion>
++        </exclusions>
++      </dependency>
++      <dependency>
++        <groupId>org.apache.hadoop</groupId>
++        <artifactId>hadoop-mapred</artifactId>
++        <version>0.23.0-SNAPSHOT</version>
+         <exclusions>
+           <exclusion>
+             <groupId>net.sf.kosmosfs</groupId>
+Index: mahout-distribution-0.5/taste-web/pom.xml
+===================================================================
+--- mahout-distribution-0.5.orig/taste-web/pom.xml	2011-09-27 11:46:02.356086272 -0700
++++ mahout-distribution-0.5/taste-web/pom.xml	2011-09-27 11:47:08.227340928 -0700
+@@ -119,7 +119,15 @@
+       <exclusions>
+         <exclusion>
+           <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-core</artifactId>
++          <artifactId>hadoop-common</artifactId>
++        </exclusion>
++        <exclusion>
++          <groupId>org.apache.hadoop</groupId>
++          <artifactId>hadoop-hdfs</artifactId>
++        </exclusion>
++        <exclusion>
++          <groupId>org.apache.hadoop</groupId>
++          <artifactId>hadoop-mapred</artifactId>
+         </exclusion>
+         <exclusion>
+           <groupId>xmlenc</groupId>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/mahout/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/mahout/rules?rev=1177122&r1=1177121&r2=1177122&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/mahout/rules Thu Sep 29
00:28:23 2011
@@ -25,6 +25,7 @@ export DH_OPTIONS
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p1 < debian/patch
 	touch $@
 
 clean:	

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1177122&r1=1177121&r2=1177122&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
Thu Sep 29 00:28:23 2011
@@ -43,6 +43,7 @@ License: ASL 2.0 
 Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz
 Source1: do-component-build 
 Source2: install_%{name}.sh
+Patch0: patch
 Requires: hadoop >= 0.20.2, /sbin/chkconfig
 
 
@@ -65,6 +66,7 @@ also on potential use cases. Come to the
     
 %prep
 %setup -n %{name}-distribution-%{mahout_base_version}
+%patch0 -p1 
 
 %build
 bash $RPM_SOURCE_DIR/do-component-build



Mime
View raw message