diff --git a/bundles/action/org.openhab.action.mail/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.mail/META-INF/MANIFEST.MF
index dce6ecb7810..42e476460ee 100644
--- a/bundles/action/org.openhab.action.mail/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.mail/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Mail Action
 Bundle-SymbolicName: org.openhab.action.mail
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.mail.internal.MailActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Mail action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.mail/pom.xml b/bundles/action/org.openhab.action.mail/pom.xml
index 9dab35afb4f..f98de069efc 100644
--- a/bundles/action/org.openhab.action.mail/pom.xml
+++ b/bundles/action/org.openhab.action.mail/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.nma/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.nma/META-INF/MANIFEST.MF
index dfb131cab19..e15f02ab522 100644
--- a/bundles/action/org.openhab.action.nma/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.nma/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB NotifyMyAndroid Action
 Bundle-SymbolicName: org.openhab.action.nma
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.nma.internal.NotifyMyAndroidActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the NotifyMyAndroid action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.nma/pom.xml b/bundles/action/org.openhab.action.nma/pom.xml
index 32241f30dcf..a73b2fdb4f2 100644
--- a/bundles/action/org.openhab.action.nma/pom.xml
+++ b/bundles/action/org.openhab.action.nma/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.prowl/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.prowl/META-INF/MANIFEST.MF
index 6240255e3ec..fda4f3fb878 100644
--- a/bundles/action/org.openhab.action.prowl/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.prowl/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Prowl Action
 Bundle-SymbolicName: org.openhab.action.prowl
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.prowl.internal.ProwlActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Prowl action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.prowl/pom.xml b/bundles/action/org.openhab.action.prowl/pom.xml
index 6af0465e275..ae5d29a3937 100644
--- a/bundles/action/org.openhab.action.prowl/pom.xml
+++ b/bundles/action/org.openhab.action.prowl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.squeezebox/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.squeezebox/META-INF/MANIFEST.MF
index bf49074eeeb..cdf71d4bff2 100644
--- a/bundles/action/org.openhab.action.squeezebox/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.squeezebox/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Squeezebox Action
 Bundle-SymbolicName: org.openhab.action.squeezebox
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.squeezebox.internal.SqueezeboxActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Squeezebox action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.squeezebox/pom.xml b/bundles/action/org.openhab.action.squeezebox/pom.xml
index 0eba0b7e220..ce44bd40751 100644
--- a/bundles/action/org.openhab.action.squeezebox/pom.xml
+++ b/bundles/action/org.openhab.action.squeezebox/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.twitter/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.twitter/META-INF/MANIFEST.MF
index d119f131635..5f78f5c0431 100644
--- a/bundles/action/org.openhab.action.twitter/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.twitter/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Twitter Action
 Bundle-SymbolicName: org.openhab.action.twitter
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.twitter.internal.TwitterActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Twitter action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.twitter/pom.xml b/bundles/action/org.openhab.action.twitter/pom.xml
index 6dae00d39f1..451778c8ab1 100644
--- a/bundles/action/org.openhab.action.twitter/pom.xml
+++ b/bundles/action/org.openhab.action.twitter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.xbmc/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.xbmc/META-INF/MANIFEST.MF
index 5572cb3a761..116c2abab80 100644
--- a/bundles/action/org.openhab.action.xbmc/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.xbmc/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB XBMC Action
 Bundle-SymbolicName: org.openhab.action.xbmc
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.xbmc.internal.XBMCActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the XBMC action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.xbmc/pom.xml b/bundles/action/org.openhab.action.xbmc/pom.xml
index 2a610ead7c6..cee8cfd8ee4 100644
--- a/bundles/action/org.openhab.action.xbmc/pom.xml
+++ b/bundles/action/org.openhab.action.xbmc/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/org.openhab.action.xmpp/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.xmpp/META-INF/MANIFEST.MF
index 31e07d5a27e..f0a396ca896 100644
--- a/bundles/action/org.openhab.action.xmpp/META-INF/MANIFEST.MF
+++ b/bundles/action/org.openhab.action.xmpp/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB XMPP Action
 Bundle-SymbolicName: org.openhab.action.xmpp
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.action.xmpp.internal.XMPPActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the XMPP action of the open Home Aut
diff --git a/bundles/action/org.openhab.action.xmpp/pom.xml b/bundles/action/org.openhab.action.xmpp/pom.xml
index 9741880ac7d..4d25bdf7982 100644
--- a/bundles/action/org.openhab.action.xmpp/pom.xml
+++ b/bundles/action/org.openhab.action.xmpp/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>action</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/action/pom.xml b/bundles/action/pom.xml
index 59904681dcd..e592c3b7be9 100644
--- a/bundles/action/pom.xml
+++ b/bundles/action/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/binding/org.openhab.binding.asterisk/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.asterisk/META-INF/MANIFEST.MF
index de949b0db0b..4de483976e1 100644
--- a/bundles/binding/org.openhab.binding.asterisk/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.asterisk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Asterisk Binding
 Bundle-SymbolicName: org.openhab.binding.asterisk
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.asterisk.internal.AsteriskActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.asterisk/pom.xml b/bundles/binding/org.openhab.binding.asterisk/pom.xml
index 732d0c7de9f..1470b8017b4 100644
--- a/bundles/binding/org.openhab.binding.asterisk/pom.xml
+++ b/bundles/binding/org.openhab.binding.asterisk/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Asterisk Binding</name>
diff --git a/bundles/binding/org.openhab.binding.bluetooth/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.bluetooth/META-INF/MANIFEST.MF
index baf5b9d0372..a2dd06dff33 100644
--- a/bundles/binding/org.openhab.binding.bluetooth/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.bluetooth/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Bluetooth Binding
 Bundle-SymbolicName: org.openhab.binding.bluetooth
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.bluetooth.internal.BluetoothActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.bluetooth/pom.xml b/bundles/binding/org.openhab.binding.bluetooth/pom.xml
index 3fd93dc374d..2dce347edbc 100644
--- a/bundles/binding/org.openhab.binding.bluetooth/pom.xml
+++ b/bundles/binding/org.openhab.binding.bluetooth/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Bluetooth Binding</name>
diff --git a/bundles/binding/org.openhab.binding.comfoair/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.comfoair/META-INF/MANIFEST.MF
index 1ecdf677b02..8190a8165ae 100644
--- a/bundles/binding/org.openhab.binding.comfoair/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.comfoair/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.comfoair.internal
 Ignore-Package: org.openhab.binding.comfoair.internal
 Bundle-Name: openHAB ComfoAir Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.comfoair.internal.ComfoAirActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.comfoair/pom.xml b/bundles/binding/org.openhab.binding.comfoair/pom.xml
index 4be1ed7bfd2..d7742b08b24 100644
--- a/bundles/binding/org.openhab.binding.comfoair/pom.xml
+++ b/bundles/binding/org.openhab.binding.comfoair/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB ComfoAir Binding</name>
diff --git a/bundles/binding/org.openhab.binding.configadmin/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.configadmin/META-INF/MANIFEST.MF
index f7650236a24..98844fe03a0 100644
--- a/bundles/binding/org.openhab.binding.configadmin/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.configadmin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.configadmin.internal
 Ignore-Package: org.openhab.binding.configadmin.internal
 Bundle-Name: openHAB ConfigAdmin Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.configadmin.internal.ConfigAdminActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.configadmin/pom.xml b/bundles/binding/org.openhab.binding.configadmin/pom.xml
index ff962bda52c..e0940a564ea 100644
--- a/bundles/binding/org.openhab.binding.configadmin/pom.xml
+++ b/bundles/binding/org.openhab.binding.configadmin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB ConfigAdmin Binding</name>
diff --git a/bundles/binding/org.openhab.binding.cups/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.cups/META-INF/MANIFEST.MF
index 10f9d6d0cb2..59862b1f46f 100644
--- a/bundles/binding/org.openhab.binding.cups/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.cups/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.cups.internal
 Ignore-Package: org.openhab.binding.cups.internal
 Bundle-Name: openHAB Cups Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.cups.internal.CupsActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.cups/pom.xml b/bundles/binding/org.openhab.binding.cups/pom.xml
index 30e1989a560..432e90f2e2c 100644
--- a/bundles/binding/org.openhab.binding.cups/pom.xml
+++ b/bundles/binding/org.openhab.binding.cups/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Cups Binding</name>
diff --git a/bundles/binding/org.openhab.binding.digitalstrom/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.digitalstrom/META-INF/MANIFEST.MF
index f28b95f45f5..06f5e0ff1ae 100644
--- a/bundles/binding/org.openhab.binding.digitalstrom/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.digitalstrom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB DigitalSTROM Binding
 Bundle-SymbolicName: org.openhab.binding.digitalstrom;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.digitalstrom.internal.DigitalSTROMActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -24,12 +24,9 @@ Import-Package: org.apache.commons.lang;version="2.6.0",
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/digitalstrombinding.xml,
  OSGI-INF/digitalstromgenericbindingprovider.xml
-Export-Package: org.openhab.binding.digitalstrom;
-  uses:="org.openhab.core.items,
-   org.openhab.binding.digitalstrom.events,
-   org.openhab.core.types,
-   org.openhab.binding.digitalstrom.constants,
-   org.openhab.core.binding,
-   org.openhab.binding.digitalstrom.entity"
+Export-Package: org.openhab.binding.digitalstrom; uses:="org.openhab.c
+ ore.items,  org.openhab.binding.digitalstrom.events,  org.openhab.cor
+ e.types,  org.openhab.binding.digitalstrom.constants,  org.openhab.co
+ re.binding,  org.openhab.binding.digitalstrom.entity"
 Bundle-ClassPath: .,
  lib/json-simple-1.1.1.jar
diff --git a/bundles/binding/org.openhab.binding.digitalstrom/pom.xml b/bundles/binding/org.openhab.binding.digitalstrom/pom.xml
index bbda98069b9..d46223f6b5e 100644
--- a/bundles/binding/org.openhab.binding.digitalstrom/pom.xml
+++ b/bundles/binding/org.openhab.binding.digitalstrom/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB DigitalSTROM Binding</name>
diff --git a/bundles/binding/org.openhab.binding.dmx.artnet/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.dmx.artnet/META-INF/MANIFEST.MF
index 0fd93b203b4..580850eec1d 100644
--- a/bundles/binding/org.openhab.binding.dmx.artnet/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.dmx.artnet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: artnet interface for openHAB DMX Binding
 Bundle-SymbolicName: org.openhab.binding.dmx.artnet
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the artnet interface of the DMX binding of the open Home Aut
  omation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.dmx.artnet/pom.xml b/bundles/binding/org.openhab.binding.dmx.artnet/pom.xml
index 4920443c6f4..1ac4d7e75b6 100644
--- a/bundles/binding/org.openhab.binding.dmx.artnet/pom.xml
+++ b/bundles/binding/org.openhab.binding.dmx.artnet/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB artnet interface for DMX Binding</name>
diff --git a/bundles/binding/org.openhab.binding.dmx.lib485/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.dmx.lib485/META-INF/MANIFEST.MF
index 4d173cc0f89..9e87530e9aa 100644
--- a/bundles/binding/org.openhab.binding.dmx.lib485/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.dmx.lib485/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: lib485 interface for openHAB DMX Binding
 Bundle-SymbolicName: org.openhab.binding.dmx.lib485
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the lib485 interface of the DMX binding of the open Home Aut
  omation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.dmx.lib485/pom.xml b/bundles/binding/org.openhab.binding.dmx.lib485/pom.xml
index 17e3bdf3a6b..ad6af294db9 100644
--- a/bundles/binding/org.openhab.binding.dmx.lib485/pom.xml
+++ b/bundles/binding/org.openhab.binding.dmx.lib485/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB lib485 interface for DMX Binding</name>
diff --git a/bundles/binding/org.openhab.binding.dmx.ola/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.dmx.ola/META-INF/MANIFEST.MF
index 6a59cb98718..97b6a58c2b0 100644
--- a/bundles/binding/org.openhab.binding.dmx.ola/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.dmx.ola/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: OLA interface for openHAB DMX Binding
 Bundle-SymbolicName: org.openhab.binding.dmx.ola
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the OLA inteface of the DMX binding of the open Home Aut
  omation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.dmx.ola/pom.xml b/bundles/binding/org.openhab.binding.dmx.ola/pom.xml
index e3e94320149..c5049a23347 100644
--- a/bundles/binding/org.openhab.binding.dmx.ola/pom.xml
+++ b/bundles/binding/org.openhab.binding.dmx.ola/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB OLA inteface for DMX Binding</name>
diff --git a/bundles/binding/org.openhab.binding.dmx.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.dmx.test/META-INF/MANIFEST.MF
index b532a82b6d8..021432f8218 100644
--- a/bundles/binding/org.openhab.binding.dmx.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.dmx.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for DMX Binding
 Bundle-SymbolicName: org.openhab.binding.dmx.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Fragment-Host: org.openhab.binding.dmx;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: openHAB.org
diff --git a/bundles/binding/org.openhab.binding.dmx.test/pom.xml b/bundles/binding/org.openhab.binding.dmx.test/pom.xml
index e5f7e816f07..388bb9c9360 100644
--- a/bundles/binding/org.openhab.binding.dmx.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.dmx.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB DMX Binding Tests</name>
diff --git a/bundles/binding/org.openhab.binding.dmx/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.dmx/META-INF/MANIFEST.MF
index 963af9ae6c2..c5beeadec9e 100644
--- a/bundles/binding/org.openhab.binding.dmx/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.dmx/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB DMX Binding
 Bundle-SymbolicName: org.openhab.binding.dmx
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the DMX binding of the open Home Aut
  omation Bus (openHAB)
@@ -23,7 +23,8 @@ Import-Package: org.apache.commons.lang,
  org.osgi.service.component,
  org.osgi.service.event,
  org.slf4j
-Export-Package: org.openhab.binding.dmx;uses:="org.openhab.core.binding"
+Export-Package: org.openhab.binding.dmx;uses:="org.openhab.core.bindin
+ g"
 Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Service-Component: OSGI-INF/*.xml
diff --git a/bundles/binding/org.openhab.binding.dmx/pom.xml b/bundles/binding/org.openhab.binding.dmx/pom.xml
index 5088bf9944f..aacdd834552 100644
--- a/bundles/binding/org.openhab.binding.dmx/pom.xml
+++ b/bundles/binding/org.openhab.binding.dmx/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB DMX Binding</name>
diff --git a/bundles/binding/org.openhab.binding.em.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.em.test/META-INF/MANIFEST.MF
index 3012d05c647..19764d5f544 100644
--- a/bundles/binding/org.openhab.binding.em.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.em.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the EM binding
 Bundle-SymbolicName: org.openhab.binding.em.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.em
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.em.test/pom.xml b/bundles/binding/org.openhab.binding.em.test/pom.xml
index 78a3b5826e1..b3e9be89ffe 100644
--- a/bundles/binding/org.openhab.binding.em.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.em.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.em/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.em/META-INF/MANIFEST.MF
index 9398b19bd46..65f5d9ad1ba 100644
--- a/bundles/binding/org.openhab.binding.em/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.em/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB EM Binding
 Bundle-SymbolicName: org.openhab.binding.em
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.em.internal.EMActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the EM binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.em/pom.xml b/bundles/binding/org.openhab.binding.em/pom.xml
index a71db84db99..37fa600cdcb 100644
--- a/bundles/binding/org.openhab.binding.em/pom.xml
+++ b/bundles/binding/org.openhab.binding.em/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB EM Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.enocean.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.enocean.test/META-INF/MANIFEST.MF
index a68c6b2e863..e83a1706eaf 100644
--- a/bundles/binding/org.openhab.binding.enocean.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.enocean.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the EnOcean binding
 Bundle-SymbolicName: org.openhab.binding.enocean.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.enocean
 Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/bundles/binding/org.openhab.binding.enocean.test/pom.xml b/bundles/binding/org.openhab.binding.enocean.test/pom.xml
index 9435837dd1f..8047d6f544b 100644
--- a/bundles/binding/org.openhab.binding.enocean.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.enocean.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF
index 07ba6324270..d0107615a65 100644
--- a/bundles/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.enocean/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB enocean Binding
 Bundle-SymbolicName: org.openhab.binding.enocean;singleton:=true
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.enocean.internal.EnoceanActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the enocean binding of the open Home Automation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.enocean/pom.xml b/bundles/binding/org.openhab.binding.enocean/pom.xml
index 5b4767110bb..831656d9c0b 100644
--- a/bundles/binding/org.openhab.binding.enocean/pom.xml
+++ b/bundles/binding/org.openhab.binding.enocean/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB EnOcean Binding</name>
diff --git a/bundles/binding/org.openhab.binding.epsonprojector/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.epsonprojector/META-INF/MANIFEST.MF
index 0ba63842c31..502a10cb3e7 100644
--- a/bundles/binding/org.openhab.binding.epsonprojector/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.epsonprojector/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Epson projector Binding
 Bundle-SymbolicName: org.openhab.binding.epsonprojector
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.epsonprojector.internal.EpsonProjectorActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Epson projector binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.epsonprojector/pom.xml b/bundles/binding/org.openhab.binding.epsonprojector/pom.xml
index bcfd26cf73e..414e24e4cdd 100644
--- a/bundles/binding/org.openhab.binding.epsonprojector/pom.xml
+++ b/bundles/binding/org.openhab.binding.epsonprojector/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Epson projector Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.exec.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.exec.test/META-INF/MANIFEST.MF
index 85db159a5e0..b7e6f4dd747 100644
--- a/bundles/binding/org.openhab.binding.exec.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.exec.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Exec binding
 Bundle-SymbolicName: org.openhab.binding.exec.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.exec
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.exec.test/pom.xml b/bundles/binding/org.openhab.binding.exec.test/pom.xml
index f53c5c24772..3f7f57adb5f 100644
--- a/bundles/binding/org.openhab.binding.exec.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.exec.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF
index 5b35a170688..3a38d602894 100644
--- a/bundles/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.exec/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.exec.internal
 Ignore-Package: org.openhab.binding.exec.internal
 Bundle-Name: openHAB Exec Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.exec.internal.ExecActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.exec/pom.xml b/bundles/binding/org.openhab.binding.exec/pom.xml
index 55a2fcd925d..4de245d8521 100644
--- a/bundles/binding/org.openhab.binding.exec/pom.xml
+++ b/bundles/binding/org.openhab.binding.exec/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Exec Binding</name>
diff --git a/bundles/binding/org.openhab.binding.fht/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.fht/META-INF/MANIFEST.MF
index 11d1c73705f..a8924f80ce7 100644
--- a/bundles/binding/org.openhab.binding.fht/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.fht/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB FHT Binding
 Bundle-SymbolicName: org.openhab.binding.fht
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.fht.internal.FHTActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the FHT binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.fht/pom.xml b/bundles/binding/org.openhab.binding.fht/pom.xml
index 627e00767b2..071c9e6d310 100644
--- a/bundles/binding/org.openhab.binding.fht/pom.xml
+++ b/bundles/binding/org.openhab.binding.fht/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB FHT Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.fritzaha/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.fritzaha/META-INF/MANIFEST.MF
index 2ee6ac3137b..96341ab914e 100644
--- a/bundles/binding/org.openhab.binding.fritzaha/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.fritzaha/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB fritzaha Binding
 Bundle-SymbolicName: org.openhab.binding.fritzaha
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.fritzaha.internal.FritzahaActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the fritzaha binding of the open Home Automation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.fritzaha/pom.xml b/bundles/binding/org.openhab.binding.fritzaha/pom.xml
index 1c5866ba988..7ffaf52e6d6 100644
--- a/bundles/binding/org.openhab.binding.fritzaha/pom.xml
+++ b/bundles/binding/org.openhab.binding.fritzaha/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Fritz AVM Home Automation Binding</name>
diff --git a/bundles/binding/org.openhab.binding.fritzbox/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.fritzbox/META-INF/MANIFEST.MF
index cb6419ea139..1576c10990d 100644
--- a/bundles/binding/org.openhab.binding.fritzbox/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.fritzbox/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Fritzbox Binding
 Bundle-SymbolicName: org.openhab.binding.fritzbox
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.fritzbox.internal.FritzboxActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.fritzbox/pom.xml b/bundles/binding/org.openhab.binding.fritzbox/pom.xml
index 46896de99f8..d5656058d59 100644
--- a/bundles/binding/org.openhab.binding.fritzbox/pom.xml
+++ b/bundles/binding/org.openhab.binding.fritzbox/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Fritzbox Binding</name>
diff --git a/bundles/binding/org.openhab.binding.fs20/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.fs20/META-INF/MANIFEST.MF
index c25481c3fb1..5e3bfe30147 100644
--- a/bundles/binding/org.openhab.binding.fs20/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.fs20/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB FS20 Binding
 Bundle-SymbolicName: org.openhab.binding.fs20
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.fs20.internal.FS20Activator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the FS20 binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.fs20/pom.xml b/bundles/binding/org.openhab.binding.fs20/pom.xml
index 5692521274f..d046da09c38 100644
--- a/bundles/binding/org.openhab.binding.fs20/pom.xml
+++ b/bundles/binding/org.openhab.binding.fs20/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB FS20 Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF
index be4878fb947..4db15aac6f9 100644
--- a/bundles/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.hdanywhere/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HDanywhere
 Bundle-SymbolicName: org.openhab.binding.hdanywhere
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.hdanywhere.internal.HDanywhereActivator
 Bundle-Vendor: openHAB
 Bundle-DocURL: http://www.openhab.org
diff --git a/bundles/binding/org.openhab.binding.hdanywhere/pom.xml b/bundles/binding/org.openhab.binding.hdanywhere/pom.xml
index b400cd86887..19a860bf071 100644
--- a/bundles/binding/org.openhab.binding.hdanywhere/pom.xml
+++ b/bundles/binding/org.openhab.binding.hdanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>binding</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/binding/org.openhab.binding.heatmiser/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.heatmiser/META-INF/MANIFEST.MF
index 7fb02b82947..08420136018 100644
--- a/bundles/binding/org.openhab.binding.heatmiser/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.heatmiser/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.gnu.org/licenses/gpl.html
 Bundle-Name: openHAB Heatmiser Binding
 Bundle-SymbolicName: org.openhab.binding.heatmiser
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.heatmiser.internal.HeatmiserActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Heatmiser binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.heatmiser/pom.xml b/bundles/binding/org.openhab.binding.heatmiser/pom.xml
index 3b0546d9d83..48fa23491e2 100644
--- a/bundles/binding/org.openhab.binding.heatmiser/pom.xml
+++ b/bundles/binding/org.openhab.binding.heatmiser/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Heatmiser Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.homematic.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.homematic.test/META-INF/MANIFEST.MF
index 694acb94847..ac37094df92 100644
--- a/bundles/binding/org.openhab.binding.homematic.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.homematic.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Homematic binding
 Bundle-SymbolicName: org.openhab.binding.homematic.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.homematic
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.homematic.test/pom.xml b/bundles/binding/org.openhab.binding.homematic.test/pom.xml
index 68df68f860d..ce3a5c24534 100644
--- a/bundles/binding/org.openhab.binding.homematic.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.homematic.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.homematic/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.homematic/META-INF/MANIFEST.MF
index 4cf8ece3d93..9806b69290e 100644
--- a/bundles/binding/org.openhab.binding.homematic/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.homematic/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB homematic Binding
 Bundle-SymbolicName: org.openhab.binding.homematic;singleton:=true
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.homematic.internal.HomematicActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the homematic binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.homematic/pom.xml b/bundles/binding/org.openhab.binding.homematic/pom.xml
index 2cded774505..b07c67a9e2a 100644
--- a/bundles/binding/org.openhab.binding.homematic/pom.xml
+++ b/bundles/binding/org.openhab.binding.homematic/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Homematic Binding</name>
diff --git a/bundles/binding/org.openhab.binding.http.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.http.test/META-INF/MANIFEST.MF
index 0d0f987e56a..032219cf33b 100644
--- a/bundles/binding/org.openhab.binding.http.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.http.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the HTTP binding
 Bundle-SymbolicName: org.openhab.binding.http.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.http
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.http.test/pom.xml b/bundles/binding/org.openhab.binding.http.test/pom.xml
index e5a1e9fe6d6..fe37ffcec18 100644
--- a/bundles/binding/org.openhab.binding.http.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.http.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.http/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.http/META-INF/MANIFEST.MF
index 0bd4728a231..f9e6c11f7ff 100644
--- a/bundles/binding/org.openhab.binding.http/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.http/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.http.internal
 Ignore-Package: org.openhab.binding.http.internal
 Bundle-Name: openHAB HTTP Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.http.internal.HttpActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.http/pom.xml b/bundles/binding/org.openhab.binding.http/pom.xml
index 8714886f7a8..4d196edd3bc 100644
--- a/bundles/binding/org.openhab.binding.http/pom.xml
+++ b/bundles/binding/org.openhab.binding.http/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>binding</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <name>openHAB HTTP Binding</name>
diff --git a/bundles/binding/org.openhab.binding.hue/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.hue/META-INF/MANIFEST.MF
index 263047576bf..d3e40bd2b59 100644
--- a/bundles/binding/org.openhab.binding.hue/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.hue/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.hue.internal
 Ignore-Package: org.openhab.binding.hue.internal
 Bundle-Name: openHAB Hue Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.hue.internal.HueActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.hue/pom.xml b/bundles/binding/org.openhab.binding.hue/pom.xml
index e1d300e4468..3a04412f37c 100644
--- a/bundles/binding/org.openhab.binding.hue/pom.xml
+++ b/bundles/binding/org.openhab.binding.hue/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Hue Binding</name>
diff --git a/bundles/binding/org.openhab.binding.ihc/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.ihc/META-INF/MANIFEST.MF
index 0660f2389c3..e296783a3b1 100644
--- a/bundles/binding/org.openhab.binding.ihc/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.ihc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.ihc.internal
 Ignore-Package: org.openhab.binding.ihc.internal
 Bundle-Name: openHAB IHC/ELKO LS Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.ihc.internal.IhcActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.ihc/pom.xml b/bundles/binding/org.openhab.binding.ihc/pom.xml
index 6c65d9e6b2f..c441a2af3ad 100644
--- a/bundles/binding/org.openhab.binding.ihc/pom.xml
+++ b/bundles/binding/org.openhab.binding.ihc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB IHC / ELKO LS Binding</name>
diff --git a/bundles/binding/org.openhab.binding.insteonhub/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.insteonhub/META-INF/MANIFEST.MF
index 4ccbfb74b2f..4a2628ebcc0 100644
--- a/bundles/binding/org.openhab.binding.insteonhub/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.insteonhub/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Insteon Hub Binding
 Bundle-SymbolicName: org.openhab.binding.insteonhub
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ClassPath: .
 Bundle-Activator: org.openhab.binding.insteonhub.internal.InsteonHubActivator
 Bundle-Vendor: openHAB.org
-Export-Package: org.openhab.binding.insteonhub,
- org.openhab.binding.insteonhub.internal,
- org.openhab.binding.insteonhub.internal.hardware
+Export-Package: org.openhab.binding.insteonhub,org.openhab.binding.ins
+ teonhub.internal,org.openhab.binding.insteonhub.internal.hardware
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
  org.apache.commons.lang,
diff --git a/bundles/binding/org.openhab.binding.insteonhub/pom.xml b/bundles/binding/org.openhab.binding.insteonhub/pom.xml
index d652435131d..34bc5e0ace1 100644
--- a/bundles/binding/org.openhab.binding.insteonhub/pom.xml
+++ b/bundles/binding/org.openhab.binding.insteonhub/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB InsteonHub Binding</name>
diff --git a/bundles/binding/org.openhab.binding.intertechno/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.intertechno/META-INF/MANIFEST.MF
index dd24d465791..685a0975836 100644
--- a/bundles/binding/org.openhab.binding.intertechno/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.intertechno/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB CULIntertechno Binding
 Bundle-SymbolicName: org.openhab.binding.intertechno
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.intertechno.internal.CULIntertechnoActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the CULIntertechno binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.intertechno/pom.xml b/bundles/binding/org.openhab.binding.intertechno/pom.xml
index 3a473def2e2..05d15778432 100644
--- a/bundles/binding/org.openhab.binding.intertechno/pom.xml
+++ b/bundles/binding/org.openhab.binding.intertechno/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB CULIntertechno Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF
index 3b916713b31..cb513ef9828 100644
--- a/bundles/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the KNX binding
 Bundle-SymbolicName: org.openhab.binding.knx.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.knx
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.knx.test/pom.xml b/bundles/binding/org.openhab.binding.knx.test/pom.xml
index f1e85e91071..79c50b393fd 100644
--- a/bundles/binding/org.openhab.binding.knx.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.knx.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
index 40edd988e86..d2bc7a3cfda 100644
--- a/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.knx.internal
 Ignore-Package: org.openhab.binding.knx.internal
 Bundle-Name: openHAB KNX Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.knx.internal.KNXActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
@@ -35,9 +35,7 @@ Service-Component: OSGI-INF/knxconnection.xml, OSGI-INF/knxbinding.xml, OSGI-INF
 Bundle-ClassPath: lib/calimero-rxtx-2.0a3.jar,
  lib/calimero-core-2.2.0-SNAPSHOT.jar,
  .
-Export-Package: org.openhab.binding.knx.config,
- tuwien.auto.calimero,
- tuwien.auto.calimero.datapoint,
- tuwien.auto.calimero.exception,
- tuwien.auto.calimero.link
+Export-Package: org.openhab.binding.knx.config,tuwien.auto.calimero,tu
+ wien.auto.calimero.datapoint,tuwien.auto.calimero.exception,tuwien.au
+ to.calimero.link
 
diff --git a/bundles/binding/org.openhab.binding.knx/pom.xml b/bundles/binding/org.openhab.binding.knx/pom.xml
index 0e60ab67b33..253783138aa 100644
--- a/bundles/binding/org.openhab.binding.knx/pom.xml
+++ b/bundles/binding/org.openhab.binding.knx/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB KNX Binding</name>
diff --git a/bundles/binding/org.openhab.binding.koubachi/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.koubachi/META-INF/MANIFEST.MF
index a36c79b1a86..50f46ce8e3c 100644
--- a/bundles/binding/org.openhab.binding.koubachi/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.koubachi/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Koubachi Binding
 Bundle-SymbolicName: org.openhab.binding.koubachi
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.koubachi.internal.KoubachiActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Koubachi binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.koubachi/pom.xml b/bundles/binding/org.openhab.binding.koubachi/pom.xml
index bcb956ee48b..2edcaca832a 100644
--- a/bundles/binding/org.openhab.binding.koubachi/pom.xml
+++ b/bundles/binding/org.openhab.binding.koubachi/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Koubachi Binding</name>
diff --git a/bundles/binding/org.openhab.binding.maxcube.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.maxcube.test/META-INF/MANIFEST.MF
index fe60ce2b00e..368dd5f4ab3 100644
--- a/bundles/binding/org.openhab.binding.maxcube.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.maxcube.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the MAX!Cube binding
 Bundle-SymbolicName: org.openhab.binding.maxcube.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.maxcube
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/binding/org.openhab.binding.maxcube.test/pom.xml b/bundles/binding/org.openhab.binding.maxcube.test/pom.xml
index 92b0ec8f0e0..72976c88564 100644
--- a/bundles/binding/org.openhab.binding.maxcube.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.maxcube.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.maxcube/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.maxcube/META-INF/MANIFEST.MF
index 79e6952b615..052a574ba5d 100644
--- a/bundles/binding/org.openhab.binding.maxcube/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.maxcube/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.maxcube.internal
 Ignore-Package: org.openhab.binding.maxcube.internal
 Bundle-Name: openHAB MAX!Cube Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.maxcube.internal.MaxCubeActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.maxcube/pom.xml b/bundles/binding/org.openhab.binding.maxcube/pom.xml
index b6e4b597316..d790c827208 100644
--- a/bundles/binding/org.openhab.binding.maxcube/pom.xml
+++ b/bundles/binding/org.openhab.binding.maxcube/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB MaxCube Binding</name>
diff --git a/bundles/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF
index 9cf5a0d2669..761eb5c17ab 100644
--- a/bundles/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.milight/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Milight Binding
 Bundle-SymbolicName: org.openhab.binding.milight
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.milight.internal.MilightActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Milight binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.milight/pom.xml b/bundles/binding/org.openhab.binding.milight/pom.xml
index a82244fa52e..6f228fb0a36 100644
--- a/bundles/binding/org.openhab.binding.milight/pom.xml
+++ b/bundles/binding/org.openhab.binding.milight/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Milight Binding</name>
@@ -23,7 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF
index dd6a7528adc..50eb07e2153 100644
--- a/bundles/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.modbus/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB ModbusTCP Master Binding
 Bundle-SymbolicName: org.openhab.binding.modbus
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.modbus.internal.ModbusActivator
 Bundle-Vendor: openHAB.org
 Import-Package: org.apache.commons.collections,
diff --git a/bundles/binding/org.openhab.binding.modbus/pom.xml b/bundles/binding/org.openhab.binding.modbus/pom.xml
index a7e2cf99376..105fddba159 100644
--- a/bundles/binding/org.openhab.binding.modbus/pom.xml
+++ b/bundles/binding/org.openhab.binding.modbus/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>binding</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <name>openHAB Modbus Binding</name>
diff --git a/bundles/binding/org.openhab.binding.mpd/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.mpd/META-INF/MANIFEST.MF
index e606434bb90..a7975240d29 100644
--- a/bundles/binding/org.openhab.binding.mpd/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.mpd/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.mpd.internal
 Ignore-Package: org.openhab.binding.mpd.internal
 Bundle-Name: openHAB MPD Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.mpd.internal.MpdActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.mpd/pom.xml b/bundles/binding/org.openhab.binding.mpd/pom.xml
index 178113d037d..6aca0f4d8e9 100644
--- a/bundles/binding/org.openhab.binding.mpd/pom.xml
+++ b/bundles/binding/org.openhab.binding.mpd/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB MPD Binding</name>
diff --git a/bundles/binding/org.openhab.binding.mqtt.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.mqtt.test/META-INF/MANIFEST.MF
index e662346d610..61f825a9c4a 100644
--- a/bundles/binding/org.openhab.binding.mqtt.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.mqtt.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for MQTT Binding
 Bundle-SymbolicName: org.openhab.binding.mqtt.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Fragment-Host: org.openhab.binding.mqtt;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: openHAB.org
diff --git a/bundles/binding/org.openhab.binding.mqtt.test/pom.xml b/bundles/binding/org.openhab.binding.mqtt.test/pom.xml
index c60486d2740..bdd79f54ae4 100644
--- a/bundles/binding/org.openhab.binding.mqtt.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.mqtt.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.mqtt/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.mqtt/META-INF/MANIFEST.MF
index 3d93d76bf26..815bea00e62 100644
--- a/bundles/binding/org.openhab.binding.mqtt/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.mqtt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.mqtt.internal
 Ignore-Package: org.openhab.binding.mqtt.internal
 Bundle-Name: openHAB MQTT Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the MQTT binding of the open Home Aut
  omation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.mqtt/pom.xml b/bundles/binding/org.openhab.binding.mqtt/pom.xml
index 2d2473d592c..89126a14ff6 100644
--- a/bundles/binding/org.openhab.binding.mqtt/pom.xml
+++ b/bundles/binding/org.openhab.binding.mqtt/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>binding</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <name>openHAB MQTT Binding</name>
diff --git a/bundles/binding/org.openhab.binding.mqttitude/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.mqttitude/META-INF/MANIFEST.MF
index ea09bbbc79a..9101a8544ca 100644
--- a/bundles/binding/org.openhab.binding.mqttitude/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.mqttitude/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.gnu.org/licenses/gpl.html
 Bundle-Name: openHAB Mqttitude Binding
 Bundle-SymbolicName: org.openhab.binding.mqttitude
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.mqttitude.internal.MqttitudeActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Mqttitude binding of the open Home Automation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.mqttitude/pom.xml b/bundles/binding/org.openhab.binding.mqttitude/pom.xml
index a201a4ff9dd..cf067653a73 100644
--- a/bundles/binding/org.openhab.binding.mqttitude/pom.xml
+++ b/bundles/binding/org.openhab.binding.mqttitude/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Mqttitude Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.netatmo.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.netatmo.test/META-INF/MANIFEST.MF
index a9fe5fcbfba..de429f2e0f2 100644
--- a/bundles/binding/org.openhab.binding.netatmo.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.netatmo.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Netatmo binding
 Bundle-SymbolicName: org.openhab.binding.netatmo.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.netatmo
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.netatmo.test/pom.xml b/bundles/binding/org.openhab.binding.netatmo.test/pom.xml
index 75cf455dfe5..d8c7ab5f520 100644
--- a/bundles/binding/org.openhab.binding.netatmo.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.netatmo.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF
index fae45cfad38..cab34eaeb86 100644
--- a/bundles/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.netatmo/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Netatmo Binding
 Bundle-SymbolicName: org.openhab.binding.netatmo
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.netatmo.internal.NetatmoActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Netatmo binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.netatmo/pom.xml b/bundles/binding/org.openhab.binding.netatmo/pom.xml
index f8ad4e0cec6..9aa1027d448 100644
--- a/bundles/binding/org.openhab.binding.netatmo/pom.xml
+++ b/bundles/binding/org.openhab.binding.netatmo/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Netatmo Binding</name>
diff --git a/bundles/binding/org.openhab.binding.networkhealth/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.networkhealth/META-INF/MANIFEST.MF
index 0f2ad587548..b5668188010 100644
--- a/bundles/binding/org.openhab.binding.networkhealth/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.networkhealth/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.networkhealth.internal
 Ignore-Package: org.openhab.binding.networkhealth.internal
 Bundle-Name: openHAB NetworkHealth Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.networkhealth.internal.NetworkHealthActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.networkhealth/pom.xml b/bundles/binding/org.openhab.binding.networkhealth/pom.xml
index 01c5ad55b7e..99330bc8b08 100644
--- a/bundles/binding/org.openhab.binding.networkhealth/pom.xml
+++ b/bundles/binding/org.openhab.binding.networkhealth/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB NetworkHealth Binding</name>
diff --git a/bundles/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF
index 311235addb6..6e9662599fb 100644
--- a/bundles/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.nibeheatpump/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB nibeheatpump Binding
 Bundle-SymbolicName: org.openhab.binding.nibeheatpump
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.nibeheatpump.internal.NibeHeatPumpActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the nibeheatpump binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.nibeheatpump/pom.xml b/bundles/binding/org.openhab.binding.nibeheatpump/pom.xml
index 35f710f9a31..99c5fa3b050 100644
--- a/bundles/binding/org.openhab.binding.nibeheatpump/pom.xml
+++ b/bundles/binding/org.openhab.binding.nibeheatpump/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Nibe heat pump Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.nikobus.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.nikobus.test/META-INF/MANIFEST.MF
index 802bde3ede8..23a29c317f3 100644
--- a/bundles/binding/org.openhab.binding.nikobus.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.nikobus.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Nikobus Binding
 Bundle-SymbolicName: org.openhab.binding.nikobus.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Fragment-Host: org.openhab.binding.nikobus;bundle-version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: openHAB.org
diff --git a/bundles/binding/org.openhab.binding.nikobus.test/pom.xml b/bundles/binding/org.openhab.binding.nikobus.test/pom.xml
index eaef0647932..e4cf548143e 100644
--- a/bundles/binding/org.openhab.binding.nikobus.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.nikobus.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.nikobus/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.nikobus/META-INF/MANIFEST.MF
index 22c2ba7ed3b..b1e6d838715 100644
--- a/bundles/binding/org.openhab.binding.nikobus/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.nikobus/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Ignore-Package: org.openhab.binding.nikobus.internal
 Bundle-Name: openHAB nikobus Binding
 Bundle-SymbolicName: org.openhab.binding.nikobus;singleton:=true
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the nikobus binding of the open Home Aut
  omation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.nikobus/pom.xml b/bundles/binding/org.openhab.binding.nikobus/pom.xml
index 34f7e3d3a64..29a235f383a 100644
--- a/bundles/binding/org.openhab.binding.nikobus/pom.xml
+++ b/bundles/binding/org.openhab.binding.nikobus/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Nikobus Binding</name>
@@ -24,8 +24,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.novelanheatpump/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.novelanheatpump/META-INF/MANIFEST.MF
index 3e3c242a88d..9b302aa3e18 100644
--- a/bundles/binding/org.openhab.binding.novelanheatpump/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.novelanheatpump/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Novelan Heatpump Binding
 Bundle-SymbolicName: org.openhab.binding.novelanheatpump
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.novelanheatpump.internal.HeatPumpActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.novelanheatpump/pom.xml b/bundles/binding/org.openhab.binding.novelanheatpump/pom.xml
index 9cf635fea32..639a20b036b 100644
--- a/bundles/binding/org.openhab.binding.novelanheatpump/pom.xml
+++ b/bundles/binding/org.openhab.binding.novelanheatpump/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 	<name>openHAB Novelan Heatpump Binding</name>
 
diff --git a/bundles/binding/org.openhab.binding.ntp/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.ntp/META-INF/MANIFEST.MF
index c707fcdfad3..2a475c58b4c 100644
--- a/bundles/binding/org.openhab.binding.ntp/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.ntp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.ntp.internal
 Ignore-Package: org.openhab.binding.ntp.internal
 Bundle-Name: openHAB NTP Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.ntp.internal.NtpActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.ntp/pom.xml b/bundles/binding/org.openhab.binding.ntp/pom.xml
index 33d0ca1eb88..4cbccaca604 100644
--- a/bundles/binding/org.openhab.binding.ntp/pom.xml
+++ b/bundles/binding/org.openhab.binding.ntp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB NTP Binding</name>
diff --git a/bundles/binding/org.openhab.binding.onewire/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.onewire/META-INF/MANIFEST.MF
index 6326f7e6efb..0bf76df4abc 100644
--- a/bundles/binding/org.openhab.binding.onewire/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.onewire/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.onewire.internal
 Ignore-Package: org.openhab.binding.onewire.internal
 Bundle-Name: openHAB OneWire Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.onewire.internal.OneWireActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.onewire/pom.xml b/bundles/binding/org.openhab.binding.onewire/pom.xml
index 186a757210f..3d25ed86420 100644
--- a/bundles/binding/org.openhab.binding.onewire/pom.xml
+++ b/bundles/binding/org.openhab.binding.onewire/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB 1-Wire Binding</name>
diff --git a/bundles/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF
index 20cacfe958f..0ea2d1e7a57 100644
--- a/bundles/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.onkyo/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Onkyo Binding
 Bundle-SymbolicName: org.openhab.binding.onkyo
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.onkyo.internal.OnkyoActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Onkyo binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.onkyo/pom.xml b/bundles/binding/org.openhab.binding.onkyo/pom.xml
index e031c430fb9..af4458864b0 100644
--- a/bundles/binding/org.openhab.binding.onkyo/pom.xml
+++ b/bundles/binding/org.openhab.binding.onkyo/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Onkyo Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.openenergymonitor/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.openenergymonitor/META-INF/MANIFEST.MF
index bfa02ac7e1c..b70ce03b93d 100644
--- a/bundles/binding/org.openhab.binding.openenergymonitor/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.openenergymonitor/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Open Energy Monitor Binding
 Bundle-SymbolicName: org.openhab.binding.openenergymonitor
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.openenergymonitor.internal.OpenEnergyMonitorActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Open Energy Monitor binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.openenergymonitor/pom.xml b/bundles/binding/org.openhab.binding.openenergymonitor/pom.xml
index 5e88e092218..f056a07a2f2 100644
--- a/bundles/binding/org.openhab.binding.openenergymonitor/pom.xml
+++ b/bundles/binding/org.openhab.binding.openenergymonitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Open Energy Monitor Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.openpaths/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.openpaths/META-INF/MANIFEST.MF
index 46cbd4faba2..530b69ab0d6 100644
--- a/bundles/binding/org.openhab.binding.openpaths/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.openpaths/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.gnu.org/licenses/gpl.html
 Bundle-Name: openHAB OpenPaths Binding
 Bundle-SymbolicName: org.openhab.binding.openpaths
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.openpaths.internal.OpenPathsActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the OpenPaths binding of the open Home Automation Bus (openHAB)
diff --git a/bundles/binding/org.openhab.binding.openpaths/pom.xml b/bundles/binding/org.openhab.binding.openpaths/pom.xml
index 3d6e665cd17..87585fe14f5 100644
--- a/bundles/binding/org.openhab.binding.openpaths/pom.xml
+++ b/bundles/binding/org.openhab.binding.openpaths/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB OpenPaths Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF
index 7851ff83168..02e881d6c05 100644
--- a/bundles/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.opensprinkler/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB OpenSprinkler Binding
 Bundle-SymbolicName: org.openhab.binding.opensprinkler
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.opensprinkler.internal.OpenSprinklerActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the OpenSprinkler binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.opensprinkler/pom.xml b/bundles/binding/org.openhab.binding.opensprinkler/pom.xml
index 20c479d67cf..0262c26c7e2 100644
--- a/bundles/binding/org.openhab.binding.opensprinkler/pom.xml
+++ b/bundles/binding/org.openhab.binding.opensprinkler/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB OpenSprinkler Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.owserver/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.owserver/META-INF/MANIFEST.MF
index b08e8e898fd..306f22ec9c4 100644
--- a/bundles/binding/org.openhab.binding.owserver/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.owserver/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.owserver.internal
 Ignore-Package: org.openhab.binding.owserver.internal
 Bundle-Name: openHAB OWServer Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.owserver.internal.OWServerActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.owserver/pom.xml b/bundles/binding/org.openhab.binding.owserver/pom.xml
index 7893f62a459..ac5930208a1 100644
--- a/bundles/binding/org.openhab.binding.owserver/pom.xml
+++ b/bundles/binding/org.openhab.binding.owserver/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB OWServer Binding</name>
diff --git a/bundles/binding/org.openhab.binding.piface/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.piface/META-INF/MANIFEST.MF
index 2eaaa043ade..e86318f4661 100644
--- a/bundles/binding/org.openhab.binding.piface/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.piface/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.piface.internal
 Ignore-Package: org.openhab.binding.piface.internal
 Bundle-Name: openHAB Piface Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.piface.internal.PifaceActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.piface/pom.xml b/bundles/binding/org.openhab.binding.piface/pom.xml
index a79bd63c381..8444bd2dd20 100644
--- a/bundles/binding/org.openhab.binding.piface/pom.xml
+++ b/bundles/binding/org.openhab.binding.piface/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Piface Binding</name>
diff --git a/bundles/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF
index b8f51786582..871a8bc3ce0 100644
--- a/bundles/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.pioneeravr/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Pioneer AVR Binding
 Bundle-SymbolicName: org.openhab.binding.pioneeravr
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.pioneeravr.internal.PioneerAvrActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Pioneer AVR Binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.pioneeravr/pom.xml b/bundles/binding/org.openhab.binding.pioneeravr/pom.xml
index 119e3e1e4a5..45509a3dbd3 100644
--- a/bundles/binding/org.openhab.binding.pioneeravr/pom.xml
+++ b/bundles/binding/org.openhab.binding.pioneeravr/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Pioneer AVR Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.plcbus/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.plcbus/META-INF/MANIFEST.MF
index b69e56bb417..f4521e682c4 100644
--- a/bundles/binding/org.openhab.binding.plcbus/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.plcbus/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB PLCBus Binding
 Bundle-SymbolicName: org.openhab.binding.plcbus
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.plcbus.internal.PLCBusActivator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: gnu.io,
diff --git a/bundles/binding/org.openhab.binding.plcbus/pom.xml b/bundles/binding/org.openhab.binding.plcbus/pom.xml
index c72d0b77436..6f4c324366f 100644
--- a/bundles/binding/org.openhab.binding.plcbus/pom.xml
+++ b/bundles/binding/org.openhab.binding.plcbus/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB PLCBus Binding</name>
diff --git a/bundles/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF
index 785c4a0af8f..e4c735741c2 100644
--- a/bundles/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.plugwise/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plugwise
 Bundle-SymbolicName: org.openhab.binding.plugwise
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.plugwise.internal.PlugwiseActivator
 Bundle-Vendor: openHAB
 Bundle-DocURL: http://www.openhab.org
diff --git a/bundles/binding/org.openhab.binding.plugwise/pom.xml b/bundles/binding/org.openhab.binding.plugwise/pom.xml
index 5816e7997e1..6cea875ceb1 100644
--- a/bundles/binding/org.openhab.binding.plugwise/pom.xml
+++ b/bundles/binding/org.openhab.binding.plugwise/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Plugwise Binding</name>
diff --git a/bundles/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF
index 8a79b2625f1..9e9af8841b8 100644
--- a/bundles/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.pulseaudio/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: openHAB Pulseaudio Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.pulseaudio.internal.PulseaudioActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.pulseaudio/pom.xml b/bundles/binding/org.openhab.binding.pulseaudio/pom.xml
index f10b36edd1d..9c564ed05b8 100644
--- a/bundles/binding/org.openhab.binding.pulseaudio/pom.xml
+++ b/bundles/binding/org.openhab.binding.pulseaudio/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Pulseaudio Binding</name>
diff --git a/bundles/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF
index d78283c1562..d6be1d9bb40 100644
--- a/bundles/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.rfxcom/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB RFXCOM Binding
 Bundle-SymbolicName: org.openhab.binding.rfxcom
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.rfxcom.internal.RFXComActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the RFXCOM binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.rfxcom/pom.xml b/bundles/binding/org.openhab.binding.rfxcom/pom.xml
index 7ac711e9532..dc1925fc2c0 100644
--- a/bundles/binding/org.openhab.binding.rfxcom/pom.xml
+++ b/bundles/binding/org.openhab.binding.rfxcom/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB RFXCOM Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.s300th.test/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.s300th.test/META-INF/MANIFEST.MF
index eb6c4fa10f8..46c1830318f 100644
--- a/bundles/binding/org.openhab.binding.s300th.test/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.s300th.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the S300TH binding
 Bundle-SymbolicName: org.openhab.binding.s300th.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.binding.s300th;bundle-version="1.4.0"
 Require-Bundle: org.junit;bundle-version="4.8.1"
diff --git a/bundles/binding/org.openhab.binding.s300th.test/pom.xml b/bundles/binding/org.openhab.binding.s300th.test/pom.xml
index 689af771ff8..f49047a4d08 100644
--- a/bundles/binding/org.openhab.binding.s300th.test/pom.xml
+++ b/bundles/binding/org.openhab.binding.s300th.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/binding/org.openhab.binding.s300th/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.s300th/META-INF/MANIFEST.MF
index 031a435e05c..1a758c4f905 100644
--- a/bundles/binding/org.openhab.binding.s300th/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.s300th/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB S300TH Binding
 Bundle-SymbolicName: org.openhab.binding.s300th
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.s300th.internal.S300THActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the S300TH binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.s300th/pom.xml b/bundles/binding/org.openhab.binding.s300th/pom.xml
index a8d466d39c0..e392a670e0f 100644
--- a/bundles/binding/org.openhab.binding.s300th/pom.xml
+++ b/bundles/binding/org.openhab.binding.s300th/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB S300TH Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF
index 6409eb2793b..41f22a9082e 100644
--- a/bundles/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.samsungtv/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Samsung TV Binding
 Bundle-SymbolicName: org.openhab.binding.samsungtv
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.samsungtv.internal.SamsungTvActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Samsung TV binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.samsungtv/pom.xml b/bundles/binding/org.openhab.binding.samsungtv/pom.xml
index 0c53fcf5f54..c73246ca90d 100644
--- a/bundles/binding/org.openhab.binding.samsungtv/pom.xml
+++ b/bundles/binding/org.openhab.binding.samsungtv/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Samsung TV Binding</name>
diff --git a/bundles/binding/org.openhab.binding.serial/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.serial/META-INF/MANIFEST.MF
index d7c9df5a8cf..602e109c0b2 100644
--- a/bundles/binding/org.openhab.binding.serial/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.serial/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Serial Binding
 Bundle-SymbolicName: org.openhab.binding.serial
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: gnu.io,
diff --git a/bundles/binding/org.openhab.binding.serial/pom.xml b/bundles/binding/org.openhab.binding.serial/pom.xml
index e9c5c8d437c..f934086563f 100644
--- a/bundles/binding/org.openhab.binding.serial/pom.xml
+++ b/bundles/binding/org.openhab.binding.serial/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Serial Binding</name>
diff --git a/bundles/binding/org.openhab.binding.snmp/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.snmp/META-INF/MANIFEST.MF
index 2013f559339..a40b9a4bb27 100644
--- a/bundles/binding/org.openhab.binding.snmp/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.snmp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.snmp.internal
 Ignore-Package: org.openhab.binding.snmp.internal
 Bundle-Name: openHAB SNMP Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.snmp.internal.SnmpActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.snmp/pom.xml b/bundles/binding/org.openhab.binding.snmp/pom.xml
index 4235fdc87fd..0e27c2a25df 100644
--- a/bundles/binding/org.openhab.binding.snmp/pom.xml
+++ b/bundles/binding/org.openhab.binding.snmp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB SNMP Binding</name>
diff --git a/bundles/binding/org.openhab.binding.sonos/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.sonos/META-INF/MANIFEST.MF
index 749c04fef81..ba4324daac1 100644
--- a/bundles/binding/org.openhab.binding.sonos/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.sonos/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Sonos Binding
 Bundle-SymbolicName: org.openhab.binding.sonos
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.sonos.internal.SonosActivator
 Bundle-Vendor: openhab.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.sonos/pom.xml b/bundles/binding/org.openhab.binding.sonos/pom.xml
index b15320fa74f..fdc09f9ffb7 100644
--- a/bundles/binding/org.openhab.binding.sonos/pom.xml
+++ b/bundles/binding/org.openhab.binding.sonos/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Sonos Binding</name>
diff --git a/bundles/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF
index 45e9afb010e..568b40cb2d1 100644
--- a/bundles/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.squeezebox/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.gnu.org/licenses/gpl.html
 Bundle-Name: openHAB Squeezebox Binding
 Bundle-SymbolicName: org.openhab.binding.squeezebox
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.squeezebox.internal.SqueezeboxActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Squeezebox binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.squeezebox/pom.xml b/bundles/binding/org.openhab.binding.squeezebox/pom.xml
index e1fb763fc9e..225d6ade7ef 100644
--- a/bundles/binding/org.openhab.binding.squeezebox/pom.xml
+++ b/bundles/binding/org.openhab.binding.squeezebox/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Squeezebox Binding</name>
@@ -24,8 +24,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.swegonventilation/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.swegonventilation/META-INF/MANIFEST.MF
index 725d65d898b..da97febf827 100644
--- a/bundles/binding/org.openhab.binding.swegonventilation/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.swegonventilation/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Ignore-Package: org.openhab.binding.swegonventilation.internal
 Bundle-Name: openHAB Swegon ventilation Binding
 Bundle-SymbolicName: org.openhab.binding.swegonventilation
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.swegonventilation.internal.SwegonVentilationActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Swegon ventilation binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.swegonventilation/pom.xml b/bundles/binding/org.openhab.binding.swegonventilation/pom.xml
index a96119a205f..e006e8befb8 100644
--- a/bundles/binding/org.openhab.binding.swegonventilation/pom.xml
+++ b/bundles/binding/org.openhab.binding.swegonventilation/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Swegon ventilation Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF
index 5c1e322d306..58847ca540d 100644
--- a/bundles/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Systeminfo Binding
 Bundle-SymbolicName: org.openhab.binding.systeminfo
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.systeminfo.internal.SysteminfoActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Systeminfo Binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.systeminfo/pom.xml b/bundles/binding/org.openhab.binding.systeminfo/pom.xml
index ce1e823dd76..7631763fe71 100644
--- a/bundles/binding/org.openhab.binding.systeminfo/pom.xml
+++ b/bundles/binding/org.openhab.binding.systeminfo/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Systeminfo Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.tcp/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.tcp/META-INF/MANIFEST.MF
index 2977f259162..6977e55f0de 100644
--- a/bundles/binding/org.openhab.binding.tcp/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.tcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB TCP-UDP Binding
 Bundle-SymbolicName: org.openhab.binding.tcp
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.tcp.internal.TCPActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -27,7 +27,7 @@ Import-Package: org.apache.commons.lang,
  org.slf4j
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Export-Package: org.openhab.binding.tcp,
- org.openhab.binding.tcp.protocol
+Export-Package: org.openhab.binding.tcp,org.openhab.binding.tcp.protoc
+ ol
 Service-Component: OSGI-INF/tcpgenericbindingprovider.xml, OSGI-INF/tcpbinding.xml,OSGI-INF/udpgenericbindingprovider.xml, OSGI-INF/udpbinding.xml
 
diff --git a/bundles/binding/org.openhab.binding.tcp/pom.xml b/bundles/binding/org.openhab.binding.tcp/pom.xml
index 82fb2655ae2..e6a3b07f5d0 100644
--- a/bundles/binding/org.openhab.binding.tcp/pom.xml
+++ b/bundles/binding/org.openhab.binding.tcp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB TCP/UDP Binding</name>
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.tinkerforge/META-INF/MANIFEST.MF
index 9967751d2ad..a097ed8312f 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.tinkerforge/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB Tinkerforge Binding
 Bundle-SymbolicName: org.openhab.binding.tinkerforge;singleton:=true
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.tinkerforge.internal.TinkerforgeActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the Tinkerforge binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.tinkerforge/pom.xml b/bundles/binding/org.openhab.binding.tinkerforge/pom.xml
index 88c16989d1a..7d456bbb516 100644
--- a/bundles/binding/org.openhab.binding.tinkerforge/pom.xml
+++ b/bundles/binding/org.openhab.binding.tinkerforge/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Tinkerforge Binding</name>
@@ -23,7 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.tivo/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.tivo/META-INF/MANIFEST.MF
index 9760e637149..040273cf0cc 100644
--- a/bundles/binding/org.openhab.binding.tivo/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.tivo/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB tivo Binding
 Bundle-SymbolicName: org.openhab.binding.tivo
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.tivo.internal.TivoActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the tivo binding of the open Home Aut
diff --git a/bundles/binding/org.openhab.binding.tivo/pom.xml b/bundles/binding/org.openhab.binding.tivo/pom.xml
index 84eebca340e..cc58c56aae0 100644
--- a/bundles/binding/org.openhab.binding.tivo/pom.xml
+++ b/bundles/binding/org.openhab.binding.tivo/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB TiVo Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF
index ba855dd9065..d3e25c72c96 100644
--- a/bundles/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.urtsi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Somfy URTSI II Binding
 Bundle-SymbolicName: org.openhab.binding.urtsi
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: gnu.io,
diff --git a/bundles/binding/org.openhab.binding.urtsi/pom.xml b/bundles/binding/org.openhab.binding.urtsi/pom.xml
index 3b77f277224..d7209ca8a29 100644
--- a/bundles/binding/org.openhab.binding.urtsi/pom.xml
+++ b/bundles/binding/org.openhab.binding.urtsi/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Somfy URTSI II Binding</name>
diff --git a/bundles/binding/org.openhab.binding.vdr/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.vdr/META-INF/MANIFEST.MF
index 331c22a05db..78568968ed8 100644
--- a/bundles/binding/org.openhab.binding.vdr/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.vdr/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB VDR Binding
 Bundle-SymbolicName: org.openhab.binding.vdr
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.vdr.internal.VDRActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/binding/org.openhab.binding.vdr/pom.xml b/bundles/binding/org.openhab.binding.vdr/pom.xml
index c42ac9258d1..63f362e5657 100644
--- a/bundles/binding/org.openhab.binding.vdr/pom.xml
+++ b/bundles/binding/org.openhab.binding.vdr/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB VDR Binding</name>
diff --git a/bundles/binding/org.openhab.binding.wol/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.wol/META-INF/MANIFEST.MF
index e66650740b5..e443d7e1ee6 100644
--- a/bundles/binding/org.openhab.binding.wol/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.wol/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.wol.internal
 Ignore-Package: org.openhab.binding.wol.internal
 Bundle-Name: openHAB WoL Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.wol.internal.WolActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/binding/org.openhab.binding.wol/pom.xml b/bundles/binding/org.openhab.binding.wol/pom.xml
index c4b3e85934c..6e44e9968d6 100644
--- a/bundles/binding/org.openhab.binding.wol/pom.xml
+++ b/bundles/binding/org.openhab.binding.wol/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Wake-on-LAN binding</name>
diff --git a/bundles/binding/org.openhab.binding.zwave/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.zwave/META-INF/MANIFEST.MF
index 9418260afe7..609bb0f3a90 100644
--- a/bundles/binding/org.openhab.binding.zwave/META-INF/MANIFEST.MF
+++ b/bundles/binding/org.openhab.binding.zwave/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB ZWave Binding
 Bundle-SymbolicName: org.openhab.binding.zwave
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.binding.zwave.internal.ZWaveActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the ZWave binding of the open Home Aut
@@ -25,8 +25,8 @@ Import-Package: gnu.io,
  org.osgi.service.component,
  org.osgi.service.event,
  org.slf4j
-Export-Package: org.openhab.binding.zwave,
- org.openhab.binding.zwave.internal.config
+Export-Package: org.openhab.binding.zwave,org.openhab.binding.zwave.in
+ ternal.config
 Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Service-Component: OSGI-INF/activebinding.xml, OSGI-INF/genericbindingprovider.xml
diff --git a/bundles/binding/org.openhab.binding.zwave/pom.xml b/bundles/binding/org.openhab.binding.zwave/pom.xml
index e8802b997e4..76bf53c9231 100644
--- a/bundles/binding/org.openhab.binding.zwave/pom.xml
+++ b/bundles/binding/org.openhab.binding.zwave/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB ZWave Binding</name>
@@ -23,8 +23,6 @@
 
 	<packaging>eclipse-plugin</packaging>
 
-	<version>1.4.0-SNAPSHOT</version>
-
 	<build>
 		<plugins>
 			<plugin>
diff --git a/bundles/binding/pom.xml b/bundles/binding/pom.xml
index c9f0ea2f012..2b8f2ac9cbe 100644
--- a/bundles/binding/pom.xml
+++ b/bundles/binding/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/config/org.openhab.config.core/META-INF/MANIFEST.MF b/bundles/config/org.openhab.config.core/META-INF/MANIFEST.MF
index 44ce2b8a146..5f4a13dba29 100644
--- a/bundles/config/org.openhab.config.core/META-INF/MANIFEST.MF
+++ b/bundles/config/org.openhab.config.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Config Core
 Bundle-SymbolicName: org.openhab.config.core
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.io,
diff --git a/bundles/config/org.openhab.config.core/pom.xml b/bundles/config/org.openhab.config.core/pom.xml
index 1dd6dd0b837..bbba23b6c5c 100644
--- a/bundles/config/org.openhab.config.core/pom.xml
+++ b/bundles/config/org.openhab.config.core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>config</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/config/pom.xml b/bundles/config/pom.xml
index 50c95d59b51..ce84a804a32 100644
--- a/bundles/config/pom.xml
+++ b/bundles/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/core/org.openhab.core.autoupdate/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.autoupdate/META-INF/MANIFEST.MF
index bcae01f5fd4..55776f526ac 100644
--- a/bundles/core/org.openhab.core.autoupdate/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.autoupdate/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.core.autoupdate.internal
 Ignore-Package: org.openhab.core.autoupdate.internal
 Bundle-Name: openHAB AutoUpdate Binding
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.core.autoupdate.internal.AutoUpdateActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/core/org.openhab.core.autoupdate/pom.xml b/bundles/core/org.openhab.core.autoupdate/pom.xml
index b0873101739..5eef7ca9f1f 100644
--- a/bundles/core/org.openhab.core.autoupdate/pom.xml
+++ b/bundles/core/org.openhab.core.autoupdate/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.drools/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.drools/META-INF/MANIFEST.MF
index 8af269c0b8b..3ed82e556b6 100644
--- a/bundles/core/org.openhab.core.drools/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.drools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.core.drools.internal
 Ignore-Package: org.openhab.core.drools.internal
 Bundle-Name: openHAB Drools Rule Engine
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.core.drools.internal.RulesActivator
 Bundle-ManifestVersion: 2
 Eclipse-BuddyPolicy: registered
@@ -47,5 +47,5 @@ Bundle-ClassPath: .,
  lib/xpp3_min.jar,
  lib/xstream.jar
 Require-Bundle: org.eclipse.jdt.core
-Export-Package: org.openhab.core.drools.actions,
- org.openhab.core.drools.event
+Export-Package: org.openhab.core.drools.actions,org.openhab.core.drool
+ s.event
diff --git a/bundles/core/org.openhab.core.drools/pom.xml b/bundles/core/org.openhab.core.drools/pom.xml
index 3c79dbe6cc4..8fc072355df 100644
--- a/bundles/core/org.openhab.core.drools/pom.xml
+++ b/bundles/core/org.openhab.core.drools/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.library.test/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.library.test/META-INF/MANIFEST.MF
index 0adc9cf324b..151a1364bb7 100644
--- a/bundles/core/org.openhab.core.library.test/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.library.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the openHAB Core Library
 Bundle-SymbolicName: org.openhab.core.library.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.core.library
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/core/org.openhab.core.library.test/pom.xml b/bundles/core/org.openhab.core.library.test/pom.xml
index 2ff9db92d92..8f44d26feab 100644
--- a/bundles/core/org.openhab.core.library.test/pom.xml
+++ b/bundles/core/org.openhab.core.library.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.library/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.library/META-INF/MANIFEST.MF
index 48d2c682a3c..7d4d9757940 100644
--- a/bundles/core/org.openhab.core.library/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.library/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: openHAB Core Library
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.core.library.internal.CoreLibraryActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the runtime component of the open Home Aut
@@ -15,6 +15,6 @@ Import-Package: org.openhab.core.events,
  org.openhab.core.items,
  org.openhab.core.types,
  org.osgi.framework
-Export-Package: org.openhab.core.library.items,
- org.openhab.core.library.types
+Export-Package: org.openhab.core.library.items,org.openhab.core.librar
+ y.types
 Service-Component: OSGI-INF/itemfactory.xml
diff --git a/bundles/core/org.openhab.core.library/pom.xml b/bundles/core/org.openhab.core.library/pom.xml
index 34cca876a40..793d160c6e1 100644
--- a/bundles/core/org.openhab.core.library/pom.xml
+++ b/bundles/core/org.openhab.core.library/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.persistence.test/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.persistence.test/META-INF/MANIFEST.MF
index d2150a868af..def817ac4a7 100644
--- a/bundles/core/org.openhab.core.persistence.test/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.persistence.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Persistence Tests
 Bundle-SymbolicName: org.openhab.core.persistence.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.core.persistence
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/core/org.openhab.core.persistence.test/pom.xml b/bundles/core/org.openhab.core.persistence.test/pom.xml
index 4fdf9d8ef27..0f2aac1d17f 100644
--- a/bundles/core/org.openhab.core.persistence.test/pom.xml
+++ b/bundles/core/org.openhab.core.persistence.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.persistence/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.persistence/META-INF/MANIFEST.MF
index 50cca009172..ea4e8fabb60 100644
--- a/bundles/core/org.openhab.core.persistence/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.persistence/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: openHAB Core Persistence
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-SymbolicName: org.openhab.core.persistence
@@ -31,12 +31,9 @@ Import-Package: org.apache.commons.lang,
  org.slf4j
 Service-Component: OSGI-INF/persistenceextension.xml,
  OSGI-INF/persistencemanager.xml
-Export-Package: org.joda.time,
- org.joda.time.base,
- org.joda.time.field,
- org.joda.time.format,
- org.openhab.core.persistence,
- org.openhab.core.persistence.extensions
+Export-Package: org.joda.time,org.joda.time.base,org.joda.time.field,o
+ rg.joda.time.format,org.openhab.core.persistence,org.openhab.core.per
+ sistence.extensions
 Bundle-ClassPath: lib/joda-time-2.1.jar,
  .
 Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4"
diff --git a/bundles/core/org.openhab.core.persistence/pom.xml b/bundles/core/org.openhab.core.persistence/pom.xml
index eac024fc275..7b96966c4c0 100644
--- a/bundles/core/org.openhab.core.persistence/pom.xml
+++ b/bundles/core/org.openhab.core.persistence/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.scheduler/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.scheduler/META-INF/MANIFEST.MF
index f7a28ad930e..3edc9a34454 100644
--- a/bundles/core/org.openhab.core.scheduler/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.scheduler/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.core.scheduler.internal
 Ignore-Package: org.openhab.core.scheduler.internal
 Bundle-Name: openHAB Scheduler Service
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: This is the Scheduler Service of the open Home Aut
@@ -13,11 +13,8 @@ Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/quartz-all-2.1.7.jar,
  .
-Export-Package: org.quartz,
- org.quartz.impl,
- org.quartz.impl.calendar,
- org.quartz.impl.matchers,
- org.quartz.utils
+Export-Package: org.quartz,org.quartz.impl,org.quartz.impl.calendar,or
+ g.quartz.impl.matchers,org.quartz.utils
 Import-Package: org.osgi.framework,
  org.osgi.service.component,
  org.slf4j;version="1.5.11"
diff --git a/bundles/core/org.openhab.core.scheduler/pom.xml b/bundles/core/org.openhab.core.scheduler/pom.xml
index f6429a10da2..86ca4e1ab3b 100644
--- a/bundles/core/org.openhab.core.scheduler/pom.xml
+++ b/bundles/core/org.openhab.core.scheduler/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.scriptengine/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.scriptengine/META-INF/MANIFEST.MF
index ae16fe02a4b..770926e82aa 100644
--- a/bundles/core/org.openhab.core.scriptengine/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.scriptengine/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Script Engine
 Bundle-SymbolicName: org.openhab.core.scriptengine
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.openhab.core.scriptengine,
- org.openhab.core.scriptengine.action
+Export-Package: org.openhab.core.scriptengine,org.openhab.core.scripte
+ ngine.action
 Import-Package: org.eclipse.emf.ecore.resource,
  org.eclipse.xtext.diagnostics,
  org.eclipse.xtext.validation,
diff --git a/bundles/core/org.openhab.core.scriptengine/pom.xml b/bundles/core/org.openhab.core.scriptengine/pom.xml
index 11a3d453d44..7002c5558bc 100644
--- a/bundles/core/org.openhab.core.scriptengine/pom.xml
+++ b/bundles/core/org.openhab.core.scriptengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.test/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.test/META-INF/MANIFEST.MF
index 811d74b0480..7669cf5035e 100644
--- a/bundles/core/org.openhab.core.test/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the openHAB Core
 Bundle-SymbolicName: org.openhab.core.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/core/org.openhab.core.test/pom.xml b/bundles/core/org.openhab.core.test/pom.xml
index 395fb4a330d..7e4a75e28db 100644
--- a/bundles/core/org.openhab.core.test/pom.xml
+++ b/bundles/core/org.openhab.core.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.transform.test/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.transform.test/META-INF/MANIFEST.MF
index 11facfa0d27..10b4dd34f58 100644
--- a/bundles/core/org.openhab.core.transform.test/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.transform.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the openHAB Transformation Service
 Bundle-SymbolicName: org.openhab.core.transform.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.core.transform
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/core/org.openhab.core.transform.test/pom.xml b/bundles/core/org.openhab.core.transform.test/pom.xml
index d5ec57854a7..5b1e8c72230 100644
--- a/bundles/core/org.openhab.core.transform.test/pom.xml
+++ b/bundles/core/org.openhab.core.transform.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core.transform/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core.transform/META-INF/MANIFEST.MF
index 4e8742c3964..464f03d6366 100644
--- a/bundles/core/org.openhab.core.transform/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core.transform/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.binding.http.internal
 Ignore-Package: org.openhab.binding.http.internal
 Bundle-Name: openHAB Transformation Service
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.core.transform.internal.TransformationActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
@@ -38,5 +38,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/regexservice.xml, OSGI-INF/xpathservice.xml, OSGI-INF/xsltservice.xml,
   OSGI-INF/execservice.xml,  OSGI-INF/javascriptservice.xml, OSGI-INF/mapservice.xml, OSGI-INF/transformationaction.xml
 Bundle-ClassPath: .
-Export-Package: org.openhab.core.transform,
- org.openhab.core.transform.actions
+Export-Package: org.openhab.core.transform,org.openhab.core.transform.
+ actions
diff --git a/bundles/core/org.openhab.core.transform/pom.xml b/bundles/core/org.openhab.core.transform/pom.xml
index 6bd0fa2e03e..3e4247dbd62 100644
--- a/bundles/core/org.openhab.core.transform/pom.xml
+++ b/bundles/core/org.openhab.core.transform/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/org.openhab.core/META-INF/MANIFEST.MF b/bundles/core/org.openhab.core/META-INF/MANIFEST.MF
index 70f97323e3a..df8d0936835 100644
--- a/bundles/core/org.openhab.core/META-INF/MANIFEST.MF
+++ b/bundles/core/org.openhab.core/META-INF/MANIFEST.MF
@@ -1,9 +1,8 @@
 Manifest-Version: 1.0
-Export-Package: org.openhab.core.binding,
- org.openhab.core.events;uses:="org.openhab.core.items,org.osgi.service.event,org.openhab.core.types",
- org.openhab.core.items;uses:="org.openhab.core.types,org.openhab.core.events",
- org.openhab.core.service,
- org.openhab.core.types
+Export-Package: org.openhab.core.binding,org.openhab.core.events;uses:
+ ="org.openhab.core.items,org.osgi.service.event,org.openhab.core.type
+ s",org.openhab.core.items;uses:="org.openhab.core.types,org.openhab.c
+ ore.events",org.openhab.core.service,org.openhab.core.types
 Service-Component: OSGI-INF/eventpublisher.xml,OSGI-INF/itemregistry.xml,OSGI-INF/logservice.xml, OSGI-INF/itemupdater.xml
 Private-Package: org.openhab.core.internal,org.openhab.core.internal.e
  vents,org.openhab.core.internal.items,org.openhab.core.internal.loggi
@@ -14,7 +13,7 @@ Ignore-Package: org.openhab.core.internal.items,org.openhab.core.inter
 Bundle-Name: openHAB Core
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.core.internal.CoreActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the runtime component of the open Home Aut
diff --git a/bundles/core/org.openhab.core/pom.xml b/bundles/core/org.openhab.core/pom.xml
index 76eed0413cd..e65838f3064 100644
--- a/bundles/core/org.openhab.core/pom.xml
+++ b/bundles/core/org.openhab.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>core</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 99e4610d18d..f133394eaa6 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/designer/org.openhab.designer.core/META-INF/MANIFEST.MF b/bundles/designer/org.openhab.designer.core/META-INF/MANIFEST.MF
index f09074a4e8a..687dce16fdd 100644
--- a/bundles/designer/org.openhab.designer.core/META-INF/MANIFEST.MF
+++ b/bundles/designer/org.openhab.designer.core/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Designer Core
 Bundle-SymbolicName: org.openhab.designer.core; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.designer.core.CoreActivator
 Bundle-Vendor: openHAB.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.openhab.designer.core,
- org.openhab.designer.core.config
+Export-Package: org.openhab.designer.core,org.openhab.designer.core.co
+ nfig
 Import-Package: org.openhab.config.core,
  org.slf4j
diff --git a/bundles/designer/org.openhab.designer.core/pom.xml b/bundles/designer/org.openhab.designer.core/pom.xml
index fc1c70d355e..e36ff24f20e 100644
--- a/bundles/designer/org.openhab.designer.core/pom.xml
+++ b/bundles/designer/org.openhab.designer.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>designer</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/designer/org.openhab.designer.ui/META-INF/MANIFEST.MF b/bundles/designer/org.openhab.designer.ui/META-INF/MANIFEST.MF
index 33fd97a3eef..1b3a44edc50 100644
--- a/bundles/designer/org.openhab.designer.ui/META-INF/MANIFEST.MF
+++ b/bundles/designer/org.openhab.designer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Designer UI
 Bundle-SymbolicName: org.openhab.designer.ui; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.designer.ui.UIActivator
 Bundle-Vendor: openHAB.org
 Require-Bundle: org.eclipse.ui,
diff --git a/bundles/designer/org.openhab.designer.ui/pom.xml b/bundles/designer/org.openhab.designer.ui/pom.xml
index 07c93d9ae26..b9f73f51516 100644
--- a/bundles/designer/org.openhab.designer.ui/pom.xml
+++ b/bundles/designer/org.openhab.designer.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>designer</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/designer/pom.xml b/bundles/designer/pom.xml
index 4d9e7b2ee98..6aa764b093b 100644
--- a/bundles/designer/pom.xml
+++ b/bundles/designer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/io/org.openhab.io.console/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.console/META-INF/MANIFEST.MF
index 02499ec7cb1..beb5be4284a 100644
--- a/bundles/io/org.openhab.io.console/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.console/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: openHAB Console
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.io.console.internal.ConsoleActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the runtime component of the open Home Aut
diff --git a/bundles/io/org.openhab.io.console/pom.xml b/bundles/io/org.openhab.io.console/pom.xml
index 6dcc0c8edff..5328da98872 100644
--- a/bundles/io/org.openhab.io.console/pom.xml
+++ b/bundles/io/org.openhab.io.console/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.cv/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.cv/META-INF/MANIFEST.MF
index 985f52c2de9..94ad36e924a 100644
--- a/bundles/io/org.openhab.io.cv/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.cv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB CV Interface Bundle
 Bundle-SymbolicName: org.openhab.io.cv
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.sun.jersey.api.core.servlet,
@@ -40,11 +40,7 @@ Service-Component: OSGI-INF/cvapplication.xml
 Require-Bundle: org.openhab.io.rest.lib,
  javax.servlet,
  org.openhab.io.servicediscovery
-Export-Package: org.openhab.io.cv;
-  uses:="org.openhab.core.items,
-   org.openhab.model.core,
-   org.openhab.io.servicediscovery,
-   com.sun.jersey.api.core,
-   org.openhab.core.events,
-   org.osgi.service.http,
-   org.openhab.ui.items"
+Export-Package: org.openhab.io.cv; uses:="org.openhab.core.items,  org
+ .openhab.model.core,  org.openhab.io.servicediscovery,  com.sun.jerse
+ y.api.core,  org.openhab.core.events,  org.osgi.service.http,  org.op
+ enhab.ui.items"
diff --git a/bundles/io/org.openhab.io.cv/pom.xml b/bundles/io/org.openhab.io.cv/pom.xml
index 4d3ed2544a1..c091aedf366 100644
--- a/bundles/io/org.openhab.io.cv/pom.xml
+++ b/bundles/io/org.openhab.io.cv/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>io</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB CV Interface</name>
diff --git a/bundles/io/org.openhab.io.dropbox/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.dropbox/META-INF/MANIFEST.MF
index 9349b03c8e3..c8ed9f4de9b 100644
--- a/bundles/io/org.openhab.io.dropbox/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.dropbox/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Ignore-Package: org.openhab.io.dropbox.internal
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Dropbox IO Bundle
 Bundle-SymbolicName: org.openhab.io.dropbox
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.io.dropbox.internal.DropboxActivator
 Bundle-Vendor: openHAB.org
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/io/org.openhab.io.dropbox/pom.xml b/bundles/io/org.openhab.io.dropbox/pom.xml
index fe9d4b33dfb..ae9cfa7e456 100644
--- a/bundles/io/org.openhab.io.dropbox/pom.xml
+++ b/bundles/io/org.openhab.io.dropbox/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>io</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Dropbox Connector</name>
diff --git a/bundles/io/org.openhab.io.gcal.test/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.gcal.test/META-INF/MANIFEST.MF
index 4c6f6f28387..2768cc08ce9 100644
--- a/bundles/io/org.openhab.io.gcal.test/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.gcal.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: This is the Test-Bundle for the Google Calendar enhancement
  of the open Home Automation Bus (openHAB)
 Bundle-SymbolicName: org.openhab.io.gcal.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Fragment-Host: org.openhab.io.gcal
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit;bundle-version="4.8.2"
diff --git a/bundles/io/org.openhab.io.gcal.test/pom.xml b/bundles/io/org.openhab.io.gcal.test/pom.xml
index d616a93d0eb..4669f00fcda 100644
--- a/bundles/io/org.openhab.io.gcal.test/pom.xml
+++ b/bundles/io/org.openhab.io.gcal.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.gcal/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.gcal/META-INF/MANIFEST.MF
index b89702c8222..4fa01d39b96 100644
--- a/bundles/io/org.openhab.io.gcal/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.gcal/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.io.gcal.internal
 Ignore-Package: org.openhab.io.gcal.internal
 Bundle-Name: openHAB Google Calendar
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.io.gcal.internal.GCalActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
@@ -42,9 +42,6 @@ Bundle-ClassPath: .,
  lib/gdata-client-1.0.jar,
  lib/gdata-core-1.0.jar,
  lib/jsr305.jar
-Export-Package: com.google.gdata.client,
- com.google.gdata.client.calendar,
- com.google.gdata.data,
- com.google.gdata.data.calendar,
- com.google.gdata.data.extensions,
- com.google.gdata.util
+Export-Package: com.google.gdata.client,com.google.gdata.client.calend
+ ar,com.google.gdata.data,com.google.gdata.data.calendar,com.google.gd
+ ata.data.extensions,com.google.gdata.util
diff --git a/bundles/io/org.openhab.io.gcal/pom.xml b/bundles/io/org.openhab.io.gcal/pom.xml
index b5ac69a53c2..17bd276323d 100644
--- a/bundles/io/org.openhab.io.gcal/pom.xml
+++ b/bundles/io/org.openhab.io.gcal/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.monitor/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.monitor/META-INF/MANIFEST.MF
index 3d57e51b791..c396486c0ab 100644
--- a/bundles/io/org.openhab.io.monitor/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.monitor/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Private-Package: org.openhab.core.monitor.internal
 Ignore-Package: org.openhab.core.monitor.internal
 Bundle-Name: openHAB Monitor
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.io.monitor.internal.MonitorActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the runtime component of the open Home Aut
diff --git a/bundles/io/org.openhab.io.monitor/pom.xml b/bundles/io/org.openhab.io.monitor/pom.xml
index 3af9294d41f..3d143763aec 100644
--- a/bundles/io/org.openhab.io.monitor/pom.xml
+++ b/bundles/io/org.openhab.io.monitor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.multimedia.tts.freetts/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.multimedia.tts.freetts/META-INF/MANIFEST.MF
index 927b08bfdb3..a2c66863859 100644
--- a/bundles/io/org.openhab.io.multimedia.tts.freetts/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.multimedia.tts.freetts/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Multimedia FreeTTS
 Bundle-SymbolicName: org.openhab.io.multimedia.tts.freetts
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .,
diff --git a/bundles/io/org.openhab.io.multimedia.tts.freetts/pom.xml b/bundles/io/org.openhab.io.multimedia.tts.freetts/pom.xml
index e8ded704893..1df334a2566 100644
--- a/bundles/io/org.openhab.io.multimedia.tts.freetts/pom.xml
+++ b/bundles/io/org.openhab.io.multimedia.tts.freetts/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>io</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Multimedia FreeTTS</name>
diff --git a/bundles/io/org.openhab.io.multimedia.tts.marytts/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.multimedia.tts.marytts/META-INF/MANIFEST.MF
index 52307c5b91f..bfb39461b52 100644
--- a/bundles/io/org.openhab.io.multimedia.tts.marytts/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.multimedia.tts.marytts/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Multimedia MaryTTS
 Bundle-SymbolicName: org.openhab.io.multimedia.tts.marytts
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .,
diff --git a/bundles/io/org.openhab.io.multimedia.tts.marytts/pom.xml b/bundles/io/org.openhab.io.multimedia.tts.marytts/pom.xml
index 1bd6101847f..5174ef1aeeb 100644
--- a/bundles/io/org.openhab.io.multimedia.tts.marytts/pom.xml
+++ b/bundles/io/org.openhab.io.multimedia.tts.marytts/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>io</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Multimedia MaryTTS</name>
diff --git a/bundles/io/org.openhab.io.multimedia/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.multimedia/META-INF/MANIFEST.MF
index 8758ecef3c5..4c54451501a 100644
--- a/bundles/io/org.openhab.io.multimedia/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.multimedia/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Multimedia I/O Bundle
 Bundle-SymbolicName: org.openhab.io.multimedia
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Eclipse-RegisterBuddy: org.openhab.core.drools
@@ -16,8 +16,8 @@ Import-Package: org.apache.commons.collections,
  org.openhab.core.scriptengine.action,
  org.osgi.framework,
  org.slf4j
-Export-Package: org.openhab.io.multimedia.actions,
- org.openhab.io.multimedia.tts
+Export-Package: org.openhab.io.multimedia.actions,org.openhab.io.multi
+ media.tts
 Service-Component: OSGI-INF/tts_mac.xml,
  OSGI-INF/audioaction.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/io/org.openhab.io.multimedia/pom.xml b/bundles/io/org.openhab.io.multimedia/pom.xml
index 7ec5f0f4a3b..270fa6834f3 100644
--- a/bundles/io/org.openhab.io.multimedia/pom.xml
+++ b/bundles/io/org.openhab.io.multimedia/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.net.test/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.net.test/META-INF/MANIFEST.MF
index 969f408f2d2..022db4cb94b 100644
--- a/bundles/io/org.openhab.io.net.test/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.net.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Network I/O bundle
 Bundle-SymbolicName: org.openhab.io.net.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.io.net
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/io/org.openhab.io.net.test/pom.xml b/bundles/io/org.openhab.io.net.test/pom.xml
index d11d1d1615a..7af874a00e3 100644
--- a/bundles/io/org.openhab.io.net.test/pom.xml
+++ b/bundles/io/org.openhab.io.net.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.net/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.net/META-INF/MANIFEST.MF
index a97f817906f..2c542d3f93e 100644
--- a/bundles/io/org.openhab.io.net/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Net I/O Bundle
 Bundle-SymbolicName: org.openhab.io.net
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Eclipse-RegisterBuddy: org.openhab.core.drools
@@ -25,9 +25,8 @@ Import-Package: javax.servlet;version="2.6.0",
  org.osgi.service.http,
  org.slf4j
 Bundle-ClassPath: .
-Export-Package: org.openhab.io.net.actions,
- org.openhab.io.net.exec,
- org.openhab.io.net.http
+Export-Package: org.openhab.io.net.actions,org.openhab.io.net.exec,org
+ .openhab.io.net.http
 Service-Component: OSGI-INF/securehttpcontext.xml, OSGI-INF/pingaction.xml, OSGI-INF/httpaction.xml,
  OSGI-INF/execaction.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/io/org.openhab.io.net/pom.xml b/bundles/io/org.openhab.io.net/pom.xml
index 50d2ec11ece..c2f143fdea9 100644
--- a/bundles/io/org.openhab.io.net/pom.xml
+++ b/bundles/io/org.openhab.io.net/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF
index e651eba0b6f..3cca326e196 100644
--- a/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB REST libraries Bundle
 Bundle-SymbolicName: org.openhab.io.rest.lib
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/jackson-core-asl-1.9.2.jar,
@@ -38,24 +38,12 @@ Import-Package: com.sun.jersey.api.core,
  org.osgi.framework,
  org.slf4j
 DynamicImport-Package: *
-Export-Package: com.sun.jersey.api.client,
- com.sun.jersey.api.core,
- com.sun.jersey.api.core.servlet,
- com.sun.jersey.api.json,
- com.sun.jersey.core.osgi,
- com.sun.jersey.core.util,
- com.sun.jersey.spi.container,
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.ext,
- org.atmosphere,
- org.atmosphere.annotation,
- org.atmosphere.cache,
- org.atmosphere.cpr,
- org.atmosphere.jersey,
- org.atmosphere.util,
- org.codehaus.jackson;version="1.9.2",
- org.codehaus.jackson.annotate;version="1.9.2",
- org.codehaus.jackson.map;version="1.9.2",
- org.codehaus.jackson.type;version="1.9.2"
+Export-Package: com.sun.jersey.api.client,com.sun.jersey.api.core,com.
+ sun.jersey.api.core.servlet,com.sun.jersey.api.json,com.sun.jersey.co
+ re.osgi,com.sun.jersey.core.util,com.sun.jersey.spi.container,javax.w
+ s.rs,javax.ws.rs.core,javax.ws.rs.ext,org.atmosphere,org.atmosphere.a
+ nnotation,org.atmosphere.cache,org.atmosphere.cpr,org.atmosphere.jers
+ ey,org.atmosphere.util,org.codehaus.jackson;version="1.9.2",org.codeh
+ aus.jackson.annotate;version="1.9.2",org.codehaus.jackson.map;version
+ ="1.9.2",org.codehaus.jackson.type;version="1.9.2"
 Require-Bundle: javax.servlet
diff --git a/bundles/io/org.openhab.io.rest.lib/pom.xml b/bundles/io/org.openhab.io.rest.lib/pom.xml
index 0a7e2a0d1e1..ca32dfc9dd3 100644
--- a/bundles/io/org.openhab.io.rest.lib/pom.xml
+++ b/bundles/io/org.openhab.io.rest.lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.openhab.bundles</groupId>
   	<artifactId>io</artifactId>
-  	<version>1.4.0-SNAPSHOT</version>
+  	<version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.rest/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.rest/META-INF/MANIFEST.MF
index efc3c0c53a8..aee0c9cb49a 100644
--- a/bundles/io/org.openhab.io.rest/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.rest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB REST Interface Bundle
 Bundle-SymbolicName: org.openhab.io.rest
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.google.common.collect;version="10.0.1",
diff --git a/bundles/io/org.openhab.io.rest/pom.xml b/bundles/io/org.openhab.io.rest/pom.xml
index dc8a6b04147..45d398292a1 100644
--- a/bundles/io/org.openhab.io.rest/pom.xml
+++ b/bundles/io/org.openhab.io.rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.servicediscovery/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.servicediscovery/META-INF/MANIFEST.MF
index 449098102e9..079522b4ffa 100644
--- a/bundles/io/org.openhab.io.servicediscovery/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.servicediscovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Bonjour/MDS Service Discovery Bundle
 Bundle-SymbolicName: org.openhab.io.servicediscovery
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.io.servicediscovery.internal.DiscoveryServiceActivator
 Service-Component: OSGI-INF/servicediscovery.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/io/org.openhab.io.servicediscovery/pom.xml b/bundles/io/org.openhab.io.servicediscovery/pom.xml
index 2b0a4163b59..cc3a3b5a0c0 100644
--- a/bundles/io/org.openhab.io.servicediscovery/pom.xml
+++ b/bundles/io/org.openhab.io.servicediscovery/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.squeezeserver/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.squeezeserver/META-INF/MANIFEST.MF
index 3eed6072b54..8dcc951f05e 100644
--- a/bundles/io/org.openhab.io.squeezeserver/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.squeezeserver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Squeeze Server Bundle
 Bundle-SymbolicName: org.openhab.io.squeezeserver;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.openhab.io.squeezeserver
diff --git a/bundles/io/org.openhab.io.squeezeserver/pom.xml b/bundles/io/org.openhab.io.squeezeserver/pom.xml
index 5925e96b64e..be093889066 100644
--- a/bundles/io/org.openhab.io.squeezeserver/pom.xml
+++ b/bundles/io/org.openhab.io.squeezeserver/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>io</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Squeeze Server</name>
diff --git a/bundles/io/org.openhab.io.transport.cul/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.transport.cul/META-INF/MANIFEST.MF
index 7ba26e324d6..d38cc928376 100644
--- a/bundles/io/org.openhab.io.transport.cul/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.transport.cul/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB CUL Transport Bundle
 Bundle-SymbolicName: org.openhab.io.transport.cul
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: gnu.io,
diff --git a/bundles/io/org.openhab.io.transport.cul/pom.xml b/bundles/io/org.openhab.io.transport.cul/pom.xml
index 65f75771183..25b508a49ef 100644
--- a/bundles/io/org.openhab.io.transport.cul/pom.xml
+++ b/bundles/io/org.openhab.io.transport.cul/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.openhab.bundles</groupId>
   	<artifactId>io</artifactId>
-  	<version>1.4.0-SNAPSHOT</version>
+  	<version>1.4.0</version>
   </parent>
 
   <properties>
@@ -20,5 +20,4 @@
 
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.4.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+  </project>
\ No newline at end of file
diff --git a/bundles/io/org.openhab.io.transport.mqtt/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.transport.mqtt/META-INF/MANIFEST.MF
index eafe7de39a2..5821d283f67 100644
--- a/bundles/io/org.openhab.io.transport.mqtt/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.transport.mqtt/META-INF/MANIFEST.MF
@@ -2,14 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB MQTT Transport Bundle
 Bundle-SymbolicName: org.openhab.io.transport.mqtt;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.paho.client.mqttv3,
- org.eclipse.paho.client.mqttv3.logging,
- org.eclipse.paho.client.mqttv3.persist,
- org.eclipse.paho.client.mqttv3.util,
- org.openhab.io.transport.mqtt
+Export-Package: org.eclipse.paho.client.mqttv3,org.eclipse.paho.client
+ .mqttv3.logging,org.eclipse.paho.client.mqttv3.persist,org.eclipse.pa
+ ho.client.mqttv3.util,org.openhab.io.transport.mqtt
 Import-Package: org.apache.commons.lang;version="2.6.0",
  org.eclipse.paho.client.mqttv3,
  org.openhab.core.events,
diff --git a/bundles/io/org.openhab.io.transport.mqtt/pom.xml b/bundles/io/org.openhab.io.transport.mqtt/pom.xml
index d84c4d60a18..8ffa349a56c 100644
--- a/bundles/io/org.openhab.io.transport.mqtt/pom.xml
+++ b/bundles/io/org.openhab.io.transport.mqtt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.openhab.bundles</groupId>
   	<artifactId>io</artifactId>
-  	<version>1.4.0-SNAPSHOT</version>
+  	<version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF
index f4481272272..361790859d1 100644
--- a/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF
+++ b/bundles/io/org.openhab.io.transport.serial/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Serial Transport Bundle
 Bundle-SymbolicName: org.openhab.io.transport.serial
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/nrjavaserial-3.8.8.jar
diff --git a/bundles/io/org.openhab.io.transport.serial/pom.xml b/bundles/io/org.openhab.io.transport.serial/pom.xml
index 1354ce8e784..7fef50defaa 100644
--- a/bundles/io/org.openhab.io.transport.serial/pom.xml
+++ b/bundles/io/org.openhab.io.transport.serial/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>org.openhab.bundles</groupId>
   	<artifactId>io</artifactId>
-  	<version>1.4.0-SNAPSHOT</version>
+  	<version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/io/pom.xml b/bundles/io/pom.xml
index 07740fec557..0077eba8241 100644
--- a/bundles/io/pom.xml
+++ b/bundles/io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/library/org.openhab.library.tel/META-INF/MANIFEST.MF b/bundles/library/org.openhab.library.tel/META-INF/MANIFEST.MF
index 01f4cb2d436..1dcc12b75d7 100644
--- a/bundles/library/org.openhab.library.tel/META-INF/MANIFEST.MF
+++ b/bundles/library/org.openhab.library.tel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: openHAB Addon Library Telephony
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the runtime component of the open Home Aut
  omation Bus (openHAB)
@@ -16,7 +16,7 @@ Import-Package: org.apache.commons.lang,
  org.openhab.core.library.types,
  org.openhab.core.types,
  org.osgi.framework
-Export-Package: org.openhab.library.tel.items,
- org.openhab.library.tel.types
+Export-Package: org.openhab.library.tel.items,org.openhab.library.tel.
+ types
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/itemfactory.xml
diff --git a/bundles/library/org.openhab.library.tel/pom.xml b/bundles/library/org.openhab.library.tel/pom.xml
index 40ab1a03464..3bcc6ab0a96 100644
--- a/bundles/library/org.openhab.library.tel/pom.xml
+++ b/bundles/library/org.openhab.library.tel/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>library</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/library/pom.xml b/bundles/library/pom.xml
index 62f69a82b6d..75f78ca20fd 100644
--- a/bundles/library/pom.xml
+++ b/bundles/library/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/model/org.openhab.model.core/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.core/META-INF/MANIFEST.MF
index 197792caa3a..fbd9d7ea8de 100644
--- a/bundles/model/org.openhab.model.core/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Model Core
 Bundle-SymbolicName: org.openhab.model.core
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.model.core.internal.ModelCoreActivator
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/model/org.openhab.model.core/pom.xml b/bundles/model/org.openhab.model.core/pom.xml
index 1b21565271d..aa476f9c23b 100644
--- a/bundles/model/org.openhab.model.core/pom.xml
+++ b/bundles/model/org.openhab.model.core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.item.ui/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.item.ui/META-INF/MANIFEST.MF
index 89cb360a629..c52be5daa75 100644
--- a/bundles/model/org.openhab.model.item.ui/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.item.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Item Editor UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.item.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.openhab.model.item;visibility:=reexport,
@@ -17,7 +17,7 @@ Import-Package: org.apache.log4j,
  org.openhab.core.items,
  org.openhab.designer.ui,
  org.osgi.service.event
-Export-Package: org.openhab.model.ui.contentassist.antlr,
- org.openhab.model.ui.contentassist
+Export-Package: org.openhab.model.ui.contentassist.antlr,org.openhab.m
+ odel.ui.contentassist
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Activator: org.openhab.model.ui.internal.ItemsActivator
diff --git a/bundles/model/org.openhab.model.item.ui/pom.xml b/bundles/model/org.openhab.model.item.ui/pom.xml
index f887ef888fa..badec466feb 100644
--- a/bundles/model/org.openhab.model.item.ui/pom.xml
+++ b/bundles/model/org.openhab.model.item.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.item/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.item/META-INF/MANIFEST.MF
index 4b85852fe33..534c0d88437 100644
--- a/bundles/model/org.openhab.model.item/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.item/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Item Model
 Bundle-Vendor: openHABorg
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.item; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
@@ -17,18 +17,12 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.emf.common,
  org.antlr.runtime
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model,
- org.openhab.model.item.binding,
- org.openhab.model.items,
- org.openhab.model.items.impl,
- org.openhab.model.parseTreeConstruction,
- org.openhab.model.parser.antlr,
- org.openhab.model.parser.antlr.internal,
- org.openhab.model.services,
- org.openhab.model.validation,
- org.openhab.model.items.util,
- org.openhab.model.scoping,
- org.openhab.model.formatting
+Export-Package: org.openhab.model,org.openhab.model.item.binding,org.o
+ penhab.model.items,org.openhab.model.items.impl,org.openhab.model.par
+ seTreeConstruction,org.openhab.model.parser.antlr,org.openhab.model.p
+ arser.antlr.internal,org.openhab.model.services,org.openhab.model.val
+ idation,org.openhab.model.items.util,org.openhab.model.scoping,org.op
+ enhab.model.formatting
 Import-Package: org.apache.log4j,
  org.openhab.core.binding,
  org.openhab.core.items,
diff --git a/bundles/model/org.openhab.model.item/pom.xml b/bundles/model/org.openhab.model.item/pom.xml
index e046056233d..c2d13dade9b 100644
--- a/bundles/model/org.openhab.model.item/pom.xml
+++ b/bundles/model/org.openhab.model.item/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.persistence.ui/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.persistence.ui/META-INF/MANIFEST.MF
index 8229fcc22bb..84289468c9e 100644
--- a/bundles/model/org.openhab.model.persistence.ui/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.persistence.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Persistence Model UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.persistence.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.openhab.model.persistence;visibility:=reexport,
@@ -21,7 +21,7 @@ Import-Package: org.apache.commons.logging,
  org.openhab.core.items,
  org.openhab.designer.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.persistence.ui.contentassist,
- org.openhab.model.persistence.ui.contentassist.antlr,
- org.openhab.model.persistence.ui.internal
+Export-Package: org.openhab.model.persistence.ui.contentassist,org.ope
+ nhab.model.persistence.ui.contentassist.antlr,org.openhab.model.persi
+ stence.ui.internal
 Bundle-Activator: org.openhab.model.persistence.ui.internal.PersistenceActivator
diff --git a/bundles/model/org.openhab.model.persistence.ui/pom.xml b/bundles/model/org.openhab.model.persistence.ui/pom.xml
index 952653e543d..abbdbe169ec 100644
--- a/bundles/model/org.openhab.model.persistence.ui/pom.xml
+++ b/bundles/model/org.openhab.model.persistence.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.persistence/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.persistence/META-INF/MANIFEST.MF
index 31d1747b37a..f25fe98e01d 100644
--- a/bundles/model/org.openhab.model.persistence/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.persistence/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Persistence Model
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.persistence; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
@@ -24,16 +24,12 @@ Import-Package: org.apache.commons.logging,
  org.osgi.framework,
  org.slf4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.persistence,
- org.openhab.model.persistence.services,
- org.openhab.model.persistence.persistence,
- org.openhab.model.persistence.persistence.impl,
- org.openhab.model.persistence.persistence.util,
- org.openhab.model.persistence.parser.antlr,
- org.openhab.model.persistence.parser.antlr.internal,
- org.openhab.model.persistence.validation,
- org.openhab.model.persistence.scoping,
- org.openhab.model.persistence.generator,
- org.openhab.model.persistence.formatting,
- org.openhab.model.persistence.parseTreeConstruction
+Export-Package: org.openhab.model.persistence,org.openhab.model.persis
+ tence.services,org.openhab.model.persistence.persistence,org.openhab.
+ model.persistence.persistence.impl,org.openhab.model.persistence.pers
+ istence.util,org.openhab.model.persistence.parser.antlr,org.openhab.m
+ odel.persistence.parser.antlr.internal,org.openhab.model.persistence.
+ validation,org.openhab.model.persistence.scoping,org.openhab.model.pe
+ rsistence.generator,org.openhab.model.persistence.formatting,org.open
+ hab.model.persistence.parseTreeConstruction
 Bundle-Activator: org.openhab.model.persistence.internal.PersistenceModelActivator
diff --git a/bundles/model/org.openhab.model.persistence/pom.xml b/bundles/model/org.openhab.model.persistence/pom.xml
index 71f14c21ce5..4036d3fad83 100644
--- a/bundles/model/org.openhab.model.persistence/pom.xml
+++ b/bundles/model/org.openhab.model.persistence/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.rule.tests/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.rule.tests/META-INF/MANIFEST.MF
index 8b137891791..d3f5a12faa9 100644
--- a/bundles/model/org.openhab.model.rule.tests/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.rule.tests/META-INF/MANIFEST.MF
@@ -1 +1 @@
-
+
diff --git a/bundles/model/org.openhab.model.rule.ui/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.rule.ui/META-INF/MANIFEST.MF
index 3c83f41ebfd..498b57089d1 100644
--- a/bundles/model/org.openhab.model.rule.ui/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.rule.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Rule Model UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.rule.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.openhab.model.rule;visibility:=reexport,
@@ -38,7 +38,6 @@ Import-Package: org.apache.commons.lang,
  org.osgi.service.cm,
  org.slf4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.rule.ui.contentassist.antlr,
- org.openhab.model.rule.ui.internal,
- org.openhab.model.rule.ui.contentassist
+Export-Package: org.openhab.model.rule.ui.contentassist.antlr,org.open
+ hab.model.rule.ui.internal,org.openhab.model.rule.ui.contentassist
 Bundle-Activator: org.openhab.model.rule.ui.internal.RuleModelUIActivator
diff --git a/bundles/model/org.openhab.model.rule.ui/pom.xml b/bundles/model/org.openhab.model.rule.ui/pom.xml
index 056e10ff320..2d3bd047692 100644
--- a/bundles/model/org.openhab.model.rule.ui/pom.xml
+++ b/bundles/model/org.openhab.model.rule.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.rule/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.rule/META-INF/MANIFEST.MF
index c0cc6d836c8..0d7c246f531 100644
--- a/bundles/model/org.openhab.model.rule/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.rule/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Rule Model
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.rule; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
@@ -49,16 +49,11 @@ Import-Package: org.apache.commons.lang,
  org.quartz.utils,
  org.slf4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.rule,
- org.openhab.model.rule.services,
- org.openhab.model.rule.rules,
- org.openhab.model.rule.rules.impl,
- org.openhab.model.rule.rules.util,
- org.openhab.model.rule.parser.antlr,
- org.openhab.model.rule.parser.antlr.internal,
- org.openhab.model.rule.validation,
- org.openhab.model.rule.formatting,
- org.openhab.model.rule.jvmmodel,
- org.openhab.model.rule.serializer
+Export-Package: org.openhab.model.rule,org.openhab.model.rule.services
+ ,org.openhab.model.rule.rules,org.openhab.model.rule.rules.impl,org.o
+ penhab.model.rule.rules.util,org.openhab.model.rule.parser.antlr,org.
+ openhab.model.rule.parser.antlr.internal,org.openhab.model.rule.valid
+ ation,org.openhab.model.rule.formatting,org.openhab.model.rule.jvmmod
+ el,org.openhab.model.rule.serializer
 Bundle-Activator: org.openhab.model.rule.internal.RuleModelActivator
 Service-Component: OSGI-INF/ruleengine.xml
diff --git a/bundles/model/org.openhab.model.rule/pom.xml b/bundles/model/org.openhab.model.rule/pom.xml
index d6278ab35c2..eb5309ceacb 100644
--- a/bundles/model/org.openhab.model.rule/pom.xml
+++ b/bundles/model/org.openhab.model.rule/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.script.tests/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.script.tests/META-INF/MANIFEST.MF
index 8b137891791..d3f5a12faa9 100644
--- a/bundles/model/org.openhab.model.script.tests/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.script.tests/META-INF/MANIFEST.MF
@@ -1 +1 @@
-
+
diff --git a/bundles/model/org.openhab.model.script.ui/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.script.ui/META-INF/MANIFEST.MF
index 094c63690b9..8d891dd6b3b 100644
--- a/bundles/model/org.openhab.model.script.ui/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.script.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Script UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.script.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.openhab.model.script;visibility:=reexport,
@@ -35,7 +35,7 @@ Import-Package: org.apache.commons.lang,
  org.osgi.service.cm,
  org.slf4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.script.ui.contentassist,
- org.openhab.model.script.ui.contentassist.antlr,
- org.openhab.model.script.ui.internal
+Export-Package: org.openhab.model.script.ui.contentassist,org.openhab.
+ model.script.ui.contentassist.antlr,org.openhab.model.script.ui.inter
+ nal
 Bundle-Activator: org.openhab.model.script.ui.internal.ScriptUIActivator
diff --git a/bundles/model/org.openhab.model.script.ui/pom.xml b/bundles/model/org.openhab.model.script.ui/pom.xml
index f444384adde..4e4f6c79613 100644
--- a/bundles/model/org.openhab.model.script.ui/pom.xml
+++ b/bundles/model/org.openhab.model.script.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.script/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.script/META-INF/MANIFEST.MF
index 21f643bd648..ccd23b4fff7 100644
--- a/bundles/model/org.openhab.model.script/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.script/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Script
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.script; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
@@ -45,20 +45,14 @@ Import-Package: org.apache.commons.lang,
  org.quartz.utils,
  org.slf4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.model.script,
- org.openhab.model.script.actions,
- org.openhab.model.script.formatting,
- org.openhab.model.script.jvmmodel,
- org.openhab.model.script.lib,
- org.openhab.model.script.parser.antlr,
- org.openhab.model.script.parser.antlr.internal,
- org.openhab.model.script.scoping,
- org.openhab.model.script.script,
- org.openhab.model.script.script.impl,
- org.openhab.model.script.script.util,
- org.openhab.model.script.services,
- org.openhab.model.script.validation,
- org.openhab.model.script.serializer
+Export-Package: org.openhab.model.script,org.openhab.model.script.acti
+ ons,org.openhab.model.script.formatting,org.openhab.model.script.jvmm
+ odel,org.openhab.model.script.lib,org.openhab.model.script.parser.ant
+ lr,org.openhab.model.script.parser.antlr.internal,org.openhab.model.s
+ cript.scoping,org.openhab.model.script.script,org.openhab.model.scrip
+ t.script.impl,org.openhab.model.script.script.util,org.openhab.model.
+ script.services,org.openhab.model.script.validation,org.openhab.model
+ .script.serializer
 Service-Component: OSGI-INF/scriptengine.xml
 Bundle-Activator: org.openhab.model.script.internal.ScriptActivator
 Bundle-ClassPath: .
diff --git a/bundles/model/org.openhab.model.script/pom.xml b/bundles/model/org.openhab.model.script/pom.xml
index 49e6db0aeab..86ea53fc126 100644
--- a/bundles/model/org.openhab.model.script/pom.xml
+++ b/bundles/model/org.openhab.model.script/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.sitemap.ui/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.sitemap.ui/META-INF/MANIFEST.MF
index f65cbe54734..4cb37a8fc62 100644
--- a/bundles/model/org.openhab.model.sitemap.ui/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.sitemap.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Sitemap Editor UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.sitemap.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.openhab.model.sitemap;visibility:=reexport,
@@ -17,7 +17,7 @@ Import-Package: org.apache.log4j,
  org.openhab.core.items,
  org.openhab.designer.core.config,
  org.openhab.designer.ui
-Export-Package: org.openhab.model.ui.contentassist.antlr,
- org.openhab.model.ui.contentassist
+Export-Package: org.openhab.model.ui.contentassist.antlr,org.openhab.m
+ odel.ui.contentassist
 Bundle-Activator: org.openhab.model.ui.internal.SitemapActivator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/model/org.openhab.model.sitemap.ui/pom.xml b/bundles/model/org.openhab.model.sitemap.ui/pom.xml
index bc0f43d5bb6..079961662cf 100644
--- a/bundles/model/org.openhab.model.sitemap.ui/pom.xml
+++ b/bundles/model/org.openhab.model.sitemap.ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/org.openhab.model.sitemap/META-INF/MANIFEST.MF b/bundles/model/org.openhab.model.sitemap/META-INF/MANIFEST.MF
index 5505ef595ca..c12aed7a949 100644
--- a/bundles/model/org.openhab.model.sitemap/META-INF/MANIFEST.MF
+++ b/bundles/model/org.openhab.model.sitemap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Sitemap Model
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-SymbolicName: org.openhab.model.sitemap; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.generator;resolution:=optional,
@@ -21,17 +21,11 @@ Import-Package: org.apache.log4j,
  org.osgi.framework,
  org.osgi.service.cm,
  org.slf4j
-Export-Package: org.openhab.model,
- org.openhab.model.services,
- org.openhab.model.sitemap,
- org.openhab.model.sitemap.impl,
- org.openhab.model.parseTreeConstruction,
- org.openhab.model.parser.antlr,
- org.openhab.model.parser.antlr.internal,
- org.openhab.model.validation,
- org.openhab.model.sitemap.util,
- org.openhab.model.scoping,
- org.openhab.model.formatting
+Export-Package: org.openhab.model,org.openhab.model.services,org.openh
+ ab.model.sitemap,org.openhab.model.sitemap.impl,org.openhab.model.par
+ seTreeConstruction,org.openhab.model.parser.antlr,org.openhab.model.p
+ arser.antlr.internal,org.openhab.model.validation,org.openhab.model.s
+ itemap.util,org.openhab.model.scoping,org.openhab.model.formatting
 Service-Component: OSGI-INF/sitemapprovider.xml
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: org.openhab.model.sitemap.internal.SitemapModelActivator
diff --git a/bundles/model/org.openhab.model.sitemap/pom.xml b/bundles/model/org.openhab.model.sitemap/pom.xml
index 22520773880..7d95df9be89 100644
--- a/bundles/model/org.openhab.model.sitemap/pom.xml
+++ b/bundles/model/org.openhab.model.sitemap/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>model</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/model/pom.xml b/bundles/model/pom.xml
index 58a1d309bf2..7d95424ddf4 100644
--- a/bundles/model/pom.xml
+++ b/bundles/model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/persistence/org.openhab.persistence.cosm/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.cosm/META-INF/MANIFEST.MF
index 2eab3d2c360..3824b1bd824 100644
--- a/bundles/persistence/org.openhab.persistence.cosm/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.cosm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Cosm Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.cosm
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.httpclient;version="3.1.0",
diff --git a/bundles/persistence/org.openhab.persistence.cosm/pom.xml b/bundles/persistence/org.openhab.persistence.cosm/pom.xml
index 9fbbf089326..0a971129863 100644
--- a/bundles/persistence/org.openhab.persistence.cosm/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.cosm/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Cosm Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.db4o.test/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.db4o.test/META-INF/MANIFEST.MF
index 5ee5d3cc79f..ede05285c8b 100644
--- a/bundles/persistence/org.openhab.persistence.db4o.test/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.db4o.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the db4o Persistence Bundle
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-SymbolicName: org.openhab.persistence.db4o.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.persistence.db4o
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/persistence/org.openhab.persistence.db4o.test/pom.xml b/bundles/persistence/org.openhab.persistence.db4o.test/pom.xml
index a00bd3bd3b6..e2070511f8c 100644
--- a/bundles/persistence/org.openhab.persistence.db4o.test/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.db4o.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/persistence/org.openhab.persistence.db4o/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.db4o/META-INF/MANIFEST.MF
index c3d8f98c24d..7e448140e60 100644
--- a/bundles/persistence/org.openhab.persistence.db4o/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.db4o/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Service-Component: OSGI-INF/database-db4o.xml, OSGI-INF/configuration.xml
 Bundle-Name: openHAB db4o Persistence
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.persistence.db4o.internal.Db4oActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/persistence/org.openhab.persistence.db4o/pom.xml b/bundles/persistence/org.openhab.persistence.db4o/pom.xml
index 6c3c0a13b28..0420c24de4c 100644
--- a/bundles/persistence/org.openhab.persistence.db4o/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.db4o/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB db4o Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.exec.test/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.exec.test/META-INF/MANIFEST.MF
index ba56d59c156..3b3a8adcc1c 100644
--- a/bundles/persistence/org.openhab.persistence.exec.test/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.exec.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Exec Persistence Bundle
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-SymbolicName: org.openhab.persistence.exec.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Fragment-Host: org.openhab.persistence.exec
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/persistence/org.openhab.persistence.exec.test/pom.xml b/bundles/persistence/org.openhab.persistence.exec.test/pom.xml
index 41094b75836..f1a45b83ec5 100644
--- a/bundles/persistence/org.openhab.persistence.exec.test/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.exec.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/persistence/org.openhab.persistence.exec/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.exec/META-INF/MANIFEST.MF
index efd582a1fef..79613d9d04f 100644
--- a/bundles/persistence/org.openhab.persistence.exec/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.exec/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Exec Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.exec
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 DynamicImport-Package: *
diff --git a/bundles/persistence/org.openhab.persistence.exec/pom.xml b/bundles/persistence/org.openhab.persistence.exec/pom.xml
index 78a64528298..6095c80f5e5 100644
--- a/bundles/persistence/org.openhab.persistence.exec/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.exec/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Exec Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.gcal/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.gcal/META-INF/MANIFEST.MF
index 004620d206d..30a18336d52 100644
--- a/bundles/persistence/org.openhab.persistence.gcal/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.gcal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB GCal Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.gcal
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: ch.qos.logback.classic,
diff --git a/bundles/persistence/org.openhab.persistence.gcal/pom.xml b/bundles/persistence/org.openhab.persistence.gcal/pom.xml
index 63a5863505c..feff0f650d0 100644
--- a/bundles/persistence/org.openhab.persistence.gcal/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.gcal/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Google Calendar Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.logging/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.logging/META-INF/MANIFEST.MF
index 4a6698e1fa0..6668da5de08 100644
--- a/bundles/persistence/org.openhab.persistence.logging/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Logging Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.logging
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: ch.qos.logback.classic,
diff --git a/bundles/persistence/org.openhab.persistence.logging/pom.xml b/bundles/persistence/org.openhab.persistence.logging/pom.xml
index 2a8092c4022..47b1d47c43b 100644
--- a/bundles/persistence/org.openhab.persistence.logging/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.logging/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Logging Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.mqtt/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.mqtt/META-INF/MANIFEST.MF
index eb2a1f18204..c4c1c906812 100644
--- a/bundles/persistence/org.openhab.persistence.mqtt/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.mqtt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB MQTT Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.mqtt;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.io,
diff --git a/bundles/persistence/org.openhab.persistence.mqtt/pom.xml b/bundles/persistence/org.openhab.persistence.mqtt/pom.xml
index 9394c9eaecf..6db97ae49e6 100644
--- a/bundles/persistence/org.openhab.persistence.mqtt/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.mqtt/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB MQTT Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.mysql/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.mysql/META-INF/MANIFEST.MF
index b9627530a08..9346a57c967 100644
--- a/bundles/persistence/org.openhab.persistence.mysql/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.mysql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB mySQL Persistence bundle
 Bundle-SymbolicName: org.openhab.persistence.mysql
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 DynamicImport-Package: *
diff --git a/bundles/persistence/org.openhab.persistence.mysql/pom.xml b/bundles/persistence/org.openhab.persistence.mysql/pom.xml
index bf5180b0cf3..1f68a1ba848 100644
--- a/bundles/persistence/org.openhab.persistence.mysql/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.mysql/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB mySQL Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.rrd4j/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.rrd4j/META-INF/MANIFEST.MF
index 4289e778550..188e8721f94 100644
--- a/bundles/persistence/org.openhab.persistence.rrd4j/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.rrd4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB RRD4j Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.rrd4j
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet;version="2.6.0",
diff --git a/bundles/persistence/org.openhab.persistence.rrd4j/pom.xml b/bundles/persistence/org.openhab.persistence.rrd4j/pom.xml
index 86e5f350d10..76e78b8d523 100644
--- a/bundles/persistence/org.openhab.persistence.rrd4j/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.rrd4j/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB RRD4j Persistence</name>
diff --git a/bundles/persistence/org.openhab.persistence.sense/META-INF/MANIFEST.MF b/bundles/persistence/org.openhab.persistence.sense/META-INF/MANIFEST.MF
index 2b5d88bd7a5..8d982a70e58 100644
--- a/bundles/persistence/org.openhab.persistence.sense/META-INF/MANIFEST.MF
+++ b/bundles/persistence/org.openhab.persistence.sense/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB Sense Persistence Bundle
 Bundle-SymbolicName: org.openhab.persistence.sense
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.io,
diff --git a/bundles/persistence/org.openhab.persistence.sense/pom.xml b/bundles/persistence/org.openhab.persistence.sense/pom.xml
index 228d050c3e2..2a9de10e019 100644
--- a/bundles/persistence/org.openhab.persistence.sense/pom.xml
+++ b/bundles/persistence/org.openhab.persistence.sense/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>persistence</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<name>openHAB Open.Sen.se Persistence</name>
diff --git a/bundles/persistence/pom.xml b/bundles/persistence/pom.xml
index 1d113884f41..6beca0024d3 100644
--- a/bundles/persistence/pom.xml
+++ b/bundles/persistence/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 6eb8838020f..d5a6dac32e0 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>openhab</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/ui/org.openhab.ui.test/META-INF/MANIFEST.MF b/bundles/ui/org.openhab.ui.test/META-INF/MANIFEST.MF
index 90b534ecdc5..b8fec444fe3 100644
--- a/bundles/ui/org.openhab.ui.test/META-INF/MANIFEST.MF
+++ b/bundles/ui/org.openhab.ui.test/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: openHAB UI Tests
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-ManifestVersion: 2
 Fragment-Host: org.openhab.ui;bundle-version="1.0.0.qualifier"
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/ui/org.openhab.ui.test/pom.xml b/bundles/ui/org.openhab.ui.test/pom.xml
index 5abc4a30da2..6bc87aec4b7 100644
--- a/bundles/ui/org.openhab.ui.test/pom.xml
+++ b/bundles/ui/org.openhab.ui.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>ui</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/ui/org.openhab.ui.webapp/META-INF/MANIFEST.MF b/bundles/ui/org.openhab.ui.webapp/META-INF/MANIFEST.MF
index 6384ea83161..c0d3c8ebc07 100644
--- a/bundles/ui/org.openhab.ui.webapp/META-INF/MANIFEST.MF
+++ b/bundles/ui/org.openhab.ui.webapp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.ui.webapp.internal
 Ignore-Package: org.openhab.ui.webapp.internal
 Bundle-Name: openHAB WebApp UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.ui.webapp.internal.WebAppActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
diff --git a/bundles/ui/org.openhab.ui.webapp/pom.xml b/bundles/ui/org.openhab.ui.webapp/pom.xml
index 3432e9a0a11..2a1d7212855 100644
--- a/bundles/ui/org.openhab.ui.webapp/pom.xml
+++ b/bundles/ui/org.openhab.ui.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>ui</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/ui/org.openhab.ui/META-INF/MANIFEST.MF b/bundles/ui/org.openhab.ui/META-INF/MANIFEST.MF
index a92672beeab..6cac57bec46 100644
--- a/bundles/ui/org.openhab.ui/META-INF/MANIFEST.MF
+++ b/bundles/ui/org.openhab.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Private-Package: org.openhab.ui.internal
 Ignore-Package: org.openhab.ui.internal
 Bundle-Name: openHAB UI
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0
 Bundle-Activator: org.openhab.ui.internal.UIActivator
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
@@ -37,7 +37,6 @@ Bundle-ClassPath: .,
 Bundle-SymbolicName: org.openhab.ui
 Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openhab.ui.chart,
- org.openhab.ui.items
+Export-Package: org.openhab.ui.chart,org.openhab.ui.items
 Service-Component: OSGI-INF/genericitemuiprovider.xml, OSGI-INF/itemuiregistry.xml,
  OSGI-INF/proxy.xml, OSGI-INF/chartservlet.xml, OSGI-INF/chartprovider.xml
diff --git a/bundles/ui/org.openhab.ui/pom.xml b/bundles/ui/org.openhab.ui/pom.xml
index 7a0af223277..b11805b2e76 100644
--- a/bundles/ui/org.openhab.ui/pom.xml
+++ b/bundles/ui/org.openhab.ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>ui</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <properties>
diff --git a/bundles/ui/pom.xml b/bundles/ui/pom.xml
index f3ca7a5929e..cc5b7680271 100644
--- a/bundles/ui/pom.xml
+++ b/bundles/ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>bundles</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5cc8060df10..2294d891d3e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.openhab</groupId>
         <artifactId>openhab</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0</version>
     </parent>
 
     <artifactId>distribution</artifactId>
diff --git a/features/org.openhab.dependencies.feature/feature.xml b/features/org.openhab.dependencies.feature/feature.xml
index 2cd5f33d344..0c328561c6c 100644
--- a/features/org.openhab.dependencies.feature/feature.xml
+++ b/features/org.openhab.dependencies.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.openhab.dependencies.feature"
       label="openHAB Dependencies"
-      version="1.4.0.qualifier"
+      version="1.4.0"
       provider-name="openHAB.org">
 
    <description>
diff --git a/features/org.openhab.dependencies.feature/pom.xml b/features/org.openhab.dependencies.feature/pom.xml
index 2d8bd27f287..b6f6d399008 100644
--- a/features/org.openhab.dependencies.feature/pom.xml
+++ b/features/org.openhab.dependencies.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>features</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.openhab.designer.feature/feature.xml b/features/org.openhab.designer.feature/feature.xml
index 6fc3dd3e909..a0378fc36e8 100644
--- a/features/org.openhab.designer.feature/feature.xml
+++ b/features/org.openhab.designer.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.openhab.designer.feature"
       label="openHAB Designer"
-      version="1.4.0.qualifier"
+      version="1.4.0"
       provider-name="openHAB.org"
       plugin="org.openhab.designer.core">
 
diff --git a/features/org.openhab.designer.feature/pom.xml b/features/org.openhab.designer.feature/pom.xml
index f8986ce7e0a..fb533b9e302 100644
--- a/features/org.openhab.designer.feature/pom.xml
+++ b/features/org.openhab.designer.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>features</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.openhab.runtime.feature/feature.xml b/features/org.openhab.runtime.feature/feature.xml
index 3c2048c1c9e..025c3f523c4 100644
--- a/features/org.openhab.runtime.feature/feature.xml
+++ b/features/org.openhab.runtime.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.openhab.runtime.feature"
       label="openHAB Runtime"
-      version="1.4.0.qualifier"
+      version="1.4.0"
       provider-name="openHAB.org">
 
    <description>
diff --git a/features/org.openhab.runtime.feature/pom.xml b/features/org.openhab.runtime.feature/pom.xml
index f5dd0e26d25..494d24be01a 100644
--- a/features/org.openhab.runtime.feature/pom.xml
+++ b/features/org.openhab.runtime.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>features</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/features/pom.xml b/features/pom.xml
index 7ea8da2ae34..19ca6a9e208 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>openhab</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 53822a2e5ae..ac4c3b2b3b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     
     <groupId>org.openhab</groupId>
     <artifactId>openhab</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
     <name>openHAB</name>
     
     <organization>
diff --git a/products/org.openhab.designer.product/category.xml b/products/org.openhab.designer.product/category.xml
index 95326fc7a61..7eabcbc7d98 100644
--- a/products/org.openhab.designer.product/category.xml
+++ b/products/org.openhab.designer.product/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.dependencies.feature_1.4.0.qualifier.jar" id="org.openhab.dependencies.feature" version="1.4.0.qualifier">
+   <feature url="features/org.openhab.dependencies.feature_1.4.0.jar" id="org.openhab.dependencies.feature" version="1.4.0.qualifier">
       <category name="org.openhab"/>
    </feature>
-   <feature url="features/org.openhab.designer.feature_1.4.0.qualifier.jar" id="org.openhab.designer.feature" version="1.4.0.qualifier">
+   <feature url="features/org.openhab.designer.feature_1.4.0.jar" id="org.openhab.designer.feature" version="1.4.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">
diff --git a/products/org.openhab.designer.product/org.openhab.designer.product.product b/products/org.openhab.designer.product/org.openhab.designer.product.product
index 957e97c69d0..3d356a50a7e 100644
--- a/products/org.openhab.designer.product/org.openhab.designer.product.product
+++ b/products/org.openhab.designer.product/org.openhab.designer.product.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="openHAB Designer" uid="org.openhab.designer.product" id="org.openhab.designer.core.product" application="org.openhab.designer.ui.application" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="openHAB Designer" uid="org.openhab.designer.product" id="org.openhab.designer.core.product" application="org.openhab.designer.ui.application" version="1.4.0" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.openhab.designer.core/icons/openhab400.png"/>
diff --git a/products/org.openhab.designer.product/pom.xml b/products/org.openhab.designer.product/pom.xml
index 3b013d5a989..2709831124b 100644
--- a/products/org.openhab.designer.product/pom.xml
+++ b/products/org.openhab.designer.product/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>products</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/products/org.openhab.runtime.product/category.xml b/products/org.openhab.runtime.product/category.xml
index 266b6988eb2..ebdaa0e183b 100644
--- a/products/org.openhab.runtime.product/category.xml
+++ b/products/org.openhab.runtime.product/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.dependencies.feature_1.4.0.qualifier.jar" id="org.openhab.dependencies.feature" version="1.4.0.qualifier">
+   <feature url="features/org.openhab.dependencies.feature_1.4.0.jar" id="org.openhab.dependencies.feature" version="1.4.0.qualifier">
       <category name="org.openhab"/>
    </feature>
-   <feature url="features/org.openhab.runtime.feature_1.4.0.qualifier.jar" id="org.openhab.runtime.feature" version="1.4.0.qualifier">
+   <feature url="features/org.openhab.runtime.feature_1.4.0.jar" id="org.openhab.runtime.feature" version="1.4.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">
diff --git a/products/org.openhab.runtime.product/org.openhab.runtime.product.product b/products/org.openhab.runtime.product/org.openhab.runtime.product.product
index 3db9599fa0e..3a78704bec2 100644
--- a/products/org.openhab.runtime.product/org.openhab.runtime.product.product
+++ b/products/org.openhab.runtime.product/org.openhab.runtime.product.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="openHAB Runtime" uid="org.openhab.runtime.product" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product name="openHAB Runtime" uid="org.openhab.runtime.product" version="1.4.0" useFeatures="true" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
diff --git a/products/org.openhab.runtime.product/pom.xml b/products/org.openhab.runtime.product/pom.xml
index eb564bdeb10..6cf0e6730b4 100644
--- a/products/org.openhab.runtime.product/pom.xml
+++ b/products/org.openhab.runtime.product/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>products</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/products/pom.xml b/products/pom.xml
index 350e8aef490..fdac17d8404 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>openhab</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 718e287c9fc..0ee96ab0b93 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>openhab</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>org.openhab</groupId>