Filter {build.level} and {client.release.version}

ndeverge · Mar 30, 2013 · c89c151 · c89c151
1 parent fb8578a
commit c89c151
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/org.eclipse.paho.client.mqttv3/pom.xml b/org.eclipse.paho.client.mqttv3/pom.xml
@@ -14,8 +14,19 @@
     <name>Paho :: MQTT Client library</name>
     <description>MQTT Client library</description> 
     <url>${paho.url}</url>
+
+    <properties>
+       <build.level>${maven.build.timestamp}</build.level>
+       <maven.build.timestamp.format>yyMMdd</maven.build.timestamp.format>
+    </properties>
 
     <build>
+    <resources>
+          <resource>
+              <directory>src/main/java</directory>
+              <filtering>true</filtering>
+          </resource>
+      </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -30,6 +41,7 @@
             </goals>
             <configuration>
               <instructions>
+                <Build-Level>L${build.level}</Build-Level>
                 <Bundle-ClassPath>.</Bundle-ClassPath>
                 <Bundle-SymbolicName>$(maven-symbolicname);singleton:=true</Bundle-SymbolicName>
                 <Import-Package>javax.net;resolution:=optional, javax.net.ssl;resolution:=optional</Import-Package>

diff --git a/...paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/ClientComms.java b/...paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
@@ -37,8 +37,8 @@
  * messages. 
  */
 public class ClientComms { 
-	public static String 		VERSION = "@@VERSION@@";
-	public static String 		BUILD_LEVEL = "@@BUILDLEVEL@@";
+	public static String 		VERSION = "${project.version}";
+	public static String 		BUILD_LEVEL = "L${build.level}";
 
 	private IMqttAsyncClient 	client;
 	NetworkModule 				networkModule;