falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [5/5] git commit: FALCON-758 Discontinue support for Oozie-3.x. Contributed by Peeyush Bishnoi
Date Tue, 07 Oct 2014 00:15:47 GMT
FALCON-758 Discontinue support for Oozie-3.x. Contributed by Peeyush Bishnoi


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/74b20631
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/74b20631
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/74b20631

Branch: refs/heads/master
Commit: 74b206319d16cc5c8412768a88fb50ed967dcb3c
Parents: de8c94a
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Mon Oct 6 17:15:37 2014 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Mon Oct 6 17:15:37 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +++
 README                                          |  2 +-
 build-tools/src/bin/build-oozie.sh              | 22 --------------------
 .../entity/parser/ClusterEntityParserTest.java  |  2 +-
 .../resources/config/cluster/cluster-0.1.xml    |  2 +-
 .../config/cluster/cluster-bad-registry.xml     |  2 +-
 .../config/cluster/cluster-no-registry.xml      |  2 +-
 docs/src/site/twiki/EntitySpecification.twiki   |  6 +++---
 docs/src/site/twiki/HiveIntegration.twiki       |  8 +++----
 docs/src/site/twiki/InstallationSteps.twiki     |  6 ++++--
 docs/src/site/twiki/OnBoarding.twiki            |  2 +-
 .../src/site/twiki/restapi/EntityValidate.twiki |  2 +-
 .../resources/config/cluster/cluster-0.1.xml    |  2 +-
 .../test/resources/config/late/late-cluster.xml |  2 +-
 oozie/src/test/resources/feed/src-cluster.xml   |  2 +-
 .../test/resources/feed/trg-cluster-alpha.xml   |  2 +-
 .../test/resources/feed/trg-cluster-beta.xml    |  2 +-
 oozie/src/test/resources/feed/trg-cluster.xml   |  2 +-
 pom.xml                                         |  4 ++--
 rerun/src/test/resources/cluster-template.xml   |  4 ++--
 src/bin/package.sh                              |  2 +-
 21 files changed, 32 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c0e5e24..c76b6f0 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,9 @@ Trunk (Unreleased)
    FALCON-263 API to get workflow parameters. (pavan kumar kolamuri via Shwetha GS)
 
   IMPROVEMENTS
+   FALCON-758 Discontinue support for Oozie-3.x (Peeyush Bishnoi via
+   Venkatesh Seetharam)
+
    FALCON-757 Discontinue support for Hadoop-1.x (Sowmya Ramesh via
    Venkatesh Seetharam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/README
----------------------------------------------------------------------
diff --git a/README b/README
index a39f914..94a1335 100644
--- a/README
+++ b/README
@@ -82,7 +82,7 @@ Cluster:
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:41021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:41000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="Hcat" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/build-tools/src/bin/build-oozie.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/build-oozie.sh b/build-tools/src/bin/build-oozie.sh
index d7e99ba..5474761 100755
--- a/build-tools/src/bin/build-oozie.sh
+++ b/build-tools/src/bin/build-oozie.sh
@@ -40,11 +40,6 @@ then
 fi
 
 PKG_URL="http://archive.apache.org/dist/oozie/$VERSION/oozie-$VERSION.tar.gz"
-if [ $VERSION == '3.1.3-incubating' ]
-then
-    PKG_URL="http://archive.apache.org/dist/oozie/$VERSION/oozie-$VERSION-src.tar.gz"
-fi
-
 PKG=oozie-$VERSION
 
 mkdir -p ../target
@@ -60,23 +55,6 @@ sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g
pom.xml */pom
 patch -p0 < ../../build-tools/src/patches/oozie-site.patch
 
 case $VERSION in
-3.2.0-incubating )
-    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
-    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
-    patch -p0 < ../../build-tools/src/patches/OOZIE-882.patch
-    ;;
-3.3.0 )
-    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
-    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
-    ;;
-3.3.1 )
-    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
-    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
-    ;;
-3.3.2 )
-    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6.patch
-    patch -p0 < ../../build-tools/src/patches/OOZIE-1465-3.3.2.patch
-    ;;
 4.0.0 )
     patch -p1 --verbose < ../../build-tools/src/patches/OOZIE-1551-4.0.patch
     patch -p0 < ../../build-tools/src/patches/OOZIE-1741.patch

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/common/src/test/java/org/apache/falcon/entity/parser/ClusterEntityParserTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/falcon/entity/parser/ClusterEntityParserTest.java
b/common/src/test/java/org/apache/falcon/entity/parser/ClusterEntityParserTest.java
index 08c4c29..709e597 100644
--- a/common/src/test/java/org/apache/falcon/entity/parser/ClusterEntityParserTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/parser/ClusterEntityParserTest.java
@@ -76,7 +76,7 @@ public class ClusterEntityParserTest extends AbstractTestBase {
 
         Interface workflow = ClusterHelper.getInterface(cluster, Interfacetype.WORKFLOW);
         Assert.assertEquals(workflow.getEndpoint(), "http://localhost:11000/oozie/");
-        Assert.assertEquals(workflow.getVersion(), "3.1");
+        Assert.assertEquals(workflow.getVersion(), "4.0");
 
         Assert.assertEquals(ClusterHelper.getLocation(cluster, "staging"), "/projects/falcon/staging");
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/common/src/test/resources/config/cluster/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/cluster/cluster-0.1.xml b/common/src/test/resources/config/cluster/cluster-0.1.xml
index 0f5fb47..35bfbbb 100644
--- a/common/src/test/resources/config/cluster/cluster-0.1.xml
+++ b/common/src/test/resources/config/cluster/cluster-0.1.xml
@@ -26,7 +26,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="http://localhost:48080/templeton/v1"

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/common/src/test/resources/config/cluster/cluster-bad-registry.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/cluster/cluster-bad-registry.xml b/common/src/test/resources/config/cluster/cluster-bad-registry.xml
index 1417d15..1d15e16 100644
--- a/common/src/test/resources/config/cluster/cluster-bad-registry.xml
+++ b/common/src/test/resources/config/cluster/cluster-bad-registry.xml
@@ -26,7 +26,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="registry" endpoint="Hcat" version="0.1"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/common/src/test/resources/config/cluster/cluster-no-registry.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/cluster/cluster-no-registry.xml b/common/src/test/resources/config/cluster/cluster-no-registry.xml
index 12b2369..86ee02d 100644
--- a/common/src/test/resources/config/cluster/cluster-no-registry.xml
+++ b/common/src/test/resources/config/cluster/cluster-no-registry.xml
@@ -26,7 +26,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
     </interfaces>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/docs/src/site/twiki/EntitySpecification.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/EntitySpecification.twiki b/docs/src/site/twiki/EntitySpecification.twiki
index ffc350c..a710dfd 100644
--- a/docs/src/site/twiki/EntitySpecification.twiki
+++ b/docs/src/site/twiki/EntitySpecification.twiki
@@ -40,7 +40,7 @@ An execute interface specifies the interface for job tracker, it's endpoint
is t
 Falcon uses this interface to submit the processes as jobs on !JobTracker defined here.
 
 <verbatim>
-<interface type="workflow" endpoint="http://localhost:11000/oozie/" version="3.1" />
+<interface type="workflow" endpoint="http://localhost:11000/oozie/" version="4.0" />
 </verbatim>
 A workflow interface specifies the interface for workflow engine, example of its endpoint
is the value for OOZIE_URL.
 Falcon uses this interface to schedule the processes referencing this cluster on workflow
engine defined here.
@@ -645,8 +645,8 @@ There are 2 engines supported today.
 ---++++ Oozie
 
 As part of oozie workflow engine support, users can embed a oozie workflow.
-Refer to oozie [[http://oozie.apache.org/docs/4.0.0/DG_Overview.html][workflow overview]]
and
-[[http://oozie.apache.org/docs/4.0.0/WorkflowFunctionalSpec.html][workflow specification]]
for details.
+Refer to oozie [[http://oozie.apache.org/docs/4.0.1/DG_Overview.html][workflow overview]]
and
+[[http://oozie.apache.org/docs/4.0.1/WorkflowFunctionalSpec.html][workflow specification]]
for details.
 
 Syntax:
 <verbatim>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/docs/src/site/twiki/HiveIntegration.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/HiveIntegration.twiki b/docs/src/site/twiki/HiveIntegration.twiki
index 2af5a6b..688305d 100644
--- a/docs/src/site/twiki/HiveIntegration.twiki
+++ b/docs/src/site/twiki/HiveIntegration.twiki
@@ -41,11 +41,11 @@ Hence, Falcon for Hive support needs Oozie 4.x.
 
 
 ---++ Oozie Shared Library setup
-Falcon post Hive integration depends heavily on the [[http://oozie.apache.org/docs/4.0.0/WorkflowFunctionalSpec.html#a17_HDFS_Share_Libraries_for_Workflow_Applications_since_Oozie_2.3][shared
library feature of Oozie]].
+Falcon post Hive integration depends heavily on the [[http://oozie.apache.org/docs/4.0.1/WorkflowFunctionalSpec.html#a17_HDFS_Share_Libraries_for_Workflow_Applications_since_Oozie_2.3][shared
library feature of Oozie]].
 Since the sheer number of jars for HCatalog, Pig and Hive are in the many 10s in numbers,
its quite daunting to
 redistribute the dependent jars from Falcon.
 
-[[http://oozie.apache.org/docs/4.0.0/DG_QuickStart.html#Oozie_Share_Lib_Installation][This
is a one time effort in Oozie setup and is quite straightforward.]]
+[[http://oozie.apache.org/docs/4.0.1/DG_QuickStart.html#Oozie_Share_Lib_Installation][This
is a one time effort in Oozie setup and is quite straightforward.]]
 
 
 ---++ Approach
@@ -195,7 +195,7 @@ Following is an example entity configuration for lifecycle management
functions
         <interface type="execute" endpoint="localhost:10300"
                    version="1.1.1" />
         <interface type="workflow" endpoint="http://localhost:11010/oozie/"
-                   version="3.3.0" />
+                   version="4.0.1" />
         <interface type="registry" endpoint="thrift://localhost:19083"
                    version="0.11.0" />
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
@@ -227,7 +227,7 @@ Following is an example entity configuration for lifecycle management
functions
         <interface type="execute" endpoint="localhost:20300"
                    version="1.1.1" />
         <interface type="workflow" endpoint="http://localhost:11020/oozie/"
-                   version="3.3.0" />
+                   version="4.0.1" />
         <interface type="registry" endpoint="thrift://localhost:29083"
                    version="0.11.0" />
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 2813c6c..0e3bfcf 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -12,7 +12,8 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean
install
 
 [optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for
a specific version of hadoop]
 *Note:* Falcon drops support for Hadoop-1 and only supports Hadoop-2 from Falcon 0.6 onwards
-[optionally -Doozie.version=<<oozie version>> can be appended to build with a
specific version of oozie. Oozie versions >= 3.oozie-3.2.0-incubating are supported]
+[optionally -Doozie.version=<<oozie version>> can be appended to build with a
specific version of oozie.
+Oozie versions >= 4 are supported]
 
 </verbatim>
 
@@ -247,9 +248,10 @@ bin/prism-stop
 cd <<project home>>
 src/bin/package.sh <<hadoop-version>> <<oozie-version>>
 
+>> ex. src/bin/package.sh 1.1.2 4.0.1 or src/bin/package.sh 0.20.2-cdh3u5 4.0.1
 >> ex. src/bin/package.sh 2.5.0 4.0.0
 >> Falcon package is available in <<falcon home>>/target/falcon-<<version>>-bin.tar.gz
->> Oozie package is available in <<falcon home>>/target/oozie-3.3.2-distro.tar.gz
+>> Oozie package is available in <<falcon home>>/target/oozie-4.0.1-distro.tar.gz
 </verbatim>
 
 ---+++ Running Examples using embedded package

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/docs/src/site/twiki/OnBoarding.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/OnBoarding.twiki b/docs/src/site/twiki/OnBoarding.twiki
index 7348665..75d0d7e 100644
--- a/docs/src/site/twiki/OnBoarding.twiki
+++ b/docs/src/site/twiki/OnBoarding.twiki
@@ -30,7 +30,7 @@ Cluster definition that contains end points for name node, job tracker,
oozie an
 
         <interface type="execute" endpoint="job-tracker:54311" version="2.5.0" />
 
-        <interface type="workflow" endpoint="http://oozie.com:11000/oozie/" version="3.1.4"
/>
+        <interface type="workflow" endpoint="http://oozie.com:11000/oozie/" version="4.0.1"
/>
 
         <interface type="messaging" endpoint="tcp://jms-server.com:61616?daemon=true"
version="5.1.6" />
     </interfaces>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/docs/src/site/twiki/restapi/EntityValidate.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/restapi/EntityValidate.twiki b/docs/src/site/twiki/restapi/EntityValidate.twiki
index 89bd155..3fe0f83 100644
--- a/docs/src/site/twiki/restapi/EntityValidate.twiki
+++ b/docs/src/site/twiki/restapi/EntityValidate.twiki
@@ -23,7 +23,7 @@ POST http://localhost:15000/api/entities/validate/cluster
         <interface type="readonly" endpoint="hftp://localhost:50070" version="1.1.1"/>
         <interface type="write" endpoint="hdfs://localhost:9000" version="1.1.1"/>
         <interface type="execute" endpoint="localhost:9001" version="1.1.1"/>
-        <interface type="workflow" endpoint="http://localhost:11000/oozie/" version="3.3.0"/>
+        <interface type="workflow" endpoint="http://localhost:11000/oozie/" version="4.0.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true" version="5.4.3"/>
     </interfaces>
     <locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/config/cluster/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/config/cluster/cluster-0.1.xml b/oozie/src/test/resources/config/cluster/cluster-0.1.xml
index 032cc77..da080c7 100644
--- a/oozie/src/test/resources/config/cluster/cluster-0.1.xml
+++ b/oozie/src/test/resources/config/cluster/cluster-0.1.xml
@@ -26,7 +26,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="Hcat" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/config/late/late-cluster.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/config/late/late-cluster.xml b/oozie/src/test/resources/config/late/late-cluster.xml
index ac0817f..21c63f5 100644
--- a/oozie/src/test/resources/config/late/late-cluster.xml
+++ b/oozie/src/test/resources/config/late/late-cluster.xml
@@ -26,7 +26,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="Hcat" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/feed/src-cluster.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/feed/src-cluster.xml b/oozie/src/test/resources/feed/src-cluster.xml
index 730f8d2..d9a1632 100644
--- a/oozie/src/test/resources/feed/src-cluster.xml
+++ b/oozie/src/test/resources/feed/src-cluster.xml
@@ -24,7 +24,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="thrift://localhost:49093" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/feed/trg-cluster-alpha.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/feed/trg-cluster-alpha.xml b/oozie/src/test/resources/feed/trg-cluster-alpha.xml
index 1fb07cb..7de7078 100644
--- a/oozie/src/test/resources/feed/trg-cluster-alpha.xml
+++ b/oozie/src/test/resources/feed/trg-cluster-alpha.xml
@@ -23,7 +23,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="thrift://localhost:59093" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/feed/trg-cluster-beta.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/feed/trg-cluster-beta.xml b/oozie/src/test/resources/feed/trg-cluster-beta.xml
index 0bf0bcd..11f4afa 100644
--- a/oozie/src/test/resources/feed/trg-cluster-beta.xml
+++ b/oozie/src/test/resources/feed/trg-cluster-beta.xml
@@ -23,7 +23,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="thrift://localhost:59093" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/oozie/src/test/resources/feed/trg-cluster.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/feed/trg-cluster.xml b/oozie/src/test/resources/feed/trg-cluster.xml
index 8260fda..01f83fb 100644
--- a/oozie/src/test/resources/feed/trg-cluster.xml
+++ b/oozie/src/test/resources/feed/trg-cluster.xml
@@ -24,7 +24,7 @@
                    version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="thrift://localhost:59093" version="1"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94eaf7a..02473b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1126,8 +1126,8 @@
                             <rules>
                                 <requireProperty>
                                     <property>oozie.version</property>
-                                    <regex>^(?:(?!3\.1\.3-incubating).)*$</regex>
-                                    <regexMessage>Oozie version 3.1.3-incubating is
not supported. Use a higher version of oozie</regexMessage>
+                                    <regex>^(?:(?!3).)*$</regex>
+                                    <regexMessage>Oozie version 3.* is not supported.
Use a higher version of oozie</regexMessage>
                                 </requireProperty>
                             </rules>
                             <fail>true</fail>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/rerun/src/test/resources/cluster-template.xml
----------------------------------------------------------------------
diff --git a/rerun/src/test/resources/cluster-template.xml b/rerun/src/test/resources/cluster-template.xml
index 658365f..bcced60 100644
--- a/rerun/src/test/resources/cluster-template.xml
+++ b/rerun/src/test/resources/cluster-template.xml
@@ -24,7 +24,7 @@
         <interface type="write" endpoint="hdfs://localhost:8020" version="0.20.2"/>
         <interface type="execute" endpoint="localhost:8021" version="0.20.2"/>
         <interface type="workflow" endpoint="http://localhost:11000/oozie/"
-                   version="3.1"/>
+                   version="4.0"/>
         <interface type="messaging" endpoint="tcp://localhost:61616?daemon=true"
                    version="5.1.6"/>
         <interface type="registry" endpoint="Hcat" version="1"/>
@@ -34,4 +34,4 @@
         <location name="working" path="/projects/falcon/working"/>
         <location name="staging" path="/projects/falcon/staging"/>
     </locations>
-</cluster>
\ No newline at end of file
+</cluster>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74b20631/src/bin/package.sh
----------------------------------------------------------------------
diff --git a/src/bin/package.sh b/src/bin/package.sh
index 9aff1c7..d9c1678 100755
--- a/src/bin/package.sh
+++ b/src/bin/package.sh
@@ -66,5 +66,5 @@ popd
 mvn assembly:assembly -P $HADOOP_PROFILE -Dhadoop.version=$HADOOP_VERSION -Doozie.version=$OOZIE_VERSION
-Doozie.forcebuild=true -DskipTests -DskipCheck=true
 
 echo "Falcon pacakge is available in ${FALCON_SRC}/target/falcon-<<version>>-bin.tar.gz"
-echo "Oozie pacakge is available in ${FALCON_SRC}/target/oozie-$OOZIE_VERSION-distro.tar.gz"
+echo "Oozie pacakge is available in ${FALCON_SRC}/target/oozie-$OOZIE_VERSION/distro/target/oozie-$OOZIE_VERSION-distro.tar.gz"
 popd


Mime
View raw message