You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/07/19 16:09:17 UTC

[04/13] incubator-trafodion git commit: TRAFODION-2016 support apache hbase1.1 & cdh5.5

TRAFODION-2016 support apache hbase1.1 & cdh5.5


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6d08029a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6d08029a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6d08029a

Branch: refs/heads/master
Commit: 6d08029a1cbd162b5573e3055ecfee6b45f8371a
Parents: 324a981
Author: traf <tr...@aven01.novalocal>
Authored: Thu Jun 30 09:48:59 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Thu Jun 30 09:48:59 2016 +0000

----------------------------------------------------------------------
 core/sqf/conf/install_features                  |   2 +
 core/sqf/sqenvcom.sh                            |  49 ++-
 core/sqf/sql/scripts/install_local_hadoop       |  11 +-
 core/sqf/src/seatrans/hbase-trx/Makefile        |  87 +++--
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache  | 336 -------------------
 .../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 336 +++++++++++++++++++
 .../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 336 +++++++++++++++++++
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh     | 332 ------------------
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54   | 332 ++++++++++++++++++
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55   | 332 ++++++++++++++++++
 core/sqf/src/seatrans/hbase-trx/pp.awk          |  40 ++-
 .../hbase/client/ClientScanner98.java.tmpl      |   2 +-
 .../hbase/client/PatchClientScanner.java.tmpl   |   2 +-
 .../client/TrafParallelClientScanner.java.tmpl  |   2 +-
 .../transactional/SsccRegionEndpoint.java.tmpl  |   4 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |   4 +-
 .../transactional/TrxRegionObserver.java.tmpl   |  16 +-
 .../CleanOldTransactionsChore.java.tmpl         |   6 +-
 .../transactional/KeyValueListScanner.java.tmpl |   2 +-
 .../transactional/MemoryUsageChore.java.tmpl    |   6 +-
 .../transactional/TrxTransactionState.java.tmpl |  10 +-
 install/installer/traf_apache_mods              |   6 +-
 install/installer/traf_config_check             |  45 ++-
 23 files changed, 1539 insertions(+), 759 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/conf/install_features
----------------------------------------------------------------------
diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features
index f65cdc7..9b1c85d 100644
--- a/core/sqf/conf/install_features
+++ b/core/sqf/conf/install_features
@@ -64,4 +64,6 @@
 export CDH_5_3_HDP_2_2_SUPPORT="N"
 export HDP_2_3_SUPPORT="Y"
 export CDH_5_4_SUPPORT="Y"
+export CDH_5_5_SUPPORT="Y"
 export APACHE_1_0_X_SUPPORT="Y"
+export APACHE_1_1_X_SUPPORT="Y"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 48c516f..ea1cd97 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -139,19 +139,30 @@ export MY_SQROOT=$PWD
 export SQ_HOME=$PWD
 
 # set common version to be consistent between shared lib and maven dependencies
-export HBASE_DEP_VER_CDH=1.0.0-cdh5.4.4
-export HIVE_DEP_VER_CDH=1.1.0-cdh5.4.4
+export HBASE_DEP_VER_CDH=1.0.0-cdh5.5.1
+export HIVE_DEP_VER_CDH=1.1.0-cdh5.5.1
+export HBASE_TRX_ID_CDH=hbase-trx-cdh5_5
+if [[ "$HBASE_DISTRO" = "CDH5.4" ]]; then
+   export HBASE_DEP_VER_CDH=1.0.0-cdh5.4.4
+   export HIVE_DEP_VER_CDH=1.1.0-cdh5.4.4
+   export HBASE_TRX_ID_CDH=hbase-trx-cdh5_4
+fi
+
+export HBASE_DEP_VER_APACHE=1.1.2
+export HIVE_DEP_VER_APACHE=1.1.0
+export HBVER=apache1_1_2
+if [[ "$HBASE_DISTRO" = "APACHE1.0" ]]; then
+   export HBASE_DEP_VER_APACHE=1.0.2
+   export HBVER=apache1_0_2
+fi
+export HBASE_TRX_ID_APACHE=hbase-trx-${HBVER}
+
 export HBASE_DEP_VER_HDP=1.1.2
 export HIVE_DEP_VER_HDP=1.2.1
-export HBASE_DEP_VER_APACHE=1.0.2
-export HIVE_DEP_VER_APACHE=1.1.0
-export HBASE_TRX_ID_CDH=hbase-trx-cdh5_4
-export HBASE_TRX_ID_APACHE=hbase-trx-apache1_0_2
 export HBASE_TRX_ID_HDP=hbase-trx-hdp2_3
 export THRIFT_DEP_VER=0.9.0
 export HIVE_DEP_VER=0.13.1
 export HADOOP_DEP_VER=2.6.0
-
 # staged build-time dependencies
 export HADOOP_BLD_LIB=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/lib/native
 export HADOOP_BLD_INC=${TOOLSDIR}/hadoop-${HADOOP_DEP_VER}/include
@@ -164,16 +175,15 @@ 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
     export HBASE_TRX_JAR=${HBASE_TRX_ID_HDP}-${TRAFODION_VER}.jar
     HBVER="hdp2_3"
     export DTM_COMMON_JAR=trafodion-dtm-${HBVER}-${TRAFODION_VER}.jar
     export SQL_JAR=trafodion-sql-${HBVER}-${TRAFODION_VER}.jar
 fi
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
     export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${TRAFODION_VER}.jar
-    HBVER="apache1_0_2"
     export DTM_COMMON_JAR=trafodion-dtm-${HBVER}-${TRAFODION_VER}.jar
     export SQL_JAR=trafodion-sql-${HBVER}-${TRAFODION_VER}.jar
 fi
@@ -464,6 +474,12 @@ else
   function vanilla_apache_usage {
 
   cat <<EOF
+    If you haven't set HBASE_DISTRO, please set it before source current file
+      export HBASE_DISTRO=APACHE1.0 (APACHE HBASE1.0)
+      export HBASE_DISTRO=APACHE1.1 (APACHE HBASE1.1)
+      export HBASE_DISTRO=CDH5.4    (cloudera 1.0.0-cdh5.4.4) 
+      export HBASE_DISTRO=CDH5.5    (cloudera 1.0.0-cdh5.5.1) 
+      export HBASE_DISTRO=HDP       (hortonworks 2.3)
 
     If you are ready to build Trafodion, perform one of the following options:
 
@@ -556,7 +572,6 @@ EOF
 
     # end of code for Apache Hadoop/HBase installation w/o distro
     export HBASE_TRX_JAR=${HBASE_TRX_ID_APACHE}-${TRAFODION_VER}.jar
-    HBVER="apache1_0_2"
     export DTM_COMMON_JAR=trafodion-dtm-${HBVER}-${TRAFODION_VER}.jar
     export SQL_JAR=trafodion-sql-${HBVER}-${TRAFODION_VER}.jar
   else
@@ -833,8 +848,18 @@ if [[ -n "$HADOOP_CNF_DIR" ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HADOOP_CNF_DIR"
 if [[ -n "$HBASE_CNF_DIR"  ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HBASE_CNF_DIR";  fi
 if [[ -n "$HIVE_CNF_DIR"   ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:$HIVE_CNF_DIR";   fi
 if [[ -n "$SQ_CLASSPATH"   ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:";   fi
+
+# set Trx in classpath only incase of workstation env.
+# In case of cluster, correct version of trx is already installed by
+# installer and hbase classpath already contains the correct trx jar.
+# In future, installer can put additional hints in bashrc to cleanup
+# and fine tune these adjustments for many other jars.
+if [[ -e $MY_SQROOT/sql/scripts/sw_env.sh ]]; then
+        SQ_CLASSPATH=${SQ_CLASSPATH}:${HBASE_TRXDIR}/${HBASE_TRX_JAR}
+fi
+
+
 SQ_CLASSPATH=${SQ_CLASSPATH}:\
-${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
 $MY_SQROOT/export/lib/${DTM_COMMON_JAR}:\
 $MY_SQROOT/export/lib/${SQL_JAR}:\
 $MY_SQROOT/export/lib/${UTIL_JAR}:\

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index a5c8c54..4b9e502 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -582,12 +582,15 @@ fi
 # See JIRA TRAFODION-1512 that will eliminate this check
   
 HADOOP_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
-HADOOP_TAR=hadoop-2.6.0-cdh5.4.4.tar.gz
+HADOOP_TAR=hadoop-2.6.0-cdh5.5.1.tar.gz
+if [[ "$HBASE_DISTRO" = "CDH5.4" ]]; then
+    HADOOP_TAR=hadoop-2.6.0-cdh5.4.4.tar.gz
+fi
 
 if [[ "$HBASE_DISTRO" = "HDP" ]]; then
     HADOOP_TAR=hadoop-2.7.1.2.3.2.0-2950.tar.gz
 fi
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
     HADOOP_TAR=hadoop-2.5.2.tar.gz
 fi
 
@@ -603,7 +606,7 @@ MYSQL_JDBC_TAR=mysql-connector-java-5.1.23.tar.gz
 
 HIVE_MIRROR_URL=http://archive.cloudera.com/cdh5/cdh/5
 HIVE_PREFIX=hive-${HIVE_DEP_VER_CDH}
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
     HIVE_MIRROR_URL=https://archive.apache.org/dist/hive/hive-${HIVE_DEP_VER_APACHE}
     HIVE_PREFIX=apache-hive-${HIVE_DEP_VER_APACHE}-bin
 fi
@@ -617,7 +620,7 @@ HBASE_TAR=hbase-${HBASE_DEP_VER_CDH}.tar.gz
 if [[ "$HBASE_DISTRO" = "HDP" ]]; then
     HBASE_TAR=hbase-${HBASE_DEP_VER_HDP}.tar.gz
 fi
-if [[ "$HBASE_DISTRO" = "APACHE" ]]; then
+if [[ "$HBASE_DISTRO" =~ "APACHE" ]]; then
     HBASE_MIRROR_URL=https://archive.apache.org/dist/hbase/hbase-${HBASE_DEP_VER_APACHE}
     HBASE_TAR=hbase-${HBASE_DEP_VER_APACHE}-bin.tar.gz
 fi

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index 65a4c6c..b6eb9b0 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -21,11 +21,13 @@
 
 # This Makefile is just a thin shell to Maven, which is used to do the real build
 
-BLD_HBASE_APACHE_TRX_JARNAME     =hbase-trx-apache1_0_2-$(TRAFODION_VER).jar
-BLD_HBASE_CDH_TRX_JARNAME        =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
-BLD_HBASE_MAPR_TRX_JARNAME       =hbase-trx-mapr4_0-$(TRAFODION_VER).jar
-BLD_HBASE_HDP_TRX_JARNAME        =hbase-trx-hdp2_3-$(TRAFODION_VER).jar
-BLD_HBASE_SSCC_TRX_JARNAME       =hbase-trx-sscc-$(TRAFODION_VER).jar
+BLD_HBASE_APACHE10_TRX_JARNAME     =hbase-trx-apache1_0_2-$(TRAFODION_VER).jar
+BLD_HBASE_APACHE11_TRX_JARNAME     =hbase-trx-apache1_1_2-$(TRAFODION_VER).jar
+BLD_HBASE_CDH54_TRX_JARNAME        =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
+BLD_HBASE_CDH55_TRX_JARNAME        =hbase-trx-cdh5_5-$-$(TRAFODION_VER).jar
+BLD_HBASE_MAPR_TRX_JARNAME         =hbase-trx-mapr4_0-$(TRAFODION_VER).jar
+BLD_HBASE_HDP_TRX_JARNAME          =hbase-trx-hdp2_3-$(TRAFODION_VER).jar
+BLD_HBASE_SSCC_TRX_JARNAME         =hbase-trx-sscc-$(TRAFODION_VER).jar
 
 VFILE			    =hbase-trx.jar.versions
 GENVERS			    =./genvers
@@ -36,13 +38,22 @@ REINSTATE_ORIG   	    =./reinstate_orig
 
 all: build_all
 
-jdk_1_7_cdh: build_chk_cdh
+jdk_1_7_cdh54: build_chk_cdh54
 	$(REINSTATE_ORIG)
-	$(UNCOMMENT_STRING) CDH1.0
-	$(MAKE) build_chk_cdh
-	set -o pipefail && $(MAVEN) -f pom.xml.cdh package install -DskipTests | tee -a build_trx.log
+	$(UNCOMMENT_STRING) CDH5.4
+	echo "$(MAVEN) package -DskipTests"
+	echo "### For full Maven output, see file build_trx.log"
+	set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
+	mkdir -p $(MY_SQROOT)/export/lib
+	cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	$(RM) $(VFILE)
+
+jdk_1_7_cdh55: build_chk_cdh55
+	$(REINSTATE_ORIG)
+	$(UNCOMMENT_STRING) CDH5.5
+	set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
 	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_CDH_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(MY_SQROOT)/export/lib
 	$(RM) $(VFILE)
 
 jdk_1_7_mapr: build_chk_mapr
@@ -54,35 +65,49 @@ jdk_1_7_mapr: build_chk_mapr
 jdk_1_7_hdp: build_chk_hdp
 	$(REINSTATE_ORIG)
 	$(UNCOMMENT_STRING) HDP2.3 
-	$(MAKE) build_chk_hdp
 	set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
 	mkdir -p $(MY_SQROOT)/export/lib
 	cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(MY_SQROOT)/export/lib
 	$(RM) $(VFILE)
 
-jdk_1_7_apache: build_chk_apache
+jdk_1_7_apache10: build_chk_apache10
 	$(REINSTATE_ORIG)
-	$(UNCOMMENT_STRING) APACHE
-	$(MAKE) build_chk_apache
-	echo "$(MAVEN) package -DskipTests"
-	echo "### For full Maven output, see file build_trx.log"
-	set -o pipefail && $(MAVEN) -f pom.xml.apache package -DskipTests | tee build_trx.log
+	$(UNCOMMENT_STRING) HBASE1.0
+	set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
 	mkdir -p $(MY_SQROOT)/export/lib
-	cp -pf target/$(BLD_HBASE_APACHE_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(MY_SQROOT)/export/lib
 	$(RM) $(VFILE)
+
+jdk_1_7_apache11: build_chk_apache11
 	$(REINSTATE_ORIG)
+	$(UNCOMMENT_STRING) HBASE1.1
+	set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
+	mkdir -p $(MY_SQROOT)/export/lib
+	cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(MY_SQROOT)/export/lib
+	$(RM) $(VFILE)
+
+build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11
+#jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11
 
-build_all: jdk_1_7_apache jdk_1_7_hdp jdk_1_7_cdh
+build_chk_apache10:
+	$(GENVERS) > $(VFILE)
+	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
+
+build_chk_apache11:
+	$(GENVERS) > $(VFILE)
+	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
+	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
 
-build_chk_apache:
+build_chk_cdh54:
 	$(GENVERS) > $(VFILE)
-	@if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE_TRX_JARNAME); fi
+	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
+	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
 
-build_chk_cdh:
+build_chk_cdh55:
 	$(GENVERS) > $(VFILE)
-	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH_TRX_JARNAME); fi
-	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH_TRX_JARNAME); fi
+	@if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
+	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
 
 build_chk_mapr:
 	$(GENVERS) > $(VFILE)
@@ -95,13 +120,17 @@ build_chk_hdp:
 	@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
 
 clean:
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE_TRX_JARNAME)
-	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH_TRX_JARNAME)
+	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
+	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
+	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
+	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
 	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
 	$(RM) $(MY_SQROOT)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
 	$(REINSTATE_ORIG)
-	-$(MAVEN) -f pom.xml.apache clean | grep ERROR
-	-$(MAVEN) -f pom.xml.cdh clean | grep ERROR
+	-$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
+	-$(MAVEN) -f pom.xml.apache11 clean | grep ERROR
+	-$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR
+	-$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR
 	-$(MAVEN) -f pom.xml.mapr clean | grep ERROR
 	-$(MAVEN) -f pom.xml.hdp clean | grep ERROR
 	$(RM) build_trx.log

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
deleted file mode 100755
index 250b7ae..0000000
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!--
-/**
- * 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.
- */
--->
-  <repositories>
-    <repository>
-      <id>Apache</id>
-      <url>http://mvnrepository.com/artifact/</url>
-      <layout>default</layout>
-    </repository>
-  </repositories> 
-
-  <properties>
-    <hadoop.version>2.4.0</hadoop.version>
-    <hbase.version>${env.HBASE_DEP_VER_APACHE}</hbase.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <protobuf.version>2.5.0</protobuf.version>                                                                                              
-    <protocVersion>2.5.0</protocVersion>                                                                                                    
-    <java.version>1.7</java.version>
-    <trx-suffix>apache</trx-suffix>
-  </properties>
-
-  <groupId>org.apache</groupId>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>hbase-trx-apache1_0_2</artifactId>
-  <version>${env.TRAFODION_VER}</version>
-  <name>HBase - Trx</name>
-  <description>Trx of HBase usage</description>
-
-  <build>
-    <defaultGoal>package</defaultGoal>
-      <!-- allow for different build targets with separate classes directories and
-           output jars, used for Java 6 compile for now -->
-      <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
-      <finalName>${project.artifactId}-${project.version}</finalName>
-      <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
-           These plugins inherit their options from the <reporting> section below. These settings
-           can be overwritten here. -->
-    <plugins>
-      <plugin>
-        <!--Make it so assembly:single does nothing in here-->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-        <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.5</version>
-            <configuration>
-                <!-- Have to set the groups here because we only do
-    split tests in this package, so groups on live in this module -->
-                <groups>${surefire.firstPartGroups}</groups>
-            </configuration>
-        </plugin>
-        <!-- Make a jar and put the sources in the jar -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <configuration>
-            <archive>
-               <manifestFile>hbase-trx.jar.versions</manifestFile>
-            </archive>
-          </configuration>
-        </plugin>
-    </plugins>
-  </build>
-
-
-
-  <dependencies>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-common</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-protocol</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-client</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-thrift</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-annotations</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-testing-util</artifactId>
-        <scope>test</scope>
-      <version>${hbase.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.9.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <version>3.4.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-    </dependency>
- </dependencies>
- <profiles>
-     <!-- Skip the tests in this module -->
-     <profile>
-         <id>skipTrxTests</id>
-         <activation>
-             <property>
-                 <name>skipTrxTests</name>
-             </property>
-         </activation>
-         <properties>
-             <surefire.skipFirstPart>true</surefire.skipFirstPart>
-             <surefire.skipSecondPart>true</surefire.skipSecondPart>
-         </properties>
-     </profile>
-
-     <!-- Profiles for building against different hadoop versions -->
-     <!-- There are a lot of common dependencies used here, should investigate
-if we can combine these profiles somehow -->
-     <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
-  activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
-  the same time. -->
-     <profile>
-         <id>hadoop-1.1</id>
-         <activation>
-             <property>
-            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>hadoop.profile</name><value>1.1</value>
-             </property>
-         </activation>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-core</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-test</artifactId>
-             </dependency>
-         </dependencies>
-     </profile>
-     <!--
-       profile for building against Hadoop 2.0.0-alpha. Activate using:
-        mvn -Dhadoop.profile=2.0
-     -->
-     <profile>
-         <id>hadoop-2.0</id>
-         <activation>
-             <property>
-            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>!hadoop.profile</name>
-             </property>
-         </activation>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-mapreduce-client-core</artifactId>
-                 <version>${hadoop.version}</version>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-common</artifactId>
-                 <version>${hadoop.version}</version>
-             </dependency>
-         </dependencies>
-         <build>
-             <plugins>
-                 <plugin>
-                     <artifactId>maven-dependency-plugin</artifactId>
-                     <executions>
-                         <execution>
-                             <id>create-mrapp-generated-classpath</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>build-classpath</goal>
-                             </goals>
-                             <configuration>
-                                 <!-- needed to run the unit test for DS to generate
-                                 the required classpath that is required in the env
-                                 of the launch container in the mini mr/yarn cluster
-                                 -->
-                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
-                             </configuration>
-                         </execution>
-                     </executions>
-                 </plugin>
-             </plugins>
-         </build>
-     </profile>
-     <!--
-       profile for building against Hadoop 3.0.x. Activate using:
-        mvn -Dhadoop.profile=3.0
-     -->
-     <profile>
-         <id>hadoop-3.0</id>
-         <activation>
-             <property>
-                 <name>hadoop.profile</name>
-                 <value>3.0</value>
-             </property>
-         </activation>
-         <properties>
-             <hadoop.version>3.0-SNAPSHOT</hadoop.version>
-         </properties>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-common</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-annotations</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-minicluster</artifactId>
-             </dependency>
-         </dependencies>
-         <build>
-             <plugins>
-                 <plugin>
-                     <artifactId>maven-dependency-plugin</artifactId>
-                     <executions>
-                         <execution>
-                             <id>create-mrapp-generated-classpath</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>build-classpath</goal>
-                             </goals>
-                             <configuration>
-                                 <!-- needed to run the unit test for DS to generate
-                                 the required classpath that is required in the env
-                                 of the launch container in the mini mr/yarn cluster
-                                 -->
-                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
-                             </configuration>
-                         </execution>
-                     </executions>
-                 </plugin>
-             </plugins>
-         </build>
-     </profile>
-    <profile>
-      <id>compile-protobuf</id>
-      <activation>
-        <property>
-          <name>compile-protobuf</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-maven-plugins</artifactId>
-            <executions>
-              <execution>
-                <id>compile-protoc</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>protoc</goal>
-                </goals>
-                <configuration>
-                  <protobuf.version>2.5.0</protobuf.version>
-                  <protocVersion>2.5.0</protocVersion>
-                  <imports>
-                    <param>${basedir}/src/main/protobuf</param>
-                    <param>${basedir}/hbase-protocol/src/main/protobuf</param>
-                  </imports>
-                  <source>
-                    <directory>${basedir}/src/main/protobuf</directory>
-                    <includes>
-                      <include>TrxRegion.proto</include>
-                      <include>SsccRegion.proto</include>
-                    </includes>
-                  </source>
-                  <output>${basedir}/src/main/java/</output>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
new file mode 100755
index 0000000..fc55593
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache10
@@ -0,0 +1,336 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <!--
+/**
+ * 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.
+ */
+-->
+  <repositories>
+    <repository>
+      <id>Apache</id>
+      <url>http://mvnrepository.com/artifact/</url>
+      <layout>default</layout>
+    </repository>
+  </repositories> 
+
+  <properties>
+    <hadoop.version>2.4.0</hadoop.version>
+    <hbase.version>1.0.2</hbase.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <protobuf.version>2.5.0</protobuf.version>                                                                                              
+    <protocVersion>2.5.0</protocVersion>                                                                                                    
+    <java.version>1.7</java.version>
+    <trx-suffix>apache</trx-suffix>
+  </properties>
+
+  <groupId>org.apache</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>hbase-trx-apache1_0_2</artifactId>
+  <version>${env.TRAFODION_VER}</version>
+  <name>HBase - Trx</name>
+  <description>Trx of HBase usage</description>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+      <!-- allow for different build targets with separate classes directories and
+           output jars, used for Java 6 compile for now -->
+      <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+      <finalName>${project.artifactId}-${project.version}</finalName>
+      <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+           These plugins inherit their options from the <reporting> section below. These settings
+           can be overwritten here. -->
+    <plugins>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+        <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.5</version>
+            <configuration>
+                <!-- Have to set the groups here because we only do
+    split tests in this package, so groups on live in this module -->
+                <groups>${surefire.firstPartGroups}</groups>
+            </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+               <manifestFile>hbase-trx.jar.versions</manifestFile>
+            </archive>
+          </configuration>
+        </plugin>
+    </plugins>
+  </build>
+
+
+
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-common</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-protocol</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-client</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-thrift</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-annotations</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-testing-util</artifactId>
+        <scope>test</scope>
+      <version>${hbase.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.5.0</version>
+    </dependency>
+ </dependencies>
+ <profiles>
+     <!-- Skip the tests in this module -->
+     <profile>
+         <id>skipTrxTests</id>
+         <activation>
+             <property>
+                 <name>skipTrxTests</name>
+             </property>
+         </activation>
+         <properties>
+             <surefire.skipFirstPart>true</surefire.skipFirstPart>
+             <surefire.skipSecondPart>true</surefire.skipSecondPart>
+         </properties>
+     </profile>
+
+     <!-- Profiles for building against different hadoop versions -->
+     <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+     <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+  activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+  the same time. -->
+     <profile>
+         <id>hadoop-1.1</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-core</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-test</artifactId>
+             </dependency>
+         </dependencies>
+     </profile>
+     <!--
+       profile for building against Hadoop 2.0.0-alpha. Activate using:
+        mvn -Dhadoop.profile=2.0
+     -->
+     <profile>
+         <id>hadoop-2.0</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h2--><name>!hadoop.profile</name>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-mapreduce-client-core</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+     <!--
+       profile for building against Hadoop 3.0.x. Activate using:
+        mvn -Dhadoop.profile=3.0
+     -->
+     <profile>
+         <id>hadoop-3.0</id>
+         <activation>
+             <property>
+                 <name>hadoop.profile</name>
+                 <value>3.0</value>
+             </property>
+         </activation>
+         <properties>
+             <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+         </properties>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-annotations</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-minicluster</artifactId>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+    <profile>
+      <id>compile-protobuf</id>
+      <activation>
+        <property>
+          <name>compile-protobuf</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-maven-plugins</artifactId>
+            <executions>
+              <execution>
+                <id>compile-protoc</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>protoc</goal>
+                </goals>
+                <configuration>
+                  <protobuf.version>2.5.0</protobuf.version>
+                  <protocVersion>2.5.0</protocVersion>
+                  <imports>
+                    <param>${basedir}/src/main/protobuf</param>
+                    <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+                  </imports>
+                  <source>
+                    <directory>${basedir}/src/main/protobuf</directory>
+                    <includes>
+                      <include>TrxRegion.proto</include>
+                      <include>SsccRegion.proto</include>
+                    </includes>
+                  </source>
+                  <output>${basedir}/src/main/java/</output>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11 b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
new file mode 100755
index 0000000..de74565
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache11
@@ -0,0 +1,336 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <!--
+/**
+ * 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.
+ */
+-->
+  <repositories>
+    <repository>
+      <id>Apache</id>
+      <url>http://mvnrepository.com/artifact/</url>
+      <layout>default</layout>
+    </repository>
+  </repositories> 
+
+  <properties>
+    <hadoop.version>2.4.0</hadoop.version>
+    <hbase.version>1.1.2</hbase.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <protobuf.version>2.5.0</protobuf.version>                                                                                              
+    <protocVersion>2.5.0</protocVersion>                                                                                                    
+    <java.version>1.7</java.version>
+    <trx-suffix>apache</trx-suffix>
+  </properties>
+
+  <groupId>org.apache</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>hbase-trx-apache1_1_2</artifactId>
+  <version>${env.TRAFODION_VER}</version>
+  <name>HBase - Trx</name>
+  <description>Trx of HBase usage</description>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+      <!-- allow for different build targets with separate classes directories and
+           output jars, used for Java 6 compile for now -->
+      <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+      <finalName>${project.artifactId}-${project.version}</finalName>
+      <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+           These plugins inherit their options from the <reporting> section below. These settings
+           can be overwritten here. -->
+    <plugins>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+        <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.5</version>
+            <configuration>
+                <!-- Have to set the groups here because we only do
+    split tests in this package, so groups on live in this module -->
+                <groups>${surefire.firstPartGroups}</groups>
+            </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+               <manifestFile>hbase-trx.jar.versions</manifestFile>
+            </archive>
+          </configuration>
+        </plugin>
+    </plugins>
+  </build>
+
+
+
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-common</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-protocol</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-client</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-thrift</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-annotations</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-testing-util</artifactId>
+        <scope>test</scope>
+      <version>${hbase.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.5.0</version>
+    </dependency>
+ </dependencies>
+ <profiles>
+     <!-- Skip the tests in this module -->
+     <profile>
+         <id>skipTrxTests</id>
+         <activation>
+             <property>
+                 <name>skipTrxTests</name>
+             </property>
+         </activation>
+         <properties>
+             <surefire.skipFirstPart>true</surefire.skipFirstPart>
+             <surefire.skipSecondPart>true</surefire.skipSecondPart>
+         </properties>
+     </profile>
+
+     <!-- Profiles for building against different hadoop versions -->
+     <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+     <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+  activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+  the same time. -->
+     <profile>
+         <id>hadoop-1.1</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-core</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-test</artifactId>
+             </dependency>
+         </dependencies>
+     </profile>
+     <!--
+       profile for building against Hadoop 2.0.0-alpha. Activate using:
+        mvn -Dhadoop.profile=2.0
+     -->
+     <profile>
+         <id>hadoop-2.0</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h2--><name>!hadoop.profile</name>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-mapreduce-client-core</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+     <!--
+       profile for building against Hadoop 3.0.x. Activate using:
+        mvn -Dhadoop.profile=3.0
+     -->
+     <profile>
+         <id>hadoop-3.0</id>
+         <activation>
+             <property>
+                 <name>hadoop.profile</name>
+                 <value>3.0</value>
+             </property>
+         </activation>
+         <properties>
+             <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+         </properties>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-annotations</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-minicluster</artifactId>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+    <profile>
+      <id>compile-protobuf</id>
+      <activation>
+        <property>
+          <name>compile-protobuf</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-maven-plugins</artifactId>
+            <executions>
+              <execution>
+                <id>compile-protoc</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>protoc</goal>
+                </goals>
+                <configuration>
+                  <protobuf.version>2.5.0</protobuf.version>
+                  <protocVersion>2.5.0</protocVersion>
+                  <imports>
+                    <param>${basedir}/src/main/protobuf</param>
+                    <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+                  </imports>
+                  <source>
+                    <directory>${basedir}/src/main/protobuf</directory>
+                    <includes>
+                      <include>TrxRegion.proto</include>
+                      <include>SsccRegion.proto</include>
+                    </includes>
+                  </source>
+                  <output>${basedir}/src/main/java/</output>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
deleted file mode 100755
index 57f458b..0000000
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!--
-/**
- * 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.
- */
--->
-  <repositories>
-    <repository>
-      <id>cloudera</id>
-      <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-    </repository>
-  </repositories>
-
-  <properties>
-    <hadoop.version>2.6.0</hadoop.version>
-    <hbase.version>${env.HBASE_DEP_VER_CDH}</hbase.version>
-    <protobuf.version>2.5.0</protobuf.version>
-    <protocVersion>2.5.0</protocVersion>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.7</java.version>
-    <trx-suffix>cdh5_4</trx-suffix>
-  </properties>
-
-
-  <groupId>org.apache</groupId>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>hbase-trx-cdh5_4</artifactId>
-  <version>${env.TRAFODION_VER}</version>
-  <name>HBase - Trx</name>
-  <description>Trx of HBase usage</description>
-
-
-  <build>
-    <defaultGoal>package</defaultGoal>
-      <!-- allow for different build targets with separate classes directories and
-           output jars, used for Java 6 compile for now -->
-      <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
-      <finalName>${project.artifactId}-${project.version}</finalName>
-      <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
-           These plugins inherit their options from the <reporting> section below. These settings
-           can be overwritten here. -->
-    <plugins>
-      <plugin>
-        <!--Make it so assembly:single does nothing in here-->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <configuration>
-          <skipAssembly>true</skipAssembly>
-        </configuration>
-      </plugin>
-        <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.5</version>
-            <configuration>
-                <!-- Have to set the groups here because we only do
-    split tests in this package, so groups on live in this module -->
-                <groups>${surefire.firstPartGroups}</groups>
-            </configuration>
-        </plugin>
-        <!-- Make a jar and put the sources in the jar -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <configuration>
-            <archive>
-               <manifestFile>hbase-trx.jar.versions</manifestFile>
-            </archive>
-          </configuration>
-        </plugin>
-    </plugins>
-  </build>
-
-
-
-  <dependencies>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-common</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-protocol</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-client</artifactId>
-        <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-thrift</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-testing-util</artifactId>
-        <scope>test</scope>
-      <version>${hbase.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.9.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <version>3.4.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.5.0</version>
-    </dependency>
- </dependencies>
- <profiles>
-     <!-- Skip the tests in this module -->
-     <profile>
-         <id>skipTrxTests</id>
-         <activation>
-             <property>
-                 <name>skipTrxTests</name>
-             </property>
-         </activation>
-         <properties>
-             <surefire.skipFirstPart>true</surefire.skipFirstPart>
-             <surefire.skipSecondPart>true</surefire.skipSecondPart>
-         </properties>
-     </profile>
-
-     <!-- Profiles for building against different hadoop versions -->
-     <!-- There are a lot of common dependencies used here, should investigate
-if we can combine these profiles somehow -->
-     <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
-  activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
-  the same time. -->
-     <profile>
-         <id>hadoop-1.1</id>
-         <activation>
-             <property>
-            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h1--><name>hadoop.profile</name><value>1.1</value>
-             </property>
-         </activation>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-core</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-test</artifactId>
-             </dependency>
-         </dependencies>
-     </profile>
-     <!--
-       profile for building against Hadoop 2.0.0-alpha. Activate using:
-        mvn -Dhadoop.profile=2.0
-     -->
-     <profile>
-         <id>hadoop-2.0</id>
-         <activation>
-             <property>
-            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
-            <!--h2--><name>!hadoop.profile</name>
-             </property>
-         </activation>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-mapreduce-client-core</artifactId>
-                 <version>${hadoop.version}</version>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-common</artifactId>
-                 <version>${hadoop.version}</version>
-             </dependency>
-         </dependencies>
-         <build>
-             <plugins>
-                 <plugin>
-                     <artifactId>maven-dependency-plugin</artifactId>
-                     <executions>
-                         <execution>
-                             <id>create-mrapp-generated-classpath</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>build-classpath</goal>
-                             </goals>
-                             <configuration>
-                                 <!-- needed to run the unit test for DS to generate
-                                 the required classpath that is required in the env
-                                 of the launch container in the mini mr/yarn cluster
-                                 -->
-                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
-                             </configuration>
-                         </execution>
-                     </executions>
-                 </plugin>
-             </plugins>
-         </build>
-     </profile>
-     <!--
-       profile for building against Hadoop 3.0.x. Activate using:
-        mvn -Dhadoop.profile=3.0
-     -->
-     <profile>
-         <id>hadoop-3.0</id>
-         <activation>
-             <property>
-                 <name>hadoop.profile</name>
-                 <value>3.0</value>
-             </property>
-         </activation>
-         <properties>
-             <hadoop.version>3.0-SNAPSHOT</hadoop.version>
-         </properties>
-         <dependencies>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-common</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-annotations</artifactId>
-             </dependency>
-             <dependency>
-                 <groupId>org.apache.hadoop</groupId>
-                 <artifactId>hadoop-minicluster</artifactId>
-             </dependency>
-         </dependencies>
-         <build>
-             <plugins>
-                 <plugin>
-                     <artifactId>maven-dependency-plugin</artifactId>
-                     <executions>
-                         <execution>
-                             <id>create-mrapp-generated-classpath</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>build-classpath</goal>
-                             </goals>
-                             <configuration>
-                                 <!-- needed to run the unit test for DS to generate
-                                 the required classpath that is required in the env
-                                 of the launch container in the mini mr/yarn cluster
-                                 -->
-                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
-                             </configuration>
-                         </execution>
-                     </executions>
-                 </plugin>
-             </plugins>
-         </build>
-     </profile>
-    <profile>
-      <id>compile-protobuf</id>
-      <activation>
-        <property>
-          <name>compile-protobuf</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-maven-plugins</artifactId>
-            <executions>
-              <execution>
-                <id>compile-protoc</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>protoc</goal>
-                </goals>
-                <configuration>
-                  <protobuf.version>2.5.0</protobuf.version>
-                  <protocVersion>2.5.0</protocVersion>
-                  <imports>
-                    <param>${basedir}/src/main/protobuf</param>
-                    <param>${basedir}/hbase-protocol/src/main/protobuf</param>
-                  </imports>
-                  <source>
-                    <directory>${basedir}/src/main/protobuf</directory>
-                    <includes>
-                      <include>TrxRegion.proto</include>
-                      <include>SsccRegion.proto</include>
-                    </includes>
-                  </source>
-                  <output>${basedir}/src/main/java/</output>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6d08029a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
new file mode 100755
index 0000000..5b453de
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54
@@ -0,0 +1,332 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <!--
+/**
+ * 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.
+ */
+-->
+  <repositories>
+    <repository>
+      <id>cloudera</id>
+      <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+    <hadoop.version>2.6.0</hadoop.version>
+    <hbase.version>1.0.0-cdh5.4.4</hbase.version>
+    <protobuf.version>2.5.0</protobuf.version>
+    <protocVersion>2.5.0</protocVersion>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.7</java.version>
+    <trx-suffix>cdh5_4</trx-suffix>
+  </properties>
+
+
+  <groupId>org.apache</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>hbase-trx-cdh5_4</artifactId>
+  <version>${env.TRAFODION_VER}</version>
+  <name>HBase - Trx</name>
+  <description>Trx of HBase usage</description>
+
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+      <!-- allow for different build targets with separate classes directories and
+           output jars, used for Java 6 compile for now -->
+      <outputDirectory>${project.build.directory}/classes_${trx-suffix}</outputDirectory>
+      <finalName>${project.artifactId}-${project.version}</finalName>
+      <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
+           These plugins inherit their options from the <reporting> section below. These settings
+           can be overwritten here. -->
+    <plugins>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+        <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.5</version>
+            <configuration>
+                <!-- Have to set the groups here because we only do
+    split tests in this package, so groups on live in this module -->
+                <groups>${surefire.firstPartGroups}</groups>
+            </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+               <manifestFile>hbase-trx.jar.versions</manifestFile>
+            </archive>
+          </configuration>
+        </plugin>
+    </plugins>
+  </build>
+
+
+
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-common</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-protocol</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-client</artifactId>
+        <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-server</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-thrift</artifactId>
+      <version>${hbase.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-testing-util</artifactId>
+        <scope>test</scope>
+      <version>${hbase.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.5.0</version>
+    </dependency>
+ </dependencies>
+ <profiles>
+     <!-- Skip the tests in this module -->
+     <profile>
+         <id>skipTrxTests</id>
+         <activation>
+             <property>
+                 <name>skipTrxTests</name>
+             </property>
+         </activation>
+         <properties>
+             <surefire.skipFirstPart>true</surefire.skipFirstPart>
+             <surefire.skipSecondPart>true</surefire.skipSecondPart>
+         </properties>
+     </profile>
+
+     <!-- Profiles for building against different hadoop versions -->
+     <!-- There are a lot of common dependencies used here, should investigate
+if we can combine these profiles somehow -->
+     <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same
+  activation property as the parent Hadoop 1.1.x profile to make sure it gets run at
+  the same time. -->
+     <profile>
+         <id>hadoop-1.1</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h1--><name>hadoop.profile</name><value>1.1</value>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-core</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-test</artifactId>
+             </dependency>
+         </dependencies>
+     </profile>
+     <!--
+       profile for building against Hadoop 2.0.0-alpha. Activate using:
+        mvn -Dhadoop.profile=2.0
+     -->
+     <profile>
+         <id>hadoop-2.0</id>
+         <activation>
+             <property>
+            <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
+            <!--h2--><name>!hadoop.profile</name>
+             </property>
+         </activation>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-mapreduce-client-core</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+                 <version>${hadoop.version}</version>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+     <!--
+       profile for building against Hadoop 3.0.x. Activate using:
+        mvn -Dhadoop.profile=3.0
+     -->
+     <profile>
+         <id>hadoop-3.0</id>
+         <activation>
+             <property>
+                 <name>hadoop.profile</name>
+                 <value>3.0</value>
+             </property>
+         </activation>
+         <properties>
+             <hadoop.version>3.0-SNAPSHOT</hadoop.version>
+         </properties>
+         <dependencies>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-common</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-annotations</artifactId>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.hadoop</groupId>
+                 <artifactId>hadoop-minicluster</artifactId>
+             </dependency>
+         </dependencies>
+         <build>
+             <plugins>
+                 <plugin>
+                     <artifactId>maven-dependency-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>create-mrapp-generated-classpath</id>
+                             <phase>generate-test-resources</phase>
+                             <goals>
+                                 <goal>build-classpath</goal>
+                             </goals>
+                             <configuration>
+                                 <!-- needed to run the unit test for DS to generate
+                                 the required classpath that is required in the env
+                                 of the launch container in the mini mr/yarn cluster
+                                 -->
+                                 <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+     </profile>
+    <profile>
+      <id>compile-protobuf</id>
+      <activation>
+        <property>
+          <name>compile-protobuf</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-maven-plugins</artifactId>
+            <executions>
+              <execution>
+                <id>compile-protoc</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>protoc</goal>
+                </goals>
+                <configuration>
+                  <protobuf.version>2.5.0</protobuf.version>
+                  <protocVersion>2.5.0</protocVersion>
+                  <imports>
+                    <param>${basedir}/src/main/protobuf</param>
+                    <param>${basedir}/hbase-protocol/src/main/protobuf</param>
+                  </imports>
+                  <source>
+                    <directory>${basedir}/src/main/protobuf</directory>
+                    <includes>
+                      <include>TrxRegion.proto</include>
+                      <include>SsccRegion.proto</include>
+                    </includes>
+                  </source>
+                  <output>${basedir}/src/main/java/</output>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>