From b25fc4d35623aae23874ce33fe55be8076ca168a Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Fri, 5 Jan 2024 13:03:05 +0100
Subject: [PATCH] Sort POMs and apply Spotless

Signed-off-by: Wouter Born <github@maindrain.net>
---
 distributions/openhab-addons/pom.xml | 152 +++----
 distributions/openhab-demo/pom.xml   |  70 ++--
 distributions/openhab-verify/pom.xml | 142 +++----
 distributions/openhab/pom.xml        | 546 ++++++++++++------------
 distributions/pom.xml                |   8 +-
 features/addons/pom.xml              |  80 ++--
 features/distro-kar/pom.xml          | 112 ++---
 features/distro/pom.xml              | 112 ++---
 features/pom.xml                     |  32 +-
 pom.xml                              | 606 ++++++++++++++-------------
 10 files changed, 940 insertions(+), 920 deletions(-)

diff --git a/distributions/openhab-addons/pom.xml b/distributions/openhab-addons/pom.xml
index 2ec66854be..b74f775564 100644
--- a/distributions/openhab-addons/pom.xml
+++ b/distributions/openhab-addons/pom.xml
@@ -1,83 +1,85 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-distributions</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-distributions</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openhab-addons</artifactId>
-    <packaging>kar</packaging>
+  <artifactId>openhab-addons</artifactId>
+  <packaging>kar</packaging>
 
-    <name>openHAB Add-ons Aggregator</name>
+  <name>openHAB Add-ons Aggregator</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.openhab.distro</groupId>
-            <artifactId>addons</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.addons.features.karaf</groupId>
-            <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.addons.features.karaf</groupId>
-            <artifactId>openhab-binding-zigbee</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.ui.features</groupId>
-            <artifactId>org.openhab.ui.features</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.openhab.distro</groupId>
+      <artifactId>addons</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.features.karaf</groupId>
+      <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.features.karaf</groupId>
+      <artifactId>openhab-binding-zigbee</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.ui.features</groupId>
+      <artifactId>org.openhab.ui.features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <startLevel>80</startLevel>
-                    <enableGeneration>true</enableGeneration>
-                    <aggregateFeatures>true</aggregateFeatures>
-                    <!--  <resolver>(obr)</resolver> -->
-                    <checkDependencyChange>true</checkDependencyChange>
-                    <failOnDependencyChange>false</failOnDependencyChange>
-                    <logDependencyChanges>true</logDependencyChanges>
-                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
-                    <ignoreDependencyFlag>true</ignoreDependencyFlag>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Karaf-Feature-Start>false</Karaf-Feature-Start>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>generate-features-file</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>features-generate-descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <startLevel>80</startLevel>
+          <enableGeneration>true</enableGeneration>
+          <aggregateFeatures>true</aggregateFeatures>
+          <!-- <resolver>(obr)</resolver> -->
+          <checkDependencyChange>true</checkDependencyChange>
+          <failOnDependencyChange>false</failOnDependencyChange>
+          <logDependencyChanges>true</logDependencyChanges>
+          <overwriteChangedDependencies>true</overwriteChangedDependencies>
+          <ignoreDependencyFlag>true</ignoreDependencyFlag>
+          <archive>
+            <index>true</index>
+            <manifestEntries>
+              <Karaf-Feature-Start>false</Karaf-Feature-Start>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-features-file</id>
+            <goals>
+              <goal>features-generate-descriptor</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/distributions/openhab-demo/pom.xml b/distributions/openhab-demo/pom.xml
index cc61d7fe8a..a3594d017f 100644
--- a/distributions/openhab-demo/pom.xml
+++ b/distributions/openhab-demo/pom.xml
@@ -1,40 +1,42 @@
-<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-distributions</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-distributions</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openhab-demo</artifactId>
-    <packaging>pom</packaging>
+  <artifactId>openhab-demo</artifactId>
+  <packaging>pom</packaging>
 
-    <name>openHAB Demo</name>
+  <name>openHAB Demo</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/archive.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <tarLongFileMode>posix</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>archive</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/descriptors/archive.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+              <tarLongFileMode>posix</tarLongFileMode>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/distributions/openhab-verify/pom.xml b/distributions/openhab-verify/pom.xml
index d86fd96008..50b52a8150 100644
--- a/distributions/openhab-verify/pom.xml
+++ b/distributions/openhab-verify/pom.xml
@@ -1,78 +1,80 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-distributions</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-distributions</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openhab-verify</artifactId>
-    <packaging>pom</packaging>
+  <artifactId>openhab-verify</artifactId>
+  <packaging>pom</packaging>
 
-    <name>openHAB Feature Verification</name>
+  <name>openHAB Feature Verification</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>framework</artifactId>
-            <version>${karaf.version}</version>
-            <type>kar</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>openhab-addons</artifactId>
-            <version>${project.version}</version>
-            <type>kar</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>distro-kar</artifactId>
-            <version>${project.version}</version>
-            <type>kar</type>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <version>${karaf.version}</version>
+      <type>kar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>openhab-addons</artifactId>
+      <version>${project.version}</version>
+      <type>kar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>distro-kar</artifactId>
+      <version>${project.version}</version>
+      <type>kar</type>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:${project.groupId}/addons/${project.version}/xml/features</descriptor>
-                                <descriptor>mvn:${project.groupId}/distro/${project.version}/xml/features</descriptor>
-                            </descriptors>
-                            <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>${oh.java.version}</javase>
-                            <framework>
-                                <feature>framework</feature>
-                            </framework>
-                            <features>
-                                <feature>openhab-*</feature>
-                            </features>
-                            <verifyTransitive>false</verifyTransitive>
-                            <ignoreMissingConditions>true</ignoreMissingConditions>
-                            <fail>first</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
+                <descriptor>mvn:${project.groupId}/addons/${project.version}/xml/features</descriptor>
+                <descriptor>mvn:${project.groupId}/distro/${project.version}/xml/features</descriptor>
+              </descriptors>
+              <distribution>org.apache.karaf.features:framework</distribution>
+              <javase>${oh.java.version}</javase>
+              <framework>
+                <feature>framework</feature>
+              </framework>
+              <features>
+                <feature>openhab-*</feature>
+              </features>
+              <verifyTransitive>false</verifyTransitive>
+              <ignoreMissingConditions>true</ignoreMissingConditions>
+              <fail>first</fail>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
index bdb8695b08..9e67e02bea 100644
--- a/distributions/openhab/pom.xml
+++ b/distributions/openhab/pom.xml
@@ -1,281 +1,283 @@
-<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-distributions</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-distributions</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openhab</artifactId>
-    <packaging>karaf-assembly</packaging>
+  <artifactId>openhab</artifactId>
+  <packaging>karaf-assembly</packaging>
 
-    <name>openHAB Distribution</name>
-    <description>This is the distribution of openHAB</description>
+  <name>openHAB Distribution</name>
+  <description>This is the distribution of openHAB</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>framework</artifactId>
-            <version>${karaf.version}</version>
-            <type>kar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>standard</artifactId>
-            <version>${karaf.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>specs</artifactId>
-            <version>${karaf.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.distro</groupId>
-            <artifactId>distro-kar</artifactId>
-            <version>${project.version}</version>
-            <type>kar</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.distro</groupId>
-            <artifactId>distro</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.distro</groupId>
-            <artifactId>openhab-addons</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <version>${karaf.version}</version>
+      <type>kar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>standard</artifactId>
+      <version>${karaf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>specs</artifactId>
+      <version>${karaf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.distro</groupId>
+      <artifactId>distro-kar</artifactId>
+      <version>${project.version}</version>
+      <type>kar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.distro</groupId>
+      <artifactId>distro</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.distro</groupId>
+      <artifactId>openhab-addons</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.1.0</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.openhab.util</groupId>
-                            <artifactId>pax-web-patch</artifactId>
-                            <version>1.0.0</version>
-                        </dependency>  
-                    </dependencies>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+  <build>
 
-        <resources>
-            <!-- add distribution specific resources -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
+    <resources>
+      <!-- add distribution specific resources -->
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/filtered-resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.1.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.openhab.util</groupId>
+              <artifactId>pax-web-patch</artifactId>
+              <version>1.0.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.0</version>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.openhab.core.tools</groupId>
-                                    <artifactId>upgradetool</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <classifier>jar-with-dependencies</classifier>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
-                                    <destFileName>upgradetool.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.openhab.addons.features.karaf</groupId>
-                                    <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>xml</type>
-                                    <classifier>addons</classifier>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/addon-xml</outputDirectory>
-                                    <destFileName>addons.xml</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.openhab.addons.bundles</groupId>
-                                    <artifactId>org.openhab.binding.zigbee</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <includes>**/addon.xml</includes>
-                                    <outputDirectory>${project.build.directory}/addon-xml/org.openhab.binding.zigbee</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.openhab.addons.bundles</groupId>
-                                    <artifactId>org.openhab.binding.zwave</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <includes>**/addon.xml</includes>
-                                    <outputDirectory>${project.build.directory}/addon-xml/org.openhab.binding.zwave</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
-                        <version>4.0.13</version>
-                        <type>pom</type>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <source>${project.basedir}/merge-addon-info.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                  <escapeString>\</escapeString>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <configuration>
-                    <installedFeatures>
-                        <feature>wrapper</feature>
-                        <feature>wrap</feature>
-                    </installedFeatures>
-                    <startupFeatures>
-                        <feature>eventadmin</feature>
-                    </startupFeatures>
-                    <bootFeatures>
-                        <feature>jaas</feature>
-                        <feature>shell</feature>
-                        <feature>ssh</feature>
-                        <feature>bundle</feature>
-                        <feature>config</feature>
-                        <feature>deployer</feature>
-                        <feature>diagnostic</feature>
-                        <feature>feature</feature>
-                        <feature>instance</feature>
-                        <feature>kar</feature>
-                        <feature>log</feature>
-                        <feature>package</feature>
-                        <feature>service</feature>
-                        <feature>system</feature>
-                        <feature>openhab-runtime-base</feature>
-                        <feature>openhab-runtime-ui</feature>
-                    </bootFeatures>
-                    <archiveZip>false</archiveZip>
-                    <archiveTarGz>false</archiveTarGz>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.openhab.patch.ClassPathUtilPatcher</mainClass>
-                    <arguments>
-                        <argument>${project.basedir}/target/assembly/system/org/ops4j/pax/web/pax-web-api</argument>
-                    </arguments>
-                    <includePluginDependencies>True</includePluginDependencies>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/descriptors/archive.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <tarLongFileMode>posix</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.6.0</version>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.openhab.core.tools</groupId>
+                  <artifactId>upgradetool</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <classifier>jar-with-dependencies</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
+                  <destFileName>upgradetool.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.openhab.addons.features.karaf</groupId>
+                  <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
+                  <version>${project.version}</version>
+                  <type>xml</type>
+                  <classifier>addons</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/addon-xml</outputDirectory>
+                  <destFileName>addons.xml</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.openhab.addons.bundles</groupId>
+                  <artifactId>org.openhab.binding.zigbee</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <includes>**/addon.xml</includes>
+                  <outputDirectory>${project.build.directory}/addon-xml/org.openhab.binding.zigbee</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.openhab.addons.bundles</groupId>
+                  <artifactId>org.openhab.binding.zwave</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <includes>**/addon.xml</includes>
+                  <outputDirectory>${project.build.directory}/addon-xml/org.openhab.binding.zwave</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>groovy-maven-plugin</artifactId>
+        <version>2.1.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>4.0.13</version>
+            <type>pom</type>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <source>${project.basedir}/merge-addon-info.groovy</source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <escapeString>\</escapeString>
+        </configuration>
+        <executions>
+          <execution>
+            <id>process-resources</id>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <configuration>
+          <installedFeatures>
+            <feature>wrapper</feature>
+            <feature>wrap</feature>
+          </installedFeatures>
+          <startupFeatures>
+            <feature>eventadmin</feature>
+          </startupFeatures>
+          <bootFeatures>
+            <feature>jaas</feature>
+            <feature>shell</feature>
+            <feature>ssh</feature>
+            <feature>bundle</feature>
+            <feature>config</feature>
+            <feature>deployer</feature>
+            <feature>diagnostic</feature>
+            <feature>feature</feature>
+            <feature>instance</feature>
+            <feature>kar</feature>
+            <feature>log</feature>
+            <feature>package</feature>
+            <feature>service</feature>
+            <feature>system</feature>
+            <feature>openhab-runtime-base</feature>
+            <feature>openhab-runtime-ui</feature>
+          </bootFeatures>
+          <archiveZip>false</archiveZip>
+          <archiveTarGz>false</archiveTarGz>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <mainClass>org.openhab.patch.ClassPathUtilPatcher</mainClass>
+          <arguments>
+            <argument>${project.basedir}/target/assembly/system/org/ops4j/pax/web/pax-web-api</argument>
+          </arguments>
+          <includePluginDependencies>True</includePluginDependencies>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+            <phase>prepare-package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>archive</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/descriptors/archive.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+              <tarLongFileMode>posix</tarLongFileMode>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/distributions/pom.xml b/distributions/pom.xml
index c7f5d4a63d..123080ff76 100644
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -1,4 +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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -9,10 +11,10 @@
 
   <artifactId>pom-distributions</artifactId>
 
-  <name>openHAB Distributions</name>
-
   <packaging>pom</packaging>
 
+  <name>openHAB Distributions</name>
+
   <modules>
     <module>openhab-addons</module>
     <module>openhab-demo</module>
diff --git a/features/addons/pom.xml b/features/addons/pom.xml
index 91f3f7a573..142a987361 100644
--- a/features/addons/pom.xml
+++ b/features/addons/pom.xml
@@ -1,46 +1,48 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.openhab.distro</groupId>
-		<artifactId>pom-features</artifactId>
-		<version>4.2.0-SNAPSHOT</version>
-	</parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-features</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-	<artifactId>addons</artifactId>
-	<packaging>feature</packaging>
+  <artifactId>addons</artifactId>
+  <packaging>feature</packaging>
 
-	<name>openHAB Add-ons</name>
-	<description>These are add-ons in separate repositories (which do not have their own Karaf feature defined).</description>
+  <name>openHAB Add-ons</name>
+  <description>These are add-ons in separate repositories (which do not have their own Karaf feature defined).</description>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.karaf.tooling</groupId>
-				<artifactId>karaf-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<startLevel>80</startLevel>
-					<enableGeneration>true</enableGeneration>
-					<aggregateFeatures>true</aggregateFeatures>
-					<!--  <resolver>(obr)</resolver> -->
-					<checkDependencyChange>true</checkDependencyChange>
-					<failOnDependencyChange>false</failOnDependencyChange>
-					<logDependencyChanges>true</logDependencyChanges>
-					<overwriteChangedDependencies>true</overwriteChangedDependencies>
-				</configuration>
-				<executions>
-					<execution>
-						<id>generate-features-file</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>features-generate-descriptor</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <startLevel>80</startLevel>
+          <enableGeneration>true</enableGeneration>
+          <aggregateFeatures>true</aggregateFeatures>
+          <!-- <resolver>(obr)</resolver> -->
+          <checkDependencyChange>true</checkDependencyChange>
+          <failOnDependencyChange>false</failOnDependencyChange>
+          <logDependencyChanges>true</logDependencyChanges>
+          <overwriteChangedDependencies>true</overwriteChangedDependencies>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-features-file</id>
+            <goals>
+              <goal>features-generate-descriptor</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/features/distro-kar/pom.xml b/features/distro-kar/pom.xml
index e392d7532d..ed52a8ebbe 100644
--- a/features/distro-kar/pom.xml
+++ b/features/distro-kar/pom.xml
@@ -1,63 +1,65 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-features</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-features</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>distro-kar</artifactId>
-    <packaging>kar</packaging>
+  <artifactId>distro-kar</artifactId>
+  <packaging>kar</packaging>
 
-    <name>openHAB Distro Feature KAR</name>
-    <description>openHAB Distro Feature KAR</description>
+  <name>openHAB Distro Feature KAR</name>
+  <description>openHAB Distro Feature KAR</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>distro</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>distro</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <startLevel>80</startLevel>
-                    <enableGeneration>true</enableGeneration>
-                    <aggregateFeatures>true</aggregateFeatures>
-                    <!--  <resolver>(obr)</resolver> -->
-                    <checkDependencyChange>true</checkDependencyChange>
-                    <failOnDependencyChange>false</failOnDependencyChange>
-                    <logDependencyChanges>true</logDependencyChanges>
-                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
-                    <ignoreDependencyFlag>true</ignoreDependencyFlag>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Karaf-Feature-Start>false</Karaf-Feature-Start>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>generate-features-file</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>features-generate-descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <startLevel>80</startLevel>
+          <enableGeneration>true</enableGeneration>
+          <aggregateFeatures>true</aggregateFeatures>
+          <!-- <resolver>(obr)</resolver> -->
+          <checkDependencyChange>true</checkDependencyChange>
+          <failOnDependencyChange>false</failOnDependencyChange>
+          <logDependencyChanges>true</logDependencyChanges>
+          <overwriteChangedDependencies>true</overwriteChangedDependencies>
+          <ignoreDependencyFlag>true</ignoreDependencyFlag>
+          <archive>
+            <index>true</index>
+            <manifestEntries>
+              <Karaf-Feature-Start>false</Karaf-Feature-Start>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-features-file</id>
+            <goals>
+              <goal>features-generate-descriptor</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/features/distro/pom.xml b/features/distro/pom.xml
index df808cd569..33e98c0ac5 100644
--- a/features/distro/pom.xml
+++ b/features/distro/pom.xml
@@ -1,63 +1,65 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.openhab.distro</groupId>
-        <artifactId>pom-features</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom-features</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>distro</artifactId>
-    <packaging>feature</packaging>
+  <artifactId>distro</artifactId>
+  <packaging>feature</packaging>
 
-    <name>openHAB Distro Feature</name>
-    <description>openHAB Distro Feature</description>
+  <name>openHAB Distro Feature</name>
+  <description>openHAB Distro Feature</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.openhab.core.features.karaf</groupId>
-            <artifactId>org.openhab.core.features.karaf.openhab-core</artifactId>
-            <version>${ohc.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.openhab.core.features.karaf</groupId>
-            <artifactId>org.openhab.core.features.karaf.openhab-tp</artifactId>
-            <version>${ohc.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.openhab.core.features.karaf</groupId>
+      <artifactId>org.openhab.core.features.karaf.openhab-core</artifactId>
+      <version>${ohc.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.core.features.karaf</groupId>
+      <artifactId>org.openhab.core.features.karaf.openhab-tp</artifactId>
+      <version>${ohc.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <startLevel>50</startLevel>
-                    <enableGeneration>true</enableGeneration>
-                    <aggregateFeatures>true</aggregateFeatures>
-                    <!--  <resolver>(obr)</resolver> -->
-                    <checkDependencyChange>true</checkDependencyChange>
-                    <failOnDependencyChange>false</failOnDependencyChange>
-                    <logDependencyChanges>true</logDependencyChanges>
-                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>generate-features-file</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>features-generate-descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>karaf-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <startLevel>50</startLevel>
+          <enableGeneration>true</enableGeneration>
+          <aggregateFeatures>true</aggregateFeatures>
+          <!-- <resolver>(obr)</resolver> -->
+          <checkDependencyChange>true</checkDependencyChange>
+          <failOnDependencyChange>false</failOnDependencyChange>
+          <logDependencyChanges>true</logDependencyChanges>
+          <overwriteChangedDependencies>true</overwriteChangedDependencies>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-features-file</id>
+            <goals>
+              <goal>features-generate-descriptor</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 9337b230ef..cde2150f76 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,22 +1,24 @@
-<?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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<parent>
-		<groupId>org.openhab.distro</groupId>
-		<artifactId>pom</artifactId>
-		<version>4.2.0-SNAPSHOT</version>
-	</parent>
+  <modelVersion>4.0.0</modelVersion>
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>pom-features</artifactId>
+  <parent>
+    <groupId>org.openhab.distro</groupId>
+    <artifactId>pom</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>pom-features</artifactId>
 
-	<name>openHAB Features</name>
+  <packaging>pom</packaging>
 
-	<packaging>pom</packaging>
+  <name>openHAB Features</name>
 
-	<modules>
-		<module>distro</module>
-		<module>distro-kar</module>
-		<module>addons</module>
-	</modules>
+  <modules>
+    <module>distro</module>
+    <module>distro-kar</module>
+    <module>addons</module>
+  </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 6b5ca5ce74..eac73030e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,322 +1,324 @@
-<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-      <groupId>org.openhab</groupId>
-      <artifactId>openhab-super-pom</artifactId>
-      <version>[1.0, 2.0)</version>
-    </parent>
+  <parent>
+    <groupId>org.openhab</groupId>
+    <artifactId>openhab-super-pom</artifactId>
+    <version>[1.0, 2.0)</version>
+  </parent>
 
-    <groupId>org.openhab.distro</groupId>
-    <artifactId>pom</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  <groupId>org.openhab.distro</groupId>
+  <artifactId>pom</artifactId>
+  <version>4.2.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <name>openHAB Distribution</name>
-    <description>This is the openHAB distribution</description>
+  <name>openHAB Distribution</name>
+  <description>This is the openHAB distribution</description>
 
-    <licenses>
-        <license>
-            <name>Eclipse Public License 2.0</name>
-            <url>https://www.eclipse.org/legal/epl-2.0/</url>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>Eclipse Public License 2.0</name>
+      <url>https://www.eclipse.org/legal/epl-2.0/</url>
+    </license>
+  </licenses>
 
-    <scm>
-        <connection>scm:git:${scm.gitBaseUrl}/openhab-distro.git</connection>
-        <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-distro.git</developerConnection>
-        <url>https://github.com/openhab/openhab-distro</url>
-        <tag>HEAD</tag>
-    </scm>
+  <modules>
+    <module>features</module>
+    <module>distributions</module>
+  </modules>
 
-    <issueManagement>
-        <url>https://github.com/openhab/openhab-distro/issues</url>
-        <system>GitHub</system>
-    </issueManagement>
+  <scm>
+    <connection>scm:git:${scm.gitBaseUrl}/openhab-distro.git</connection>
+    <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-distro.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/openhab/openhab-distro</url>
+  </scm>
 
-    <distributionManagement>
-        <repository>
-            <id>jfrog-release</id>
-            <url>${oh.repo.distBaseUrl}/libs-release-local</url>
-        </repository>
-        <snapshotRepository>
-            <id>jfrog</id>
-            <url>${oh.repo.snapshotBaseUrl}/libs-snapshot-local</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/openhab/openhab-distro/issues</url>
+  </issueManagement>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  <distributionManagement>
+    <repository>
+      <id>jfrog-release</id>
+      <url>${oh.repo.distBaseUrl}/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>jfrog</id>
+      <url>${oh.repo.snapshotBaseUrl}/libs-snapshot-local</url>
+    </snapshotRepository>
+  </distributionManagement>
 
-        <online.repo.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</online.repo.version>        
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <ohc.version>4.2.0-SNAPSHOT</ohc.version>
-        <oha.version>4.2.0-SNAPSHOT</oha.version>
+    <online.repo.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</online.repo.version>
 
-        <karaf.version>4.4.4</karaf.version>
+    <ohc.version>4.2.0-SNAPSHOT</ohc.version>
+    <oha.version>4.2.0-SNAPSHOT</oha.version>
 
-        <oh.java.version>17</oh.java.version>
-        <maven.compiler.source>${oh.java.version}</maven.compiler.source>
-        <maven.compiler.target>${oh.java.version}</maven.compiler.target>
+    <karaf.version>4.4.4</karaf.version>
 
-        <sat.version>0.15.0</sat.version>
-        <spotless.version>2.38.0</spotless.version>
-        <!-- Eclipse Java formatter version 4.26+ does not check test files -->
-        <spotless.eclipse.version>4.25</spotless.eclipse.version>
-        <spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
-    </properties>
+    <oh.java.version>17</oh.java.version>
+    <maven.compiler.source>${oh.java.version}</maven.compiler.source>
+    <maven.compiler.target>${oh.java.version}</maven.compiler.target>
 
-    <modules>
-        <module>features</module>
-        <module>distributions</module>
-    </modules>
+    <sat.version>0.15.0</sat.version>
+    <spotless.version>2.38.0</spotless.version>
+    <!-- Eclipse Java formatter version 4.26+ does not check test files -->
+    <spotless.eclipse.version>4.25</spotless.eclipse.version>
+    <spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
+  </properties>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.karaf.tooling</groupId>
-                    <artifactId>karaf-maven-plugin</artifactId>
-                    <version>${karaf.version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.6.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
-                    <configuration>
-                        <!-- Workaround for build errors when using feature packaging and enableGeneration=true -->
-                        <!-- with the karaf-maven-plugin, see: https://issues.apache.org/jira/browse/KARAF-7734 -->
-                        <allowIncompleteProjects>true</allowIncompleteProjects>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.4.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.mycila</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>4.2</version>
-                    <configuration>
-                        <basedir>${basedir}</basedir>
-                        <quiet>false</quiet>
-                        <failIfMissing>true</failIfMissing>
-                        <strictCheck>true</strictCheck>
-                        <aggregate>true</aggregate>
-                        <mapping>
-                            <groovy>JAVADOC_STYLE</groovy>
-                            <java>JAVADOC_STYLE</java>
-                            <xml>xml-header-style</xml>
-                        </mapping>
-                        <useDefaultExcludes>true</useDefaultExcludes>
-                        <properties>
-                            <year>2024</year>
-                        </properties>
-                        <encoding>UTF-8</encoding>
-                        <licenseSets>
-                            <licenseSet>
-                                <header>licenses/epl-2.0/header.txt</header>
-                                <headerDefinitions>
-                                    <headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
-                                </headerDefinitions>
-                                <includes>
-                                    <include>**/distributions/**/*.groovy</include>
-                                </includes>
-                                <excludes>
-                                    <exclude>target/**</exclude>
-                                    <exclude>**/pom.xml</exclude>
-                                </excludes>
-                            </licenseSet>
-                        </licenseSets>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.ekryd.sortpom</groupId>
-                    <artifactId>sortpom-maven-plugin</artifactId>
-                    <version>3.3.0</version>
-                    <configuration>
-                        <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
-                        <createBackupFile>false</createBackupFile>
-                        <keepBlankLines>true</keepBlankLines>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>sortpom-verify</id>
-                            <goals>
-                                <goal>verify</goal>
-                            </goals>
-                            <phase>verify</phase>
-                            <configuration>
-                                <verifyFail>Stop</verifyFail>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.diffplug.spotless</groupId>
-                    <artifactId>spotless-maven-plugin</artifactId>
-                    <version>${spotless.version}</version>
-                    <configuration>
-                        <formats>
-                            <format>
-                                <!-- pom.xml -->
-                                <includes>
-                                    <include>pom.xml</include>
-                                </includes>
-                                <eclipseWtp>
-                                    <type>XML</type>
-                                    <files>
-                                        <file>openhab_wst_pom_file.prefs</file>
-                                    </files>
-                                    <version>${spotless.eclipse.wtp.version}</version>
-                                </eclipseWtp>
-                                <trimTrailingWhitespace/>
-                                <endWithNewline/>
-                            </format>
-                        </formats>
-                    </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.openhab.tools</groupId>
-                            <artifactId>openhab-codestyle</artifactId>
-                            <version>${sat.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <executions>
-                        <execution>
-                            <id>codestyle_check</id>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                            <phase>initialize</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-        </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>enforce-java</id>
-                    <goals>
-                      <goal>enforce</goal>
-                    </goals>
-                    <configuration>
-                      <rules>
-                        <requireJavaVersion>
-                          <version>[17.0,18.0)</version>
-                        </requireJavaVersion>
-                      </rules>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>parse-version</id>
-                    <goals>
-                      <goal>parse-version</goal>
-                    </goals>
-                  </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.github.ekryd.sortpom</groupId>
-                <artifactId>sortpom-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>jfrog</id>
+      <name>Artifactory Repository for openHAB</name>
+      <url>https://openhab.jfrog.io/artifactory/libs-3rdparty-local</url>
+    </pluginRepository>
+  </pluginRepositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>jfrog</id>
-            <name>Artifactory Repository for openHAB</name>
-            <url>https://openhab.jfrog.io/artifactory/libs-3rdparty-local</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <profiles>
-        <profile>
-            <id>snapshotbuild</id>
-            <activation>
-                <property>
-                    <name>!release</name>
-                </property>
-            </activation>
-            <properties>
-                <build.number>- local build -</build.number>
-                <online.repo>${oh.repo.releaseBaseUrl}/libs-snapshot</online.repo>
-                <pax.url.suffix>@snapshots</pax.url.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>releasebuild</id>
-            <activation>
-                <property>
-                    <name>release</name>
-                </property>
-            </activation>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.karaf.tooling</groupId>
+          <artifactId>karaf-maven-plugin</artifactId>
+          <version>${karaf.version}</version>
+          <extensions>true</extensions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.4.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.11.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>3.1.1</version>
+          <configuration>
+            <!-- Workaround for build errors when using feature packaging and enableGeneration=true -->
+            <!-- with the karaf-maven-plugin, see: https://issues.apache.org/jira/browse/KARAF-7734 -->
+            <allowIncompleteProjects>true</allowIncompleteProjects>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.4.0</version>
+        </plugin>
+        <plugin>
+          <groupId>com.mycila</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+          <version>4.2</version>
+          <configuration>
+            <basedir>${basedir}</basedir>
+            <quiet>false</quiet>
+            <failIfMissing>true</failIfMissing>
+            <strictCheck>true</strictCheck>
+            <aggregate>true</aggregate>
+            <mapping>
+              <groovy>JAVADOC_STYLE</groovy>
+              <java>JAVADOC_STYLE</java>
+              <xml>xml-header-style</xml>
+            </mapping>
+            <useDefaultExcludes>true</useDefaultExcludes>
             <properties>
-                <build.number>Release Build</build.number>
-                <online.repo>${oh.repo.releaseBaseUrl}/libs-release</online.repo>
-                <pax.url.suffix/>
+              <year>2024</year>
             </properties>
-        </profile>
-        <profile>
-            <id>milestonebuild</id>
-            <activation>
-                <property>
-                    <name>milestone</name>
-                </property>
-            </activation>
-            <properties>
-                <build.number>Milestone Build</build.number>
-                <online.repo>${oh.repo.releaseBaseUrl}/libs-milestone</online.repo>
-                <pax.url.suffix/>
-            </properties>
-        </profile>
-    </profiles>
+            <encoding>UTF-8</encoding>
+            <licenseSets>
+              <licenseSet>
+                <header>licenses/epl-2.0/header.txt</header>
+                <headerDefinitions>
+                  <headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
+                </headerDefinitions>
+                <includes>
+                  <include>**/distributions/**/*.groovy</include>
+                </includes>
+                <excludes>
+                  <exclude>target/**</exclude>
+                  <exclude>**/pom.xml</exclude>
+                </excludes>
+              </licenseSet>
+            </licenseSets>
+          </configuration>
+          <executions>
+            <execution>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>com.github.ekryd.sortpom</groupId>
+          <artifactId>sortpom-maven-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+            <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+            <createBackupFile>false</createBackupFile>
+            <keepBlankLines>true</keepBlankLines>
+          </configuration>
+          <executions>
+            <execution>
+              <id>sortpom-verify</id>
+              <goals>
+                <goal>verify</goal>
+              </goals>
+              <phase>verify</phase>
+              <configuration>
+                <verifyFail>Stop</verifyFail>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>${spotless.version}</version>
+          <configuration>
+            <formats>
+              <format>
+                <!-- pom.xml -->
+                <includes>
+                  <include>pom.xml</include>
+                </includes>
+                <eclipseWtp>
+                  <type>XML</type>
+                  <files>
+                    <file>openhab_wst_pom_file.prefs</file>
+                  </files>
+                  <version>${spotless.eclipse.wtp.version}</version>
+                </eclipseWtp>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
+              </format>
+            </formats>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.openhab.tools</groupId>
+              <artifactId>openhab-codestyle</artifactId>
+              <version>${sat.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <id>codestyle_check</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <phase>initialize</phase>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>[17.0,18.0)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.ekryd.sortpom</groupId>
+        <artifactId>sortpom-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>snapshotbuild</id>
+      <activation>
+        <property>
+          <name>!release</name>
+        </property>
+      </activation>
+      <properties>
+        <build.number>- local build -</build.number>
+        <online.repo>${oh.repo.releaseBaseUrl}/libs-snapshot</online.repo>
+        <pax.url.suffix>@snapshots</pax.url.suffix>
+      </properties>
+    </profile>
+    <profile>
+      <id>releasebuild</id>
+      <activation>
+        <property>
+          <name>release</name>
+        </property>
+      </activation>
+      <properties>
+        <build.number>Release Build</build.number>
+        <online.repo>${oh.repo.releaseBaseUrl}/libs-release</online.repo>
+        <pax.url.suffix></pax.url.suffix>
+      </properties>
+    </profile>
+    <profile>
+      <id>milestonebuild</id>
+      <activation>
+        <property>
+          <name>milestone</name>
+        </property>
+      </activation>
+      <properties>
+        <build.number>Milestone Build</build.number>
+        <online.repo>${oh.repo.releaseBaseUrl}/libs-milestone</online.repo>
+        <pax.url.suffix></pax.url.suffix>
+      </properties>
+    </profile>
+  </profiles>
 
 </project>