Apply POM Code Convention (#392)

Applies the POM Code Covention as used in OH2/ESH projects.

See also: https://maven.apache.org/developers/conventions/code.html

The executed command is:

mvn \
  com.github.ekryd.sortpom:sortpom-maven-plugin:sort \
  -Dsort.keepBlankLines=true \
  -Dsort.predefinedSortOrder=recommended_2008_06

Signed-off-by: Wouter Born <eclipse@maindrain.net>

bundles/org.openhab.core.compat1x.test/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,9 +10,9 @@
   </parent>
 
   <artifactId>org.openhab.core.compat1x.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
 
   <name>openHAB Core 1.x Compatibility Layer Tests</name>
-  <packaging>eclipse-test-plugin</packaging>
 
   <build>
     <plugins>
@@ -19,7 +20,7 @@
         <groupId>${tycho-groupid}</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
-          <environments combine.self="override"/>
+          <environments combine.self="override"></environments>
           <dependency-resolution>
             <extraRequirements>
               <requirement>

bundles/org.openhab.core.compat1x/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,8 +10,8 @@
   </parent>
 
   <artifactId>org.openhab.core.compat1x</artifactId>
-
-  <name>openHAB Core 1.x Compatibility Layer</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB Core 1.x Compatibility Layer</name>
+
 </project>

bundles/org.openhab.core.karaf/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,9 +10,9 @@
   </parent>
 
   <artifactId>org.openhab.core.karaf</artifactId>
+  <packaging>eclipse-plugin</packaging>
 
   <name>openHAB Karaf Integration</name>
-	<packaging>eclipse-plugin</packaging>
 
   <dependencies>
     <dependency>
@@ -52,7 +53,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-										<ignore/>
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -65,7 +66,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-										<ignore/>
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -80,7 +81,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-										<ignore/>
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
               </pluginExecutions>

bundles/org.openhab.core/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,8 +10,8 @@
   </parent>
 
   <artifactId>org.openhab.core</artifactId>
-
-  <name>openHAB Core</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB Core</name>
+
 </project>

bundles/org.openhab.io.jetty.certificate/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -8,9 +9,9 @@
   </parent>
 
   <artifactId>org.openhab.io.jetty.certificate</artifactId>
-	<name>openHAB SSL Certificate Generator</name>
 
   <packaging>eclipse-plugin</packaging>
+  <name>openHAB SSL Certificate Generator</name>
 
   <dependencies>
     <dependency>
@@ -52,10 +53,10 @@
         </configuration>
         <executions>
           <execution>
-						<phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

bundles/org.openhab.io.rest.docs/pom.xml

@@ -1,7 +1,6 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
-
-	<packaging>eclipse-plugin</packaging>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
@@ -9,6 +8,8 @@
   </parent>
 
   <artifactId>org.openhab.io.rest.docs</artifactId>
+
+  <packaging>eclipse-plugin</packaging>
   <name>openHAB REST API Documentation</name>
 
 </project>

bundles/org.openhab.io.sound/pom.xml

@@ -1,7 +1,6 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
-
-	<packaging>eclipse-plugin</packaging>
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
@@ -9,6 +8,8 @@
   </parent>
 
   <artifactId>org.openhab.io.sound</artifactId>
+
+  <packaging>eclipse-plugin</packaging>
   <name>openHAB Sound Support</name>
 
 </project>

bundles/org.openhab.ui.basicui/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,8 +10,8 @@
   </parent>
 
   <artifactId>org.openhab.ui.basicui</artifactId>
-
-	<name>openHAB Basic UI Dashboard Integration</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB Basic UI Dashboard Integration</name>
+
 </project>

bundles/org.openhab.ui.classicui/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,8 +10,8 @@
   </parent>
 
   <artifactId>org.openhab.ui.classicui</artifactId>
-
-	<name>openHAB Classic UI Dashboard Integration</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB Classic UI Dashboard Integration</name>
+
 </project>

bundles/org.openhab.ui.dashboard/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.openhab.core</groupId>
@@ -7,7 +8,7 @@
   </parent>
 
   <artifactId>org.openhab.ui.dashboard</artifactId>
-  <name>openHAB Dashboard UI</name>
 
   <packaging>eclipse-plugin</packaging>
+  <name>openHAB Dashboard UI</name>
 </project>

bundles/org.openhab.ui.homebuilder/pom.xml

@@ -1,4 +1,7 @@
-<?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">
+<?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">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
@@ -6,11 +9,9 @@
     <version>2.4.0-SNAPSHOT</version>
   </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-
   <artifactId>org.openhab.ui.homebuilder</artifactId>
-
-	<name>openHAB HomeBuilder UI Dashboard Integration</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB HomeBuilder UI Dashboard Integration</name>
+
 </project>

bundles/org.openhab.ui.paperui/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -9,8 +10,8 @@
   </parent>
 
   <artifactId>org.openhab.ui.paperui</artifactId>
-
-	<name>openHAB Paper UI Theme Fragment</name>
   <packaging>eclipse-plugin</packaging>
 
+  <name>openHAB Paper UI Theme Fragment</name>
+
 </project>

bundles/pom.xml

@@ -1,4 +1,7 @@
-<?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">
+<?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">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
@@ -6,15 +9,13 @@
     <version>2.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab.core</groupId>
   <artifactId>pom-bundles</artifactId>
 
-  <name>openHAB Bundles</name>
-
   <packaging>pom</packaging>
 
+  <name>openHAB Bundles</name>
+
   <modules>
     <module>org.openhab.core</module>
     <module>org.openhab.core.compat1x</module>

features/openhab-core/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 

features/p2/pom.xml

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="MACROMAN" 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">
+<?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">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab</groupId>
@@ -6,14 +9,12 @@
     <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>org.openhab.feature.p2</artifactId>
 
-  <name>openHAB p2 Feature</name>
-
   <packaging>eclipse-feature</packaging>
 
+  <name>openHAB p2 Feature</name>
+
   <dependencies>
     <!-- Eclipse Smarthome dependencies specifically for the core -->
     <dependency>

features/pom.xml

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="MACROMAN" 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">
+<?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">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.core</groupId>
@@ -6,15 +9,13 @@
     <version>2.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-
-    <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab.core</groupId>
   <artifactId>pom-features</artifactId>
 
-    <name>openHAB Features</name>
-
   <packaging>pom</packaging>
 
+  <name>openHAB Features</name>
+
   <modules>
     <module>openhab-core</module>
     <module>verify-karaf</module>

features/repo/pom.xml

@@ -1,4 +1,7 @@
-<?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">
+<?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">
+
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab</groupId>
@@ -6,45 +9,12 @@
     <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.openhab.core.features</groupId>
   <artifactId>org.openhab.repo</artifactId>
 
-  <name>openHAB Core P2 Repository</name>
-
   <packaging>eclipse-repository</packaging>
 
-    <build>
+  <name>openHAB Core P2 Repository</name>
-        <plugins>
-          <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-            <version>2.4.3</version>
-          <executions>
-            <execution>
-              <id>default-resources</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${project.build.directory}</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
 
   <dependencies>
     <!-- Eclipse Smarthome dependencies specifically for the core -->
@@ -95,4 +65,34 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <execution>
+            <id>default-resources</id>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

features/verify-karaf/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -63,10 +64,10 @@
         <executions>
           <execution>
             <id>verify</id>
-                        <phase>process-resources</phase>
             <goals>
               <goal>verify</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
               <descriptors>
                 <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>

pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -16,10 +17,6 @@
   <name>openHAB</name>
   <description>This project contains the core components of openHAB</description>
 
-    <properties>
-        <scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl>
-    </properties>
-
   <organization>
     <name>openHAB.org</name>
     <url>http://www.openhab.org</url>
@@ -32,16 +29,23 @@
     </license>
   </licenses>
 
+  <modules>
+    <module>poms</module>
+    <module>poms/tycho</module>
+    <module>bundles</module>
+    <module>features</module>
+  </modules>
+
   <scm>
     <connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection>
     <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection>
-        <url>${scm.gitBaseUrl}/openhab-core</url>
     <tag>HEAD</tag>
+    <url>${scm.gitBaseUrl}/openhab-core</url>
   </scm>
 
   <issueManagement>
-        <url>https://github.com/openhab/openhab-core/issues</url>
     <system>Github</system>
+    <url>https://github.com/openhab/openhab-core/issues</url>
   </issueManagement>
 
   <distributionManagement>
@@ -55,12 +59,9 @@
     </snapshotRepository>
   </distributionManagement>
 
-    <modules>
+  <properties>
-        <module>poms</module>
+    <scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl>
-        <module>poms/tycho</module>
+  </properties>
-        <module>bundles</module>
-        <module>features</module>
-    </modules>
 
   <build>
     <pluginManagement>

poms/pom.xml

@@ -1,15 +1,16 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
 
-    <prerequisites>
-        <maven>3.1</maven>
-    </prerequisites>
-
   <groupId>org.openhab</groupId>
   <artifactId>pom</artifactId>
   <version>2.4.0-SNAPSHOT</version>
+
+  <packaging>pom</packaging>
   <name>openHAB</name>
 
+  <description>This is the open Home Automation Bus (openHAB)</description>
+
   <organization>
     <name>openHAB.org</name>
     <url>http://www.openhab.org</url>
@@ -22,16 +23,20 @@
     </license>
   </licenses>
 
+  <prerequisites>
+    <maven>3.1</maven>
+  </prerequisites>
+
   <scm>
     <connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection>
     <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection>
-        <url>${scm.gitBaseUrl}/openhab-core</url>
     <tag>HEAD</tag>
+    <url>${scm.gitBaseUrl}/openhab-core</url>
   </scm>
 
   <issueManagement>
-        <url>https://github.com/openhab/openhab-core/issues</url>
     <system>Github</system>
+    <url>https://github.com/openhab/openhab-core/issues</url>
   </issueManagement>
 
   <distributionManagement>
@@ -73,9 +78,90 @@
     <ds-annotations.version>1.2.10</ds-annotations.version>
   </properties>
 
-    <description>This is the open Home Automation Bus (openHAB)</description>
+  <repositories>
 
-    <packaging>pom</packaging>
+    <!-- releases -->
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>jcenter</id>
+      <name>JCenter Repository</name>
+      <url>https://jcenter.bintray.com/</url>
+    </repository>
+
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>bintray</id>
+      <name>openHAB SmartHome Repository</name>
+      <url>https://api.bintray.com/maven/openhab/mvn/smarthome</url>
+    </repository>
+
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>openhab-artifactory-release</id>
+      <name>JFrog Artifactory Repository</name>
+      <url>https://openhab.jfrog.io/openhab/libs-release</url>
+    </repository>
+
+    <!-- snapshots -->
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>openhab-artifactory-snapshot</id>
+      <name>JFrog Artifactory Repository</name>
+      <url>https://openhab.jfrog.io/openhab/libs-snapshot</url>
+    </repository>
+
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>jcenter</id>
+      <name>JCenter Repository</name>
+      <url>https://jcenter.bintray.com/</url>
+    </pluginRepository>
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>artifactory</id>
+      <name>JFrog Artifactory Repository</name>
+      <url>https://openhab.jfrog.io/openhab/libs-release</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <build>
     <pluginManagement>
@@ -214,10 +300,10 @@
             <executions>
               <execution>
                 <id>update-version</id>
-                                <phase>initialize</phase>
                 <goals>
                   <goal>set-version</goal>
                 </goals>
+                <phase>initialize</phase>
               </execution>
             </executions>
           </plugin>
@@ -236,10 +322,10 @@
             <executions>
               <execution>
                 <id>update-version</id>
-                                <phase>initialize</phase>
                 <goals>
                   <goal>set-version</goal>
                 </goals>
+                <phase>initialize</phase>
               </execution>
             </executions>
           </plugin>
@@ -264,13 +350,13 @@
               <version>${sat.version}</version>
               <executions>
                 <execution>
-                  <phase>verify</phase>
                   <goals>
                     <goal>checkstyle</goal>
                     <goal>pmd</goal>
                     <goal>spotbugs</goal>
                     <goal>report</goal>
                   </goals>
+                  <phase>verify</phase>
                 </execution>
               </executions>
             </plugin>
@@ -314,89 +400,4 @@
     </profile>
   </profiles>
 
-    <pluginRepositories>
-      <pluginRepository>
-            <id>jcenter</id>
-            <name>JCenter Repository</name>
-            <url>https://jcenter.bintray.com/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-      </pluginRepository>
-      <pluginRepository>
-          <id>artifactory</id>
-          <name>JFrog Artifactory Repository</name>
-          <url>https://openhab.jfrog.io/openhab/libs-release</url>
-          <releases>
-              <enabled>true</enabled>
-              <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-              <enabled>false</enabled>
-          </snapshots>
-      </pluginRepository>
-    </pluginRepositories>
-
-    <repositories>
-
-        <!-- releases -->
-        <repository>
-            <id>jcenter</id>
-            <name>JCenter Repository</name>
-            <url>https://jcenter.bintray.com/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
-        <repository>
-            <id>bintray</id>
-            <name>openHAB SmartHome Repository</name>
-            <url>https://api.bintray.com/maven/openhab/mvn/smarthome</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        
-        <repository>
-            <id>openhab-artifactory-release</id>
-            <name>JFrog Artifactory Repository</name>
-            <url>https://openhab.jfrog.io/openhab/libs-release</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
-        <!-- snapshots -->
-        <repository>
-            <id>openhab-artifactory-snapshot</id>
-            <name>JFrog Artifactory Repository</name>
-            <url>https://openhab.jfrog.io/openhab/libs-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-
-    </repositories>
-
 </project>

poms/tycho/pom.xml

@@ -1,4 +1,5 @@
-<?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">
+<?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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -310,52 +311,23 @@
     </dependency>
   </dependencies>
 
-    <build>
+  <repositories>
-        <plugins>
+    <!-- openHAB dependencies p2 repository -->
-            <plugin>
+    <repository>
-                <groupId>${tycho-groupid}</groupId>
+      <id>p2-openhab-deps-repo</id>
-                <artifactId>tycho-maven-plugin</artifactId>
+      <url>https://dl.bintray.com/openhab/p2/openhab-deps-repo/${ohdr.version}</url>
-                <version>${tycho-version}</version>
+      <layout>p2</layout>
-                <extensions>true</extensions>
+    </repository>
-            </plugin>
-            <plugin>
-                <groupId>${tycho-groupid}</groupId>
-                <artifactId>tycho-packaging-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <configuration>
-                    <strictVersions>false</strictVersions>
-                </configuration>
-            </plugin>
-			<plugin>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-eclipse-compiler</artifactId>
-				<version>${groovy.eclipse.compiler.version}</version>
-				<extensions>true</extensions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-scr-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-scr-scrdescriptor</id>
-						<goals>
-							<goal>scr</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.osgi</groupId>
-						<artifactId>org.osgi.service.component.annotations</artifactId>
-						<version>1.3.0</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-        </plugins>
 
+    <!-- Eclipse p2 repository -->
+    <repository>
+      <id>eclipse-oxygen</id>
+      <url>http://download.eclipse.org/releases/oxygen/201709271000</url>
+      <layout>p2</layout>
+    </repository>
+  </repositories>
+
+  <build>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -431,13 +403,6 @@
           <configuration>
             <compilerId>groovy-eclipse-compiler</compilerId>
           </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                        </execution>
-                    </executions>
           <dependencies>
             <dependency>
               <groupId>org.codehaus.groovy</groupId>
@@ -450,9 +415,60 @@
               <version>2.4.3-01</version>
             </dependency>
           </dependencies>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>${tycho-groupid}</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <strictVersions>false</strictVersions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-eclipse-compiler</artifactId>
+        <version>${groovy.eclipse.compiler.version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <version>1.3.0</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>generate-scr-scrdescriptor</id>
+            <goals>
+              <goal>scr</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <profiles>
@@ -464,18 +480,18 @@
             <groupId>${tycho-groupid}</groupId>
             <artifactId>tycho-source-plugin</artifactId>
             <version>${tycho-version}</version>
-                        <executions>
-                            <execution>
-                                <id>plugin-source</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>plugin-source</goal>
-                                </goals>
-                            </execution>
-                        </executions>
             <configuration>
               <sourceBundle>true</sourceBundle>
             </configuration>
+            <executions>
+              <execution>
+                <id>plugin-source</id>
+                <goals>
+                  <goal>plugin-source</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
@@ -492,10 +508,10 @@
             <executions>
               <execution>
                 <id>update-version</id>
-                                <phase>initialize</phase>
                 <goals>
                   <goal>set-version</goal>
                 </goals>
+                <phase>initialize</phase>
               </execution>
             </executions>
           </plugin>
@@ -504,21 +520,4 @@
     </profile>
   </profiles>
 
-	<repositories>
-
-        <!-- openHAB dependencies p2 repository -->
-        <repository>
-            <id>p2-openhab-deps-repo</id>
-            <url>https://dl.bintray.com/openhab/p2/openhab-deps-repo/${ohdr.version}</url>
-            <layout>p2</layout>
-        </repository>
-
-        <!-- Eclipse p2 repository -->
-        <repository>
-            <id>eclipse-oxygen</id>
-            <url>http://download.eclipse.org/releases/oxygen/201709271000</url>
-            <layout>p2</layout>
-        </repository>
-	</repositories>
-
 </project>