You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/05/04 02:44:24 UTC
git commit: BIGTOP-962. Bump Sqoop version to 1.99.2
Updated Branches:
refs/heads/master ee245fec0 -> 7de5092a2
BIGTOP-962. Bump Sqoop version to 1.99.2
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/7de5092a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/7de5092a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/7de5092a
Branch: refs/heads/master
Commit: 7de5092a2bcbd50f3fe2fb100e8c840bb23d8e25
Parents: ee245fe
Author: Sean Mackrory <se...@cloudera.com>
Authored: Fri May 3 16:08:08 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Fri May 3 17:42:24 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/sqoop/install_sqoop.sh | 6 ++++-
bigtop-packages/src/common/sqoop/setenv.sh | 18 ----------------
bigtop-packages/src/common/sqoop/sqoop.default | 2 +-
bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 2 +-
bigtop.mk | 4 +-
pom.xml | 2 +-
6 files changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/bigtop-packages/src/common/sqoop/install_sqoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/install_sqoop.sh b/bigtop-packages/src/common/sqoop/install_sqoop.sh
index 1edbc74..df4f489 100755
--- a/bigtop-packages/src/common/sqoop/install_sqoop.sh
+++ b/bigtop-packages/src/common/sqoop/install_sqoop.sh
@@ -131,11 +131,15 @@ install -d -m 0755 ${PREFIX}/var/lib/sqoop
install -m 0644 ${DIST_DIR}/client/lib/*.jar ${PREFIX}/${LIB_DIR}/client-lib/
install -m 0755 ${DIST_DIR}/bin/sqoop.sh ${PREFIX}/${BIN_DIR}/
-install -m 0755 ${EXTRA_DIR}/setenv.sh ${PREFIX}/${BIN_DIR}/
install -m 0644 ${DIST_DIR}/server/conf/sqoop_bootstrap.properties ${PREFIX}/${CONF_DIR}
install -m 0644 ${EXTRA_DIR}/sqoop.properties ${PREFIX}/${CONF_DIR}
install -m 0644 ${EXTRA_DIR}/sqoop.default ${PREFIX}/etc/default/sqoop-server
+rm ${EXTRA_DIR}/sqoop.default # Otherwise debhelper will re-install this
+
+install -m 0755 ${DIST_DIR}/server/bin/setenv.sh ${PREFIX}/${CONF_DIR}/
+sed -i -e 's#-Dsqoop.config.dir=.*conf#-Dsqoop.config.dir=/etc/sqoop/conf#' ${PREFIX}/${CONF_DIR}/setenv.sh
+ln -s ${CONF_DIR}/setenv.sh ${PREFIX}/${BIN_DIR}/
# Explode the WAR
SQOOP_WEBAPPS=${PREFIX}/${LIB_DIR}/webapps
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/bigtop-packages/src/common/sqoop/setenv.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/setenv.sh b/bigtop-packages/src/common/sqoop/setenv.sh
deleted file mode 100644
index fec8ae0..0000000
--- a/bigtop-packages/src/common/sqoop/setenv.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-JAVA_OPTS=-Dsqoop.config.dir=/etc/sqoop/conf
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/bigtop-packages/src/common/sqoop/sqoop.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/sqoop.default b/bigtop-packages/src/common/sqoop/sqoop.default
index 830687e..93f3cd0 100644
--- a/bigtop-packages/src/common/sqoop/sqoop.default
+++ b/bigtop-packages/src/common/sqoop/sqoop.default
@@ -1,6 +1,6 @@
CATALINA_BASE=/usr/lib/sqoop/sqoop-server
SQOOP_USER=sqoop
-SQOOP_CONFIG=/etc/conf/sqoop
+SQOOP_CONFIG=/etc/sqoop/conf
SQOOP_LOG=/var/log/sqoop
SQOOP_TEMP=/var/run/sqoop
SQOOP_PID=/var/run/sqoop/sqoop-server-sqoop.pid
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 0e880d3..5f4447b 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -61,7 +61,6 @@ Source2: install_%{name}.sh
Source3: sqoop.sh
Source4: sqoop.properties
Source5: catalina.properties
-Source6: setenv.sh
Source7: sqoop.default
Source8: init.d.tmpl
Source9: sqoop-server.svc
@@ -173,6 +172,7 @@ fi
%{lib_sqoop}/sqoop-server
%{lib_sqoop}/webapps
%{lib_sqoop}/bin/setenv.sh
+%defattr(0755,sqoop,sqoop)
/var/lib/sqoop
%files client
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 18858b5..404a095 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -103,8 +103,8 @@ $(eval $(call PACKAGE,hcatalog,HCATALOG))
SQOOP_NAME=sqoop
SQOOP_RELNOTES_NAME=Sqoop
SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.99.1
-SQOOP_PKG_VERSION=1.99.1
+SQOOP_BASE_VERSION=1.99.2
+SQOOP_PKG_VERSION=1.99.2
SQOOP_RELEASE_VERSION=1
SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/7de5092a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0f3a632..d7470c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<hbase.version>0.94.5</hbase.version>
<pig.version>0.11.1</pig.version>
<pig-smoke.version>0.11.1</pig-smoke.version>
- <sqoop.version>1.99.1</sqoop.version>
+ <sqoop.version>1.99.2</sqoop.version>
<zookeeper.version>3.4.5</zookeeper.version>
<giraph.version>0.2-SNAPSHOT</giraph.version>
<solr.version>4.2.1</solr.version>