Author: rkanter
Date: Wed Apr 10 20:15:34 2013
New Revision: 1466656

URL: http://svn.apache.org/r1466656
Log:
OOZIE-897 remove special build handling for sqoop testcase (rkanter)

Modified:
    oozie/trunk/core/pom.xml
    oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
    oozie/trunk/pom.xml
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/pom.xml?rev=1466656&r1=1466655&r2=1466656&view=diff
==============================================================================
--- oozie/trunk/core/pom.xml (original)
+++ oozie/trunk/core/pom.xml Wed Apr 10 20:15:34 2013
@@ -577,7 +577,6 @@
                                 <exclude>**/TestRerun.java</exclude>
                                 
<exclude>**/TestCallableQueueService.java</exclude>
                                 <exclude>**/TestSsh*.java</exclude>
-                                <exclude>**/TestSqoop*.java</exclude>
                                 <exclude>**/TestActionErrors.java</exclude>
                                 
<exclude>**/TestJavaActionExecutor.java</exclude>
                                 <exclude>**/TestLauncher.java</exclude>
@@ -691,34 +690,6 @@
                 </dependency>
             </dependencies>
         </profile>
-
-        <!-- Forcing Hadoop 0.20.2-cdh3u2 version because Sqoop    -->
-        <!-- uses Hadoop API that is avail 0.21 onwards and the    -->
-        <!-- Hadoop CDH version is the only stable version that    -->
-        <!-- currently has such API (SQOOP-384) and published      -->
-        <!-- in public Maven repos. This is a temporary fix        -->
-        <profile>
-            <id>testSqoop</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>testSqoop</name>
-                </property>
-            </activation>
-            <properties>
-                <hadoop.version>0.20.2-cdh3u2</hadoop.version>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>cdh.releases.repo</id>
-                    
<url>https://repository.cloudera.com/content/groups/cdh-releases-rcs</url>
-                    <name>CDH Releases Repository</name>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
     </profiles>
 
 </project>

Modified: oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
URL: 
http://svn.apache.org/viewvc/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki?rev=1466656&r1=1466655&r2=1466656&view=diff
==============================================================================
--- oozie/trunk/docs/src/site/twiki/ENG_Building.twiki (original)
+++ oozie/trunk/docs/src/site/twiki/ENG_Building.twiki Wed Apr 10 20:15:34 2013
@@ -197,17 +197,6 @@ file the following message 'SKIPPING TES
 There are 2 testcases that use the *wordcount-simple* pipes binary, 
*TestPipesMain* and *TestMapReduceActionExecutor*,
 the 'SKIPPING TEST..." message would appear in the testcase log file of both 
testcases.
 
----+++ Testing Sqoop Action
-
-Apache Sqoop 1.5.0 requires functionality only available in Hadoop 0.21 and 
onwards. Currently, the only
-stable version of Hadoop implementing those API (SQOOP-384) that is being 
published by to public Maven
-repositories are Hadoop CDH versions. This profile activates the use of that 
Hadoop version for testing
-purposes. *This is a temporary fix*.
-
-<verbatim>
-$ mvn -DtestSqoop -Dtest=TestSqoopActionExecutor
-</verbatim>
-
 ---++ Building an Oozie Distribution
 
 An Oozie distribution bundles an embedded Tomcat server. The Oozie distro 
module downloads Tomcat TAR.GZ from Apache

Modified: oozie/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1466656&r1=1466655&r2=1466656&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Wed Apr 10 20:15:34 2013
@@ -884,10 +884,6 @@
                         -->
                         <exclude>**/TestSsh*.java</exclude>
 
-
-                        <!-- See 'testSqoop' profile in core/pom.xml and the 
Building doc-->
-                        <exclude>**/TestSqoop*.java</exclude>
-
                         <!-- Explictly use 
-Dtest=TestMapReduceActionExecutorUberJar to test the uber jar functionality.
                              Requires at least Hadoop 1.2.0 or 2.2.0.
                         -->

Modified: oozie/trunk/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1466656&r1=1466655&r2=1466656&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Apr 10 20:15:34 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-897 remove special build handling for sqoop testcase (rkanter)
 OOZIE-1209 Event generation and handling for workflow and coordinator (mona)
 OOZIE-1118 improve logic of purge service (rkanter)
 OOZIE-1205 If the JobTracker is restarted during a Fork, Oozie doesn't fail 
all of the currently running actions (rkanter)


Reply via email to