bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1177014 - in /incubator/bigtop/branches/hadoop-0.22: bigtop-packages/src/common/oozie/patch bigtop-packages/src/deb/oozie/rules bigtop-packages/src/rpm/oozie/SPECS/oozie.spec bigtop.mk
Date Wed, 28 Sep 2011 18:42:50 GMT
Author: rvs
Date: Wed Sep 28 18:42:50 2011
New Revision: 1177014

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

Added:
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/oozie/patch
Modified:
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/oozie/rules
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
    incubator/bigtop/branches/hadoop-0.22/bigtop.mk

Added: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/oozie/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/oozie/patch?rev=1177014&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/oozie/patch (added)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/oozie/patch Wed Sep 28
18:42:50 2011
@@ -0,0 +1,241 @@
+Index: oozie-2.3.2/core/pom.xml
+===================================================================
+--- oozie-2.3.2.orig/core/pom.xml	2011-09-27 11:02:40.463593538 -0700
++++ oozie-2.3.2/core/pom.xml	2011-09-27 11:05:14.000000000 -0700
+@@ -82,15 +82,33 @@
+         </dependency>
+ 
+         <dependency>
+-            <!-- groupId to be correct by GH-0226 -->
+-            <groupId>com.yahoo.hadoop</groupId>
+-            <artifactId>hadoop-core</artifactId>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-common</artifactId>
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
+-            <!-- groupId to be correct by GH-0226 -->
+-            <groupId>com.yahoo.hadoop</groupId>
+-            <artifactId>hadoop-test</artifactId>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-hdfs</artifactId>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-mapred</artifactId>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-common-test</artifactId>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-hdfs-test</artifactId>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-mapred-test</artifactId>
+             <scope>test</scope>
+         </dependency>
+ 
+Index: oozie-2.3.2/examples/pom.xml
+===================================================================
+--- oozie-2.3.2.orig/examples/pom.xml	2011-09-27 11:02:40.483592614 -0700
++++ oozie-2.3.2/examples/pom.xml	2011-09-27 11:05:30.000000000 -0700
+@@ -65,18 +65,36 @@
+         </dependency>
+ 
+         <dependency>
+-            <!-- groupId to be correct by GH-0226 -->
+-            <groupId>com.yahoo.hadoop</groupId>
+-            <artifactId>hadoop-core</artifactId>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-common</artifactId>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-hdfs</artifactId>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-mapred</artifactId>
+             <scope>provided</scope>
+         </dependency>
+-
+         <dependency>
+-            <!-- groupId to be correct by GH-0226 -->
+-            <groupId>com.yahoo.hadoop</groupId>
+-            <artifactId>hadoop-test</artifactId>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-common-test</artifactId>
+             <scope>test</scope>
+         </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-hdfs-test</artifactId>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.apache.hadoop</groupId>
++            <artifactId>hadoop-mapred-test</artifactId>
++            <scope>test</scope>
++        </dependency>
++
+ 
+         <dependency>
+            <groupId>org.slf4j</groupId>
+Index: oozie-2.3.2/pom.xml
+===================================================================
+--- oozie-2.3.2.orig/pom.xml	2011-09-27 10:58:44.126086886 -0700
++++ oozie-2.3.2/pom.xml	2011-09-27 11:17:27.003588594 -0700
+@@ -228,23 +228,44 @@
+             </dependency>
+             
+             <dependency>
+-                <!-- groupId to be correct by GH-0226 -->
+-                <groupId>com.yahoo.hadoop</groupId>
+-                <artifactId>hadoop-core</artifactId>
+-                <version>0.20.104.2</version>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-common</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
++                <exclusions>
++                    <exclusion>
++                        <groupId>org.apache.commons</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                </exclusions>
++            </dependency>
++            <dependency>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-hdfs</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
++                <exclusions>
++                    <exclusion>
++                        <groupId>org.apache.commons</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                </exclusions>
++            </dependency>
++            <dependency>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-mapred</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>org.apache.commons</groupId>
+                         <artifactId>commons-cli</artifactId>
+                     </exclusion>
+                 </exclusions>
++
+             </dependency>
+ 
+             <dependency>
+-                <!-- groupId to be correct by GH-0226 -->
+-                <groupId>com.yahoo.hadoop</groupId>
+-                <artifactId>hadoop-test</artifactId>
+-                <version>0.20.104.2</version>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-common-test</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>org.apache.commons</groupId>
+@@ -265,11 +286,59 @@
+                 </exclusions>
+             </dependency>
+ 
++
+             <dependency>
+-                <!-- groupId to be correct by GH-0226 -->
+-                <groupId>com.yahoo.hadoop</groupId>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-hdfs-test</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
++                <exclusions>
++                    <exclusion>
++                        <groupId>org.apache.commons</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>commons-cli</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>org.slf4j</groupId>
++                        <artifactId>slf4j-api</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>org.slf4j</groupId>
++                        <artifactId>slf4j-log4j12</artifactId>
++                    </exclusion>
++                </exclusions>
++            </dependency>
++
++            <dependency>
++                <groupId>org.apache.hadoop</groupId>
++                <artifactId>hadoop-mapred-test</artifactId>
++                <version>0.22.0-SNAPSHOT</version>
++                <exclusions>
++                    <exclusion>
++                        <groupId>org.apache.commons</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>commons-cli</groupId>
++                        <artifactId>commons-cli</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>org.slf4j</groupId>
++                        <artifactId>slf4j-api</artifactId>
++                    </exclusion>
++                    <exclusion>
++                        <groupId>org.slf4j</groupId>
++                        <artifactId>slf4j-log4j12</artifactId>
++                    </exclusion>
++                </exclusions>
++            </dependency>
++
++            <dependency>
++                <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-streaming</artifactId>
+-                <version>0.20.104.2</version>
++                <version>0.22-SNAPSHOT</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>org.apache.commons</groupId>
+Index: oozie-2.3.2/sharelib/pom.xml
+===================================================================
+--- oozie-2.3.2.orig/sharelib/pom.xml	2011-09-27 11:02:40.503587889 -0700
++++ oozie-2.3.2/sharelib/pom.xml	2011-09-27 11:05:57.000000000 -0700
+@@ -39,8 +39,7 @@
+ 
+     <dependencies>
+         <dependency>
+-            <!-- groupId to be correct by GH-0226 -->
+-            <groupId>com.yahoo.hadoop</groupId>
++            <groupId>org.apache.hadoop</groupId>
+             <artifactId>hadoop-streaming</artifactId>
+             <scope>compile</scope>
+             <exclusions>
+Index: oozie-2.3.2/webapp/pom.xml
+===================================================================
+--- oozie-2.3.2.orig/webapp/pom.xml	2011-09-27 11:02:40.513589837 -0700
++++ oozie-2.3.2/webapp/pom.xml	2011-09-27 11:06:53.000000000 -0700
+@@ -134,8 +134,8 @@
+             </activation>
+             <dependencies>
+                 <dependency>
+-                    <groupId>com.yahoo.hadoop</groupId>
+-                    <artifactId>hadoop-core</artifactId>
++                    <groupId>org.apache.hadoop</groupId>
++                    <artifactId>hadoop-common</artifactId>
+                     <scope>compile</scope>
+                     <exclusions>
+                         <exclusion>

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/oozie/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/oozie/rules?rev=1177014&r1=1177013&r2=1177014&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/oozie/rules Wed Sep 28 18:42:50
2011
@@ -31,6 +31,7 @@ endif
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p1 < debian/patch
 	touch $@
 
 clean:	

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1177014&r1=1177013&r2=1177014&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Wed
Sep 28 18:42:50 2011
@@ -35,6 +35,7 @@ License: APL2
 Source0: %{name}-%{oozie_base_version}.tar.gz
 Source1: do-component-build
 Source2: create-package-layout
+Patch0: patch
 Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -101,6 +102,7 @@ BuildArch: noarch
 
 %prep
 %setup -n yahoo-oozie-af10263
+%patch0 -p1
 
 %build
     M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop.mk?rev=1177014&r1=1177013&r2=1177014&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop.mk Wed Sep 28 18:42:50 2011
@@ -95,11 +95,11 @@ $(eval $(call PACKAGE,sqoop,SQOOP))
 OOZIE_NAME=oozie
 OOZIE_RELNOTES_NAME=Apache Oozie
 OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=2.3.1
-OOZIE_PKG_VERSION=2.3.1
+OOZIE_BASE_VERSION=2.3.2
+OOZIE_PKG_VERSION=2.3.2
 OOZIE_RELEASE_VERSION=1
-OOZIE_TARBALL_DST=oozie-2.3.1.tar.gz
-OOZIE_TARBALL_SRC=2.3.1
+OOZIE_TARBALL_DST=oozie-2.3.2.tar.gz
+OOZIE_TARBALL_SRC=2.3.2
 OOZIE_PACKAGE_GIT_REPO=$(REPO_DIR)/cdh3/oozie-package
 OOZIE_SITE=http://github.com/yahoo/oozie/tarball
 $(eval $(call PACKAGE,oozie,OOZIE))



Mime
View raw message