You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/02 18:12:19 UTC
[40/60] incubator-trafodion git commit: Minor fixes
Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/90667eea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/90667eea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/90667eea
Branch: refs/heads/master
Commit: 90667eeab9a1dbb20982470eec320e84603f5baf
Parents: 500d207
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Tue Apr 19 15:33:06 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Tue Apr 19 15:33:06 2016 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/Makefile | 2 +-
core/sqf/sqenvcom.sh | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90667eea/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index b6c23d7..6006abb 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -28,7 +28,7 @@ all: build_all
build_all:
echo "$(MAVEN) package -DskipTests"
set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib/jdbcT4.jar
+ cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90667eea/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 5aa5f33..f15e2ff 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -163,6 +163,7 @@ export HBASE_TRX_JAR=${HBASE_TRX_ID_CDH}-${TRAFODION_VER}.jar
export DTM_COMMON_JAR=trafodion-dtm-${TRAFODION_VER}.jar
export SQL_JAR=trafodion-sql-${TRAFODION_VER}.jar
export UTIL_JAR=trafodion-utility-${TRAFODION_VER}.jar
+export JDBCT4_JAR=jdbcT4-${TRAFODION_VER}.jar
HBVER=""
if [[ "$HBASE_DISTRO" = "HDP" ]]; then
@@ -853,7 +854,7 @@ ${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
$MY_SQROOT/export/lib/${DTM_COMMON_JAR}:\
$MY_SQROOT/export/lib/${SQL_JAR}:\
$MY_SQROOT/export/lib/${UTIL_JAR}:\
-$MY_SQROOT/export/lib/jdbcT4.jar:\
+$MY_SQROOT/export/lib/${JDBCT4_JAR}:\
$MY_SQROOT/export/lib/jdbcT2.jar