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:33 UTC
[54/60] incubator-trafodion git commit: Updated the dependencies
Updated the dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1ca6f608
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1ca6f608
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1ca6f608
Branch: refs/heads/master
Commit: 1ca6f60806e2d76eb7b78c4c5bbd218410d7d8ec
Parents: c4d50df
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Apr 29 15:33:44 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Apr 29 15:33:44 2016 +0000
----------------------------------------------------------------------
core/Makefile | 2 ++
core/conn/jdbcT4/Makefile | 2 +-
core/rest/pom.xml | 4 ++--
core/sql/lib_mgmt/Makefile | 4 ++--
dcs/pom.xml | 6 +++---
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ca6f608/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index e07de36..c6c3606 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -112,6 +112,7 @@ clean: sqroot
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
+ cd sql/lib_mgmt && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot eclipseclean cleantests
@@ -126,6 +127,7 @@ cleanall: sqroot eclipseclean cleantests
cd rest && $(MAKE) clean
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
+ cd sql/lib_mgmt && $(MAKE) cleanall
$(RM) -r ../${DISTRIBUTION_DIR}
package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ca6f608/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 6006abb..a53e50c 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -35,4 +35,4 @@ build_all:
clean:
-$(MAVEN) clean | grep ERROR
- $(RM) build_jdbct4.log ${MY_SQROOT}/export/lib/jdbcT4.jar
+ $(RM) build_jdbct4.log ${MY_SQROOT}/export/lib/jdbcT4*.jar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ca6f608/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index c364448..b56f8c8 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -572,8 +572,8 @@
<dependencies>
<!-- JDBCT4 dependencies -->
<dependency>
- <groupId>org.trafodion.jdbc.t4.T4Driver</groupId>
- <artifactId>t4driver</artifactId>
+ <groupId>org.trafodion.jdbc.t4</groupId>
+ <artifactId>jdbcT4</artifactId>
<version>${jdbct4.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ca6f608/core/sql/lib_mgmt/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/Makefile b/core/sql/lib_mgmt/Makefile
index 3ae8c42..98ff9b6 100644
--- a/core/sql/lib_mgmt/Makefile
+++ b/core/sql/lib_mgmt/Makefile
@@ -23,13 +23,13 @@ INSTALL_LIBDIR := ${MY_SQROOT}/export/lib
INSTALL_SCRIPTSDIR := ${MY_SQROOT}/sql/scripts
CP :=/bin/cp -f
all:
- @$(MAVEN) package
+ @$(MAVEN) package -DskipTests
mkdir -p ${INSTALL_LIBDIR}
${CP} target/lib_mgmt-*.jar ${INSTALL_LIBDIR}/lib_mgmt.jar
${CP} src/main/resources/init_libmgmt.sh ${INSTALL_SCRIPTSDIR}/
@chmod +x ${INSTALL_SCRIPTSDIR}/init_libmgmt.sh
clean:
- @rm ${INSTALL_LIBDIR}/lib_mgmt.jar
+ @rm -f ${INSTALL_LIBDIR}/lib_mgmt.jar
@rm -f ${INSTALL_SCRIPTSDIR}/init_libmgmt.sh
@$(MAVEN) clean
cleanall: clean
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1ca6f608/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index a575b3b..a1de49b 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -674,9 +674,9 @@
<dependencies>
<!-- JDBCT4 dependencies -->
<dependency>
- <groupId>org.trafodion.jdbc.t4.T4Driver</groupId>
- <artifactId>t4driver</artifactId>
- <version>${jdbct4.version}</version>
+ <groupId>org.trafodion.jdbc.t4</groupId>
+ <artifactId>jdbcT4</artifactId>
+ <version>${jdbct4.version}</version>
</dependency>
<!-- JDBCT2 dependencies -->
<dependency>