aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2014-06-03 18:21:39 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2014-06-03 18:21:39 +0200
commitb37a95a6a4fa70da38f990b14a0f9517dd5ed0bc (patch)
tree3dfa2f3d9414cf5512907442f57246c0eab53be4
parentf8b3056dc4f61251aba7adf627c942c85e8618ca (diff)
downloadlombok-b37a95a6a4fa70da38f990b14a0f9517dd5ed0bc.tar.gz
lombok-b37a95a6a4fa70da38f990b14a0f9517dd5ed0bc.tar.bz2
lombok-b37a95a6a4fa70da38f990b14a0f9517dd5ed0bc.zip
bugfixed ‘print build time as part of version number if edge release’ feature.
-rw-r--r--build.xml2
-rw-r--r--src/core/lombok/core/Version.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index 9be37d26..6e81138a 100644
--- a/build.xml
+++ b/build.xml
@@ -208,7 +208,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<tstamp>
<format property="releaseTimestamp" pattern="yyyy-MM-dd" />
</tstamp>
- <echo file="release-timestamp.txt">$releaseTimestamp</echo>
+ <echo file="release-timestamp.txt">${releaseTimestamp}</echo>
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/com.googlecode.jarjar-jarjar.jar" />
<jarjar destfile="dist/lombok-${lombok.version}.jar">
<fileset dir="build/lombok">
diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java
index 6b1ed0f8..0ceabc51 100644
--- a/src/core/lombok/core/Version.java
+++ b/src/core/lombok/core/Version.java
@@ -71,7 +71,7 @@ public class Version {
String version = String.format("v%s \"%s\"", VERSION, RELEASE_NAME);
if (!isEdgeRelease()) return version;
- InputStream in = Version.class.getResourceAsStream("release-timestamp.txt");
+ InputStream in = Version.class.getResourceAsStream("/release-timestamp.txt");
if (in == null) return version;
try {
byte[] data = new byte[65536];
@@ -97,7 +97,7 @@ public class Version {
int lastIdx = VERSION.lastIndexOf('.');
if (lastIdx == -1) return false;
try {
- return Integer.parseInt(VERSION.substring(lastIdx + 1)) % 1 == 1;
+ return Integer.parseInt(VERSION.substring(lastIdx + 1)) % 2 == 1;
} catch (Exception e) {
return false;
}