From 44073212f753049d1d1084f4955c7fdcc22d1515 Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Sat, 25 Aug 2012 14:19:52 +0800 Subject: [PATCH 1/3] add maven-jar-plugin and buildnumber-maven plugin --- pom.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pom.xml b/pom.xml index 8df167c5b4..2c28bf4501 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,42 @@ + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + ${buildNumber} + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.1 + + + validate + + create + + + + + {0,date,yyyy-MM-dd HH:mm:ss} + + timestamp + + false + true + + From 0828c8ad63b5b6877a7531bf062931b4e023ac55 Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Sat, 25 Aug 2012 14:21:40 +0800 Subject: [PATCH 2/3] get VersionNumber from MANIFEST.MF --- src/main/java/com/alibaba/druid/VERSION.java | 37 +++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 870ce59f24..469cc2ae22 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -15,13 +15,40 @@ */ package com.alibaba.druid; +import java.io.IOException; +import java.net.JarURLConnection; +import java.net.URL; +import java.util.Iterator; +import java.util.Map; +import java.util.jar.Manifest; + public final class VERSION { - public final static int MajorVersion = 0; - public final static int MinorVersion = 2; - public final static int RevisionVersion = 6; - public static String getVersionNumber() { - return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; + return getManifestInfo("Implementation-Version"); + } + + public static String getBuildTime() { + return getManifestInfo("Implementation-Build"); + } + + @SuppressWarnings("rawtypes") + private static String getManifestInfo(String key) { + try { + URL res = VERSION.class.getResource(VERSION.class.getSimpleName() + ".class"); + JarURLConnection conn = (JarURLConnection) res.openConnection(); + Manifest manifest = conn.getManifest(); + Iterator entries = manifest.getMainAttributes().entrySet().iterator(); + while (entries.hasNext()) { + Map.Entry entry = (Map.Entry) entries.next(); + String manifestKey = entry.getKey().toString(); + if (key.equals(manifestKey)) { + return (String) entry.getValue(); + } + } + return null; + } catch (IOException e) { + return "n/a"; + } } } From 65a4734081e3e264eb6f570467b07a6b289cbaa0 Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Sun, 26 Aug 2012 10:55:11 +0800 Subject: [PATCH 3/3] rollback to previous revision. --- src/main/java/com/alibaba/druid/VERSION.java | 37 +++----------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 469cc2ae22..870ce59f24 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -15,40 +15,13 @@ */ package com.alibaba.druid; -import java.io.IOException; -import java.net.JarURLConnection; -import java.net.URL; -import java.util.Iterator; -import java.util.Map; -import java.util.jar.Manifest; - public final class VERSION { + public final static int MajorVersion = 0; + public final static int MinorVersion = 2; + public final static int RevisionVersion = 6; + public static String getVersionNumber() { - return getManifestInfo("Implementation-Version"); - } - - public static String getBuildTime() { - return getManifestInfo("Implementation-Build"); - } - - @SuppressWarnings("rawtypes") - private static String getManifestInfo(String key) { - try { - URL res = VERSION.class.getResource(VERSION.class.getSimpleName() + ".class"); - JarURLConnection conn = (JarURLConnection) res.openConnection(); - Manifest manifest = conn.getManifest(); - Iterator entries = manifest.getMainAttributes().entrySet().iterator(); - while (entries.hasNext()) { - Map.Entry entry = (Map.Entry) entries.next(); - String manifestKey = entry.getKey().toString(); - if (key.equals(manifestKey)) { - return (String) entry.getValue(); - } - } - return null; - } catch (IOException e) { - return "n/a"; - } + return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; } }