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:30 UTC
[51/60] incubator-trafodion git commit: fixed dcs/rest/udr to have
the version infor for jdbcT4 jar file
fixed dcs/rest/udr to have the version infor for jdbcT4 jar file
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5955e92b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5955e92b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5955e92b
Branch: refs/heads/master
Commit: 5955e92b21961b2805149f9f02f11ce681a5026e
Parents: 9d450e9
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Apr 22 22:47:01 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Apr 22 22:47:01 2016 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 2 +-
core/sql/regress/udr/EXPECTED002 | 2 +-
core/sql/regress/udr/TEST002 | 2 +-
dcs/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5955e92b/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index ab36f7c..c364448 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -191,7 +191,7 @@
</dependencies>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4-${TRAFODION_VER}.jar</additionalClasspathElement>
</additionalClasspathElements>
<includes>
<include>${integrationtest.include}</include>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5955e92b/core/sql/regress/udr/EXPECTED002
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/EXPECTED002 b/core/sql/regress/udr/EXPECTED002
index 0245a11..2e7677b 100644
--- a/core/sql/regress/udr/EXPECTED002
+++ b/core/sql/regress/udr/EXPECTED002
@@ -6749,7 +6749,7 @@ P SLICE_TIME VAL1_FCI VAL1_LCI VAL2_FCI
>>-- 'jdbc:t4jdbc://localhost:23400/:'
>>prepare s_traf from
+>select *
-+>from udf(jdbc('jdbcT4.jar',
++>from udf(jdbc('jdbcT4-${TRAFODION_VER}.jar',
+> 'org.trafodion.jdbc.t4.T4Driver',
+> $$QUOTE$$$$JDBC_T4_URL$$$$QUOTE$$,
+> 'any', -- no user id
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5955e92b/core/sql/regress/udr/TEST002
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/TEST002 b/core/sql/regress/udr/TEST002
index 79d8250..fd60dda 100644
--- a/core/sql/regress/udr/TEST002
+++ b/core/sql/regress/udr/TEST002
@@ -239,7 +239,7 @@ sh cp $$MY_SQROOT$$/export/lib/jdbcT2.jar $$MY_SQROOT$$/udr/external_libs;
-- 'jdbc:t4jdbc://localhost:23400/:'
prepare s_traf from
select *
-from udf(jdbc('jdbcT4.jar',
+from udf(jdbc('jdbcT4-${TRAFODION_VER}.jar',
'org.trafodion.jdbc.t4.T4Driver',
$$QUOTE$$$$JDBC_T4_URL$$$$QUOTE$$,
'any', -- no user id
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5955e92b/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index e9b6d11..a575b3b 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -325,7 +325,7 @@
</dependencies>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4-${TRAFODION_VER}.jar</additionalClasspathElement>
</additionalClasspathElements>
<includes>
<include>${integrationtest.include}</include>