You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by hz...@apache.org on 2016/03/01 23:36:08 UTC
[22/37] incubator-trafodion git commit: fieed version issue
fieed version issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/980ebc76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/980ebc76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/980ebc76
Branch: refs/heads/master
Commit: 980ebc76d676371e7dfb56bd4c385105787cf23a
Parents: 7a41338
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Wed Jan 13 09:36:57 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Wed Jan 13 09:36:57 2016 +0800
----------------------------------------------------------------------
core/sql/lib_mgmt/.gitignore | 1 +
core/sql/lib_mgmt/pom.xml | 39 ++++++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/980ebc76/core/sql/lib_mgmt/.gitignore
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/.gitignore b/core/sql/lib_mgmt/.gitignore
index fcb79a9..27fb30f 100644
--- a/core/sql/lib_mgmt/.gitignore
+++ b/core/sql/lib_mgmt/.gitignore
@@ -4,3 +4,4 @@
/.project
/src/main/java/org/trafodion/libmgmt/Vproc.java
/antrun/
+/src/main/resources/MANIFEST.MF
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/980ebc76/core/sql/lib_mgmt/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/pom.xml b/core/sql/lib_mgmt/pom.xml
index 41ffcff..ae3c7c1 100644
--- a/core/sql/lib_mgmt/pom.xml
+++ b/core/sql/lib_mgmt/pom.xml
@@ -50,18 +50,27 @@
<phase>generate-sources</phase>
<configuration>
<target>
- <property name="vproc.dir"
- value="${basedir}/src/main/java/org/trafodion/libmgmt" />
- <property name="vproc.str" value="Traf_libmgmt_Build_" />
- <exec executable="git" outputproperty="rev_head">
- <arg value="rev-parse" />
- <arg value="--short" />
- <arg value="HEAD" />
- </exec>
- <copy file="${vproc.dir}/Vproc.java.tmpl" tofile="${vproc.dir}/Vproc.java"
- overwrite="true" />
- <replace file="${vproc.dir}/Vproc.java" token="@@@VPROC@@@"
- value="${vproc.str}${rev_head}" />
+<property name="vproc.dir"
+ value="${basedir}/src/main/java/org/trafodion/libmgmt" />
+<property name="manifest.file" value="${basedir}/src/main/resources/MANIFEST.MF" />
+<property name="vproc.str" value="Traf_libmgmt_Build_" />
+<property file="${env.MY_SQROOT}/export/include/SCMBuildMan.mf"/>
+<exec executable="git" outputproperty="rev_head">
+ <arg value="rev-parse" />
+ <arg value="--short" />
+ <arg value="HEAD" />
+</exec>
+<echo file="${manifest.file}" append="false">Manifest-Version: 1.0</echo>
+<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-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>
+<echo file="${manifest.file}" append="true">${line.separator}Implementation-Version-6: ${Implementation-Version-6}${line.separator}</echo>
+<copy file="${vproc.dir}/Vproc.java.tmpl" tofile="${vproc.dir}/Vproc.java" overwrite="true" />
+<replace file="${vproc.dir}/Vproc.java" token="@@@VPROC@@@" value="${vproc.str}${rev_head}" />
</target>
</configuration>
<goals>
@@ -80,11 +89,7 @@
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
- <manifest>
- <addClasspath>false</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <mainClass>org.trafodion.libmgmt.Vproc</mainClass>
- </manifest>
+ <manifestFile>${basedir}/src/main/resources/MANIFEST.MF</manifestFile>
</archive>
</configuration>
<executions>