You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ab...@apache.org on 2015/04/17 10:25:12 UTC
[1/3] sqoop git commit: SQOOP-2304: Update license file
Repository: sqoop
Updated Branches:
refs/heads/branch-1.99.6 0201a3f9d -> fa3ff0b17
SQOOP-2304: Update license file
(Richard Zhou via Abraham Elmahrek)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/fa3ff0b1
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/fa3ff0b1
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/fa3ff0b1
Branch: refs/heads/branch-1.99.6
Commit: fa3ff0b17a86ad2d40d1048eba98f0cff296065e
Parents: c496047
Author: Abraham Elmahrek <ab...@apache.org>
Authored: Fri Apr 17 01:12:09 2015 -0700
Committer: Abraham Elmahrek <ab...@apache.org>
Committed: Fri Apr 17 01:24:50 2015 -0700
----------------------------------------------------------------------
LICENSE.txt | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 322 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/fa3ff0b1/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 0a16fdb..036c4fb 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -437,3 +437,325 @@ For avro.jar:
For zookeeper.jar:
The Apache License, Version 2.0
+
+For asm-<version>.jar:
+
+ BSD License
+
+For xmlenc-<version>.jar:
+
+ The BSD License
+
+For stax-api-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jackson-mapper-asl-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jasper-compiler-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-io-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jetty-util-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-logging-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jackson-xc-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-configuration-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-beanutils-core-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jackson-core-asl-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For httpclient-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For curator-client-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jets3t-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-codec-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For snappy-java-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-compress-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jersey-server-<version>.jar:
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+For hadoop-annotations-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jaxb-impl-<version>.jar:
+
+ CDDL v1.1 and GPL v2
+
+For htrace-core-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For hadoop-common-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For api-asn1-api-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For paranamer-<version>.jar:
+
+ BSD License
+
+For jettison-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For gson-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-beanutils-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For slf4j-log4j12-<version>.jar:
+
+ MIT License
+
+For protobuf-java-<version>.jar:
+
+ BSD License
+
+For netty-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For apacheds-i18n-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For apacheds-kerberos-codec-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For httpcore-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jaxb-api-<version>.jar:
+
+ CDDL v1.1 and GPL v2
+
+For hadoop-auth-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For api-util-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For slf4j-api-<version>.jar:
+
+ MIT License
+
+For curator-framework-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-net-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-el-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jasper-runtime-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jetty-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For java-xmlbuilder-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-httpclient-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jackson-jaxrs-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jsch-<version>.jar:
+
+ BSD License
+
+For activation-<version>.jar:
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+For commons-collections-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-math3-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For curator-recipes-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-digester-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jersey-json-<version>.jar:
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+For javax.ws.rs-api-<version>.jar:
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+For parquet-generator-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For parquet-jackson-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For commons-jexl-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For joda-time-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For parquet-common-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For parquet-encoding-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For kite-data-core-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For mysql-connector-java-<version>.jar:
+
+ GNU General Public License, version 2
+
+For parquet-format-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For postgresql-<version>.jar:
+
+ The PostgreSQL Licence
+
+ This is a template license. The body of the license starts at the end of this paragraph. To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.
+
+ Copyright (c) $YEAR, $ORGANIZATION
+
+ Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
+
+ IN NO EVENT SHALL $ORGANISATION BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF $ORGANISATION HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ $ORGANISATION SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND $ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+For derbyclient-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jackson-annotations-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jcommander-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For zkclient-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For opencsv-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For kite-hadoop-compatibility-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For kite-data-hive-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For jopt-simple-<version>.jar:
+
+ The MIT License
+
+For parquet-avro-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For derbynet-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For parquet-hadoop-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For parquet-column-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For metrics-core-<version>.jar:
+
+ The Apache License, Version 2.0
+
+For scala-library-<version>.jar:
+
+ BSD license
\ No newline at end of file
[3/3] sqoop git commit: SQOOP-2310: Sqoop2: fix a typo for Hadoop
conf directory
Posted by ab...@apache.org.
SQOOP-2310: Sqoop2: fix a typo for Hadoop conf directory
(Richard Zhou via Abraham Elmahrek)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/98d717c6
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/98d717c6
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/98d717c6
Branch: refs/heads/branch-1.99.6
Commit: 98d717c6a0c9ad7cb4b9d1e3332254e87be2d49d
Parents: 0201a3f
Author: Abraham Elmahrek <ab...@apache.org>
Authored: Fri Apr 17 00:42:10 2015 -0700
Committer: Abraham Elmahrek <ab...@apache.org>
Committed: Fri Apr 17 01:24:50 2015 -0700
----------------------------------------------------------------------
.../src/main/resources/hdfs-connector-config.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/98d717c6/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties b/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
index eb9c000..f00eaf6 100644
--- a/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
+++ b/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
@@ -24,7 +24,7 @@ linkConfig.help = Here you supply information necessary to connect to HDFS
linkConfig.uri.label = HDFS URI
linkConfig.uri.help = HDFS URI used to connect to HDFS
-linkConfig.confDir.label = Hadoop conf directory:
+linkConfig.confDir.label = Hadoop conf directory
linkConfig.confDir.help = Directory with Hadoop configuration files. The connector will load all -site.xml files.
# To Job Config
[2/3] sqoop git commit: SQOOP-2308: Sqoop2: Fix a typo for
hdfs-connector-config.properties and kafka-connector-config.properties
Posted by ab...@apache.org.
SQOOP-2308: Sqoop2: Fix a typo for hdfs-connector-config.properties and kafka-connector-config.properties
(Richard Zhou via Abraham Elmahrek)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/c496047e
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/c496047e
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/c496047e
Branch: refs/heads/branch-1.99.6
Commit: c496047ecc0ece52919228bc75c5f3c2232c4345
Parents: 98d717c
Author: Abraham Elmahrek <ab...@apache.org>
Authored: Fri Apr 17 00:50:59 2015 -0700
Committer: Abraham Elmahrek <ab...@apache.org>
Committed: Fri Apr 17 01:24:50 2015 -0700
----------------------------------------------------------------------
.../src/main/resources/hdfs-connector-config.properties | 4 ++--
.../src/main/resources/kafka-connector-config.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/c496047e/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties b/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
index f00eaf6..5feae54 100644
--- a/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
+++ b/connector/connector-hdfs/src/main/resources/hdfs-connector-config.properties
@@ -29,7 +29,7 @@ linkConfig.confDir.help = Directory with Hadoop configuration files. The connect
# To Job Config
#
-toJobConfig.label = ToJob configuration
+toJobConfig.label = To HDFS configuration
toJobConfig.help = You must supply the information requested in order to \
get information where you want to store your data.
@@ -62,7 +62,7 @@ toJobConfig.nullValue.help = Use this particular character or sequence of charac
# From Job Config
#
-fromJobConfig.label = From Job configuration
+fromJobConfig.label = From HDFS configuration
fromJobConfig.help = Specifies information required to get data from Hadoop ecosystem
fromJobConfig.inputDirectory.label = Input directory
http://git-wip-us.apache.org/repos/asf/sqoop/blob/c496047e/connector/connector-kafka/src/main/resources/kafka-connector-config.properties
----------------------------------------------------------------------
diff --git a/connector/connector-kafka/src/main/resources/kafka-connector-config.properties b/connector/connector-kafka/src/main/resources/kafka-connector-config.properties
index 0d6fca3..d3e1e6f 100644
--- a/connector/connector-kafka/src/main/resources/kafka-connector-config.properties
+++ b/connector/connector-kafka/src/main/resources/kafka-connector-config.properties
@@ -31,7 +31,7 @@ linkConfig.zookeeperConnect.help = Address of Zookeeper used by the Kafka cluste
use host:port\kafka
# To Job Config
#
-toJobConfig.label = ToJob configuration
+toJobConfig.label = To Kafka configuration
toJobConfig.help = Configuration necessary when writing data to Kafka
toJobConfig.topic.label = Kafka topic