diff --git a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
index 900808a46..bac89fe6f 100644
--- a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer Tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.compat1x.test
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.openhab.core.compat1x
 Import-Package: 
  javax.measure.quantity,
diff --git a/bundles/org.openhab.core.compat1x.test/pom.xml b/bundles/org.openhab.core.compat1x.test/pom.xml
index 24361f378..9542e16c1 100644
--- a/bundles/org.openhab.core.compat1x.test/pom.xml
+++ b/bundles/org.openhab.core.compat1x.test/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.compat1x.test</artifactId>
@@ -20,7 +19,7 @@
         <groupId>${tycho-groupid}</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <environments combine.self="override"></environments>
+          <environments combine.self="override"/>
           <dependency-resolution>
             <extraRequirements>
               <requirement>
diff --git a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
index 174dc8f07..123cb1ff9 100644
--- a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.compat1x
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Export-Package: 
  org.codehaus.jackson,
  org.codehaus.jackson.annotate,
diff --git a/bundles/org.openhab.core.compat1x/pom.xml b/bundles/org.openhab.core.compat1x/pom.xml
index 85f7f7c52..5202e8ac1 100644
--- a/bundles/org.openhab.core.compat1x/pom.xml
+++ b/bundles/org.openhab.core.compat1x/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.compat1x</artifactId>
diff --git a/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF b/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF
index 5cd1188b2..573edb986 100644
--- a/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.karaf.dep.war/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: openHAB Karaf Integration Dependency WAR
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.karaf.dep.war;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Provide-Capability: 
  osgi.service;objectClass:List<String>="org.osgi.service.cm.ConfigurationAdmin",
  osgi.service;objectClass:List<String>="org.osgi.service.url.URLStreamHandlerService";url.handler.protocol=mvn
diff --git a/bundles/org.openhab.core.karaf.dep.war/pom.xml b/bundles/org.openhab.core.karaf.dep.war/pom.xml
index eff7c3df1..90c8386c0 100644
--- a/bundles/org.openhab.core.karaf.dep.war/pom.xml
+++ b/bundles/org.openhab.core.karaf.dep.war/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.karaf.dep.war</artifactId>
diff --git a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
index 593fbcc24..cf2cc9c74 100644
--- a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB Karaf Integration
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.karaf;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Import-Package: 
  com.google.common.base,
  com.google.common.collect,
diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml
index 761081687..f22c3f070 100644
--- a/bundles/org.openhab.core.karaf/pom.xml
+++ b/bundles/org.openhab.core.karaf/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.karaf</artifactId>
@@ -53,7 +52,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -66,7 +65,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -81,7 +80,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/bundles/org.openhab.core/META-INF/MANIFEST.MF b/bundles/org.openhab.core/META-INF/MANIFEST.MF
index 4bd061d12..67a3fc29f 100644
--- a/bundles/org.openhab.core/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB Core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Export-Package: org.openhab.core
 Ignore-Package: org.openhab.core.internal.items,org.openhab.core.interna
  l,org.openhab.core.internal.events
diff --git a/bundles/org.openhab.core/pom.xml b/bundles/org.openhab.core/pom.xml
index 47e9ed460..78ee4e34d 100644
--- a/bundles/org.openhab.core/pom.xml
+++ b/bundles/org.openhab.core/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core</artifactId>
diff --git a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
index bcec3318f..2aab64545 100644
--- a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB SSL Certificate Generator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.jetty.certificate;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
  org.osgi.framework,
diff --git a/bundles/org.openhab.io.jetty.certificate/pom.xml b/bundles/org.openhab.io.jetty.certificate/pom.xml
index c771b2dd8..2c942a2ab 100644
--- a/bundles/org.openhab.io.jetty.certificate/pom.xml
+++ b/bundles/org.openhab.io.jetty.certificate/pom.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.io.jetty.certificate</artifactId>
diff --git a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
index 73c99dfd2..ee889b16a 100644
--- a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Name: openHAB REST Documentation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.rest.docs
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Import-Package: 
  com.google.gson,
  com.google.gson.annotations,
diff --git a/bundles/org.openhab.io.rest.docs/pom.xml b/bundles/org.openhab.io.rest.docs/pom.xml
index 923685001..609275e0b 100644
--- a/bundles/org.openhab.io.rest.docs/pom.xml
+++ b/bundles/org.openhab.io.rest.docs/pom.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.io.rest.docs</artifactId>
diff --git a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
index 14b7e95c4..54e6208fd 100644
--- a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB Sound Support
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.sound
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.smarthome.io.javasound
 Import-Package: 
  org.apache.commons.collections,
diff --git a/bundles/org.openhab.io.sound/pom.xml b/bundles/org.openhab.io.sound/pom.xml
index 723c7fe5f..791b57e26 100644
--- a/bundles/org.openhab.io.sound/pom.xml
+++ b/bundles/org.openhab.io.sound/pom.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.io.sound</artifactId>
diff --git a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
index 28ea2f32c..db2bc5904 100644
--- a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB Basic UI Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.basicui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.basic
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.basicui/pom.xml b/bundles/org.openhab.ui.basicui/pom.xml
index 4ebb3bded..7e681863d 100644
--- a/bundles/org.openhab.ui.basicui/pom.xml
+++ b/bundles/org.openhab.ui.basicui/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.basicui</artifactId>
diff --git a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
index 139a773ad..3a4ed85c3 100644
--- a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB Classic UI Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.classicui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.classic
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.classicui/pom.xml b/bundles/org.openhab.ui.classicui/pom.xml
index f4f83645b..d01789ff8 100644
--- a/bundles/org.openhab.ui.classicui/pom.xml
+++ b/bundles/org.openhab.ui.classicui/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.classicui</artifactId>
diff --git a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
index a0e023f54..aecc46d14 100644
--- a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB Dashboard UI
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.dashboard
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Export-Package: org.openhab.ui.dashboard
 Import-Package: 
  javax.servlet,
diff --git a/bundles/org.openhab.ui.dashboard/pom.xml b/bundles/org.openhab.ui.dashboard/pom.xml
index a7ac77789..3849eec58 100644
--- a/bundles/org.openhab.ui.dashboard/pom.xml
+++ b/bundles/org.openhab.ui.dashboard/pom.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.dashboard</artifactId>
diff --git a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
index cbf697e77..5836ab33a 100644
--- a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.openhab.ui.homebuilder
 Bundle-ManifestVersion: 2
 Bundle-Name: HomeBuilder User Interface
 Bundle-SymbolicName: org.openhab.ui.homebuilder
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/*.xml
 Import-Package: com.google.gson,
diff --git a/bundles/org.openhab.ui.homebuilder/pom.xml b/bundles/org.openhab.ui.homebuilder/pom.xml
index fd90d2b83..e251307bb 100644
--- a/bundles/org.openhab.ui.homebuilder/pom.xml
+++ b/bundles/org.openhab.ui.homebuilder/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.homebuilder</artifactId>
diff --git a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
index f6a8fe0d1..96b7087a6 100644
--- a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Name: openHAB Paper UI Theme Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.paperui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.paper
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.paperui/pom.xml b/bundles/org.openhab.ui.paperui/pom.xml
index a4f650024..dcbd12b93 100644
--- a/bundles/org.openhab.ui.paperui/pom.xml
+++ b/bundles/org.openhab.ui.paperui/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.paperui</artifactId>
diff --git a/bundles/org.openhab.ui.start/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.start/META-INF/MANIFEST.MF
index 70119712b..076c5c4bd 100644
--- a/bundles/org.openhab.ui.start/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.start/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB Start UI
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.start
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
 Import-Package: 
  javax.servlet,
  javax.servlet.http,
diff --git a/bundles/org.openhab.ui.start/pom.xml b/bundles/org.openhab.ui.start/pom.xml
index eeec2e5f8..57abb2634 100644
--- a/bundles/org.openhab.ui.start/pom.xml
+++ b/bundles/org.openhab.ui.start/pom.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.start</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 0cf6d160d..d6dc10417 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.openhab.core</groupId>
diff --git a/features/openhab-core/pom.xml b/features/openhab-core/pom.xml
index 067ce9b2e..1f8a1129f 100644
--- a/features/openhab-core/pom.xml
+++ b/features/openhab-core/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-features</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>openhab-core</artifactId>
diff --git a/features/p2/feature.xml b/features/p2/feature.xml
index 5679122e3..60db66f8e 100644
--- a/features/p2/feature.xml
+++ b/features/p2/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.openhab.feature.p2"
       label="openHAB Core Components"
-      version="2.4.0.qualifier"
+      version="2.5.0.qualifier"
       provider-name="openHAB.org">
 
    <description>
diff --git a/features/p2/pom.xml b/features/p2/pom.xml
index 2eefb0a30..5e84e18ac 100644
--- a/features/p2/pom.xml
+++ b/features/p2/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>pom-tycho</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
   <artifactId>org.openhab.feature.p2</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index a2199909c..525b6ed96 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.openhab.core</groupId>
diff --git a/features/repo/category.xml b/features/repo/category.xml
index 56707d4b7..419a26a12 100644
--- a/features/repo/category.xml
+++ b/features/repo/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.feature.p2_2.4.0.qualifier.jar" id="org.openhab.feature.p2" version="2.4.0.qualifier">
+   <feature url="features/org.openhab.feature.p2_2.5.0.qualifier.jar" id="org.openhab.feature.p2" version="2.5.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">
diff --git a/features/repo/pom.xml b/features/repo/pom.xml
index 5f8a45e03..09c408523 100644
--- a/features/repo/pom.xml
+++ b/features/repo/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>pom-tycho</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
   <groupId>org.openhab.core.features</groupId>
diff --git a/features/verify-karaf/pom.xml b/features/verify-karaf/pom.xml
index 872f448c0..decba083d 100644
--- a/features/verify-karaf/pom.xml
+++ b/features/verify-karaf/pom.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-features</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.features.karaf.verify</artifactId>
diff --git a/pom.xml b/pom.xml
index 127cbd7eb..615b40d08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>pom-tycho</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
     <relativePath>poms/tycho/pom.xml</relativePath>
   </parent>
 
   <groupId>org.openhab.core</groupId>
   <artifactId>pom</artifactId>
-  <version>2.4.0-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>openHAB</name>
diff --git a/poms/pom.xml b/poms/pom.xml
index e31d7e764..74473bbd2 100644
--- a/poms/pom.xml
+++ b/poms/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.openhab</groupId>
diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml
index 737d2a1ff..afd806905 100644
--- a/poms/tycho/pom.xml
+++ b/poms/tycho/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -10,7 +9,7 @@
   </parent>
 
   <artifactId>pom-tycho</artifactId>
-  <version>2.4.0-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>openHAB - Tycho settings</name>