sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arv...@apache.org
Subject svn commit: r1209344 - in /incubator/sqoop/trunk: ./ doc/ lib/ src/docs/web/ src/java/com/cloudera/sqoop/shims/ src/java/org/apache/hadoop/ src/scripts/
Date Fri, 02 Dec 2011 03:02:12 GMT
Author: arvind
Date: Fri Dec  2 03:02:10 2011
New Revision: 1209344

URL: http://svn.apache.org/viewvc?rev=1209344&view=rev
Log:
SQOOP-400. Merge 1.4.0 release changes back to trunk.

(Bilung Lee via Arvind Prabhakar)

Removed:
    incubator/sqoop/trunk/doc/
    incubator/sqoop/trunk/lib/LICENSE-ant-eclipse-1.0-jvm1.2.txt
    incubator/sqoop/trunk/lib/LICENSE-hadoop-mrunit-0.20.2-CDH3b2-SNAPSHOT.txt
    incubator/sqoop/trunk/lib/hadoop-mrunit-0.20.2-CDH3b2-SNAPSHOT.jar
    incubator/sqoop/trunk/src/java/com/cloudera/sqoop/shims/
    incubator/sqoop/trunk/src/java/org/apache/hadoop/
Modified:
    incubator/sqoop/trunk/CHANGES.txt
    incubator/sqoop/trunk/LICENSE.txt
    incubator/sqoop/trunk/NOTICE.txt
    incubator/sqoop/trunk/build.xml
    incubator/sqoop/trunk/src/docs/web/html.xsl
    incubator/sqoop/trunk/src/scripts/write-version-info.sh

Modified: incubator/sqoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/CHANGES.txt?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/CHANGES.txt (original)
+++ incubator/sqoop/trunk/CHANGES.txt Fri Dec  2 03:02:10 2011
@@ -1,6 +1,6 @@
 Apache Sqoop Change Log
 
-Release 1.4.0 - Unreleased
+Release 1.4.0 - 11/29/2011
 
   NEW FEATURES
 

Modified: incubator/sqoop/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/LICENSE.txt?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/LICENSE.txt (original)
+++ incubator/sqoop/trunk/LICENSE.txt Fri Dec  2 03:02:10 2011
@@ -200,3 +200,92 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+===============================================================================
+
+This Apache Sqoop distribution includes the following sources/binaries.
+The use of these sources/binaries is subject to the terms and conditions
+of their respective licenses.
+
+For src/docs/web/docbook.css:
+
+  The BSD License
+
+  Copyright (c) 2001, 2003 The FreeBSD Documentation Project
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
+For lib/jopt-simple-<version>.jar:
+
+  The MIT License
+
+  Copyright (c) 2011
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+For lib/paranamer-<version>.jar:
+
+  The BSD License
+
+  Copyright (c) 2006 Paul Hammant & ThoughtWorks Inc
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.

Modified: incubator/sqoop/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/NOTICE.txt?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/NOTICE.txt (original)
+++ incubator/sqoop/trunk/NOTICE.txt Fri Dec  2 03:02:10 2011
@@ -1,4 +1,4 @@
-Apache SQOOP
+Apache Sqoop
 Copyright 2011 The Apache Software Foundation
 
 This product includes software developed at

Modified: incubator/sqoop/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/build.xml?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/build.xml (original)
+++ incubator/sqoop/trunk/build.xml Fri Dec  2 03:02:10 2011
@@ -33,7 +33,7 @@
   <property environment="env"/>
   <property name="name" value="sqoop" />
   <property name="Name" value="Sqoop" />
-  <property name="version" value="1.5.0-incubating-SNAPSHOT" />
+  <property name="version" value="1.4.1-incubating-SNAPSHOT" />
 
   <!-- The last version released. -->
   <property name="oldversion" value="1.4.0-incubating" />
@@ -97,6 +97,10 @@
   <property name="build.docs.timestamp"
       location="${build.dir}/docs.timestamp" />
 
+  <property name="src.artifact.name" value="${name}-${version}-src" />
+  <property name="src.dist.dir" location="${build.dir}/${src.artifact.name}" />
+  <property name="src.tar.file" location="${build.dir}/${src.artifact.name}.tar.gz" />
+
   <!-- compilation -->
   <property name="javac.deprecation" value="off"/>
   <property name="javac.debug" value="on"/>
@@ -430,6 +434,7 @@
     <!-- make sure the bin scripts are executable. -->
     <chmod perm="ugo+x" type="file" parallel="false">
       <fileset dir="${dist.dir}/bin" />
+      <fileset dir="${dist.dir}/testdata/hive/bin" />
     </chmod>
 
     <!-- make sure any scripts named *.sh are executable. -->
@@ -452,16 +457,67 @@
     <tar compression="gzip" longfile="gnu" destfile="${tar.file}">
       <tarfileset dir="${build.dir}" mode="664">
         <exclude name="${artifact.name}/bin/*" />
+        <exclude name="${artifact.name}/testdata/hive/bin/*" />
         <exclude name="${artifact.name}/**/*.sh" />
         <include name="${artifact.name}/**" />
       </tarfileset>
       <tarfileset dir="${build.dir}" mode="755">
         <include name="${artifact.name}/bin/*" />
+        <include name="${artifact.name}/testdata/hive/bin/*" />
         <include name="${artifact.name}/**/*.sh" />
       </tarfileset>
     </tar>
   </target>
 
+  <target name="srcpackage" description="Create a redistributable source package">
+
+    <mkdir dir="${src.dist.dir}"/>
+
+    <!-- copy in various components of the initial source layout
+         so that the redistributable can bootstrap itself. -->
+    <copy todir="${src.dist.dir}" includeEmptyDirs="false" flatten="false">
+      <fileset dir="${basedir}">
+        <include name="**/*" />
+        <exclude name="build/**" />
+        <exclude name=".git/**" />
+        <exclude name="tags" />
+        <exclude name=".project" />
+        <exclude name=".classpath" />
+        <exclude name="conf/managers.d/**" />
+        <exclude name="conf/tools.d/**" />
+      </fileset>
+    </copy>
+
+    <!-- make sure the bin scripts are executable. -->
+    <chmod perm="ugo+x" type="file" parallel="false">
+      <fileset dir="${src.dist.dir}/bin" />
+      <fileset dir="${src.dist.dir}/testdata/hive/bin" />
+    </chmod>
+
+    <!-- make sure any scripts named *.sh are executable. -->
+    <chmod perm="ugo+x" type="file" parallel="false">
+      <fileset dir="${src.dist.dir}">
+        <include name="**/*.sh" />
+      </fileset>
+    </chmod>
+  </target>
+
+  <target name="srctar" depends="srcpackage" description="Create release source tarball">
+    <tar compression="gzip" longfile="gnu" destfile="${src.tar.file}">
+      <tarfileset dir="${build.dir}" mode="664">
+        <exclude name="${src.artifact.name}/bin/*" />
+        <exclude name="${src.artifact.name}/testdata/hive/bin/*" />
+        <exclude name="${src.artifact.name}/**/*.sh" />
+        <include name="${src.artifact.name}/**" />
+      </tarfileset>
+      <tarfileset dir="${build.dir}" mode="755">
+        <include name="${src.artifact.name}/bin/*" />
+        <include name="${src.artifact.name}/testdata/hive/bin/*" />
+        <include name="${src.artifact.name}/**/*.sh" />
+      </tarfileset>
+    </tar>
+  </target>
+
   <!-- set variables that configure the actual test -->
   <target name="test-prep" depends="test-prep-normal,test-prep-thirdparty,
                                     test-prep-manual"/>

Modified: incubator/sqoop/trunk/src/docs/web/html.xsl
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/docs/web/html.xsl?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/docs/web/html.xsl (original)
+++ incubator/sqoop/trunk/src/docs/web/html.xsl Fri Dec  2 03:02:10 2011
@@ -19,8 +19,6 @@
   limitations under the License.
 -->
 
-<!-- $FreeBSD: doc/share/xsl/freebsd-html.xsl,v 1.1 2003/01/03 05:06:14 trhodes Exp $
-->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'
                 xmlns="http://www.w3.org/TR/xhtml1/transitional"

Modified: incubator/sqoop/trunk/src/scripts/write-version-info.sh
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/scripts/write-version-info.sh?rev=1209344&r1=1209343&r2=1209344&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/scripts/write-version-info.sh (original)
+++ incubator/sqoop/trunk/src/scripts/write-version-info.sh Fri Dec  2 03:02:10 2011
@@ -63,8 +63,6 @@ public final class SqoopVersion extends 
     org.apache.sqoop.SqoopVersion.GIT_HASH;
   public static final String COMPILE_USER =
     org.apache.sqoop.SqoopVersion.COMPILE_USER;
-  public static final String COMPILE_HOST =
-    org.apache.sqoop.SqoopVersion.COMPILE_HOST;
   public static final String COMPILE_DATE =
     org.apache.sqoop.SqoopVersion.COMPILE_DATE;
 }
@@ -83,14 +81,13 @@ public class SqoopVersion {
   public static final String VERSION="${version}";
   public static final String GIT_HASH="${signature}";
   public static final String COMPILE_USER="${USER}";
-  public static final String COMPILE_HOST="${host}";
   public static final String COMPILE_DATE="${compiledate}";
 
   @Override
   public String toString() {
     return "Sqoop " + VERSION + "\n"
         + "git commit id " + GIT_HASH + "\n"
-        + "Compiled by " + COMPILE_USER + "@" + COMPILE_HOST
+        + "Compiled by " + COMPILE_USER
         + " on " + COMPILE_DATE + "\n";
   }
 }



Mime
View raw message