trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [02/15] incubator-trafodion git commit: Updated jar files to display the database edition so 'sqvers -u' output is displayed correctly
Date Fri, 27 May 2016 16:40:57 GMT
Updated jar files to display the database edition so 'sqvers -u'
output is displayed correctly


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

Branch: refs/heads/master
Commit: 4ac9c9a84be1caaeaecf632ab4cdc3de7c0ab310
Parents: 8ac0b9f
Author: Anuradha Hegde <hegdean@edev05.esgyn.local>
Authored: Tue May 17 18:23:29 2016 +0000
Committer: Anuradha Hegde <hegdean@edev05.esgyn.local>
Committed: Tue May 17 18:23:29 2016 +0000

----------------------------------------------------------------------
 core/conn/jdbcT4/pom.xml       |  7 +++----
 core/conn/jdbc_type2/build.xml | 11 ++++++++++-
 core/sql/lib_mgmt/pom.xml      |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 8e19b9f..bada198 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -29,7 +29,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.trafodion.jdbc.t4</groupId>
   <artifactId>jdbcT4</artifactId>
-  <version>${env.TRAFODION_VER}</version> 
+  <version>${TRAFODION_VER}</version> 
   <name>Trafodion JDBC Type4 Driver</name>
   <url>http://wiki.trafodion.org</url>
 
@@ -107,10 +107,9 @@
           <classpathPrefix>dependency-jars/</classpathPrefix>
 	</manifest>
         <manifestEntries>
-           <!-- <Implementation-Version-1>${TRAFODION_VER_PROD}</Implementation-Version-1>
-->
             <Implementation-Version-1>Version ${project.version}</Implementation-Version-1>

-            <Implementation-Version-2>Release ${project.version}</Implementation-Version-2>
-            <Implementation-Version-3>Build release</Implementation-Version-3>
+            <Implementation-Version-2>${TRAFODION_VER_PROD} Release ${project.version}</Implementation-Version-2>
+            <Implementation-Version-3>Build release </Implementation-Version-3>
             <Implementation-Version-4>[${user.name}]</Implementation-Version-4>
             <Implementation-Version-5>branch ${mvngit.commit.abbrev}-${mvngit.branch}</Implementation-Version-5>
             <Implementation-Version-6>date ${maven.build.timestamp}</Implementation-Version-6>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/conn/jdbc_type2/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/build.xml b/core/conn/jdbc_type2/build.xml
index 54d2e61..cc72734 100644
--- a/core/conn/jdbc_type2/build.xml
+++ b/core/conn/jdbc_type2/build.xml
@@ -41,6 +41,15 @@
        <format property="now.timestamp" pattern="yyyy_MM_dd" locale="en" />
     </tstamp>
 
+    <property environment="my_env"/>
+
+    <target name="ProductVersion">
+       <echo>
+         ${my_env.TRAFODION_VER_PROD}
+         ${my_env.PRODUCT_COPYRIGHT_HEADER}
+       </echo>
+    </target>
+
     <target name="dist" depends="native">
        <mkdir dir="dist"/>
        <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
@@ -52,7 +61,7 @@
               <attribute name="Main-Class" value="JdbcT2"/>
               <attribute name="VPROC" value="${vproc.str}"/>
 	      <attribute name="Implementation-Version-1" value="Version 1.0.0"/>
-              <attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
+              <attribute name="Implementation-Version-2" value="${my_env.TRAFODION_VER_PROD}
${Implementation-Version-2}"/>
               <attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
               <attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>
               <attribute name="Implementation-Version-5" value="${Implementation-Version-5}"/>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ac9c9a8/core/sql/lib_mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/pom.xml b/core/sql/lib_mgmt/pom.xml
index ae3c7c1..aafb2e1 100644
--- a/core/sql/lib_mgmt/pom.xml
+++ b/core/sql/lib_mgmt/pom.xml
@@ -64,7 +64,7 @@
 <echo file="${manifest.file}" append="true">${line.separator}Main-Class: org.trafodion.libmgmt.Vproc</echo>
 <echo file="${manifest.file}" append="true">${line.separator}Vproc: Traf_JDBC_Type4_Build_${rev_head}</echo>
 <echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-1:
Version 1.0.0</echo>
-<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-2:
${Implementation-Version-2}</echo>
+<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-2:
${TRAFODION_VER_PROD} ${Implementation-Version-2}</echo>
 <echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-3:
${Implementation-Version-3}</echo>
 <echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-4:
${Implementation-Version-4}</echo>
 <echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-5:
${Implementation-Version-5}</echo>


Mime
View raw message