diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index 0833f09df16..c3a15ccdb32 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -1,135 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.eclipse.tm.terminal</groupId>
-        <artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
-        <relativePath>pom-config.xml</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.eclipse.tm.terminal</groupId>
+		<artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
+		<version>4.4.0-SNAPSHOT</version>
+		<relativePath>pom-config.xml</relativePath>
+	</parent>
 
-    <groupId>org.eclipse.tm.terminal</groupId>
-    <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>TM Terminal, Maven Build Master</name>
+	<groupId>org.eclipse.tm.terminal</groupId>
+	<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
+	<version>4.4.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>TM Terminal, Maven Build Master</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>target-platform-configuration</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 
-    <profiles>
-        <profile>
-            <id>sign</id>
-            <!-- Uses the new jarsigner from the CBI platform     -->
-            <!-- Works only if the build runs at a Eclipse build server -->
-            
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200a-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.cbi.maven.plugins</groupId>
-                        <artifactId>eclipse-jarsigner-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-pack200b-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-p2-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>findbugs</id>
- 
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>static-checks</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>tests</id>
-            
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>target-platform-configuration</artifactId>
-                        <configuration>
-                            <dependency-resolution>
-                                <extraRequirements>
-                                    <!-- product IU under test -->
-                                    <requirement>
-                                        <type>p2-installable-unit</type>
-                                        <id>org.eclipse.platform.ide</id>
-                                        <versionRange>0.0.0</versionRange>
-                                    </requirement>
-                                    <requirement>
-                                        <type>eclipse-feature</type>
-                                        <id>org.eclipse.sdk</id>
-                                        <versionRange>0.0.0</versionRange>
-                                    </requirement>
-                                    <requirement>
-                                        <type>eclipse-feature</type>
-                                        <id>org.eclipse.cdt.platform</id>
-                                        <versionRange>0.0.0</versionRange>
-                                    </requirement>
-                                    <requirement>
-                                        <type>eclipse-feature</type>
-                                        <id>org.eclipse.remote</id>
-                                        <versionRange>0.0.0</versionRange>
-                                    </requirement>
-                                    <requirement>
-                                        <type>eclipse-feature</type>
-                                        <id>org.eclipse.swtbot.eclipse</id>
-                                        <versionRange>0.0.0</versionRange>
-                                    </requirement>
-                                </extraRequirements>
-                            </dependency-resolution>
-                        </configuration>
-                    </plugin>
+	<profiles>
+		<profile>
+			<id>sign</id>
+			<!-- Uses the new jarsigner from the CBI platform -->
+			<!-- Works only if the build runs at a Eclipse build server -->
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>findbugs</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>findbugs-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>static-checks</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>findbugs-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-pmd-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>tests</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<configuration>
+							<dependency-resolution>
+								<extraRequirements>
+									<!-- product IU under test -->
+									<requirement>
+										<type>p2-installable-unit</type>
+										<id>org.eclipse.platform.ide</id>
+										<versionRange>0.0.0</versionRange>
+									</requirement>
+									<requirement>
+										<type>eclipse-feature</type>
+										<id>org.eclipse.sdk</id>
+										<versionRange>0.0.0</versionRange>
+									</requirement>
+									<requirement>
+										<type>eclipse-feature</type>
+										<id>org.eclipse.cdt.platform</id>
+										<versionRange>0.0.0</versionRange>
+									</requirement>
+									<requirement>
+										<type>eclipse-feature</type>
+										<id>org.eclipse.remote</id>
+										<versionRange>0.0.0</versionRange>
+									</requirement>
+									<requirement>
+										<type>eclipse-feature</type>
+										<id>org.eclipse.swtbot.eclipse</id>
+										<versionRange>0.0.0</versionRange>
+									</requirement>
+								</extraRequirements>
+							</dependency-resolution>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
@@ -142,39 +142,22 @@
 									<includes>
 										<include>org.eclipse.tm.terminal*</include>
 									</includes>
-									<!--
-									<excludes>
-										<exclude>org.eclipse.tm.terminal.test.*</exclude>
-									</excludes>
-									-->
+									<!-- <excludes> <exclude>org.eclipse.tm.terminal.test.*</exclude> 
+										</excludes> -->
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
-					<!--
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-surefire-plugin</artifactId>
-                        <version>${tycho-version}</version>
-                        <configuration>
-                            <useUIHarness>true</useUIHarness>
-                            <useUIThread>true</useUIThread>
-                            <failIfNoTests>false</failIfNoTests>
-                            <dependencies>
-                                <dependency>
-                                    <type>p2-installable-unit</type>
-                                    <artifactId>org.eclipse.platform.feature.group</artifactId>
-                                    <version>${sdk-version}</version>
-                                </dependency>
-                            </dependencies>
-                            <product>org.eclipse.platform.ide</product>
-                            <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
-                        </configuration>
-                    </plugin>
-                    -->
-                </plugins>
-            </build>
-        </profile>
-        
-    </profiles>
+					<!-- <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> 
+						<version>${tycho-version}</version> <configuration> <useUIHarness>true</useUIHarness> 
+						<useUIThread>true</useUIThread> <failIfNoTests>false</failIfNoTests> <dependencies> 
+						<dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.platform.feature.group</artifactId> 
+						<version>${sdk-version}</version> </dependency> </dependencies> <product>org.eclipse.platform.ide</product> 
+						<argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false 
+						-Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine> </configuration> </plugin> -->
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
 </project>
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 168a613f0a3..71de01d02f3 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
+	<prerequisites>
+		<maven>3.0</maven>
+	</prerequisites>
 
-    <groupId>org.eclipse.tm.terminal</groupId>
-    <artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
-    <version>4.3.0-SNAPSHOT</version> 
-    <packaging>pom</packaging>
-    <name>TM Terminal, Maven Configuration Master</name>
+	<groupId>org.eclipse.tm.terminal</groupId>
+	<artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
+	<version>4.4.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>TM Terminal, Maven Configuration Master</name>
 
-    <licenses>
-        <license>
-            <name>Eclipse Public License</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            <distribution>repo</distribution>
-            <comments>
+	<licenses>
+		<license>
+			<name>Eclipse Public License</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+			<comments>
             All rights reserved.
 
             This program and the accompanying materials are made
@@ -27,480 +27,489 @@
             which accompanies this distribution, and is available at
             http://www.eclipse.org/legal/epl-v10.htm
             </comments>
-        </license>
-    </licenses>
+		</license>
+	</licenses>
 
-    <organization>
-        <name>Eclipse Foundation</name>
-        <url>http://www.eclipse.org/</url>
-    </organization>
-    
-    <properties>
-        <!-- Define version id's to be used in the plugins section -->
-        <!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 -->
-        <!-- We cannot use tycho-0.25 or later since it doesn't support Java 7 for building -->
-        <!-- Using Java 8 for Tycho with a Java 7 target should be possible but takes some config -->
-        <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
-        <tycho-version>0.23.1</tycho-version>
-        <tycho-extras-version>${tycho-version}</tycho-extras-version>
-        <maven-resources-version>2.7</maven-resources-version>
-        <maven-antrun-version>1.8</maven-antrun-version>
-        <gmaven-version>1.5</gmaven-version>
-        <findbugs-version>3.0.4</findbugs-version>
-        <!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
-        <jacoco-version>0.7.9</jacoco-version>
-        <!-- Note: jarsigner-1.1.4 fails with Java 7 so stick to 1.1.2 -->
-        <eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
+	<organization>
+		<name>Eclipse Foundation</name>
+		<url>http://www.eclipse.org/</url>
+	</organization>
 
-        <!-- Common global properties -->
-        <adminDir>${env.WORKSPACE}/admin</adminDir>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	<properties>
+		<!-- Define version id's to be used in the plugins section -->
+		<!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 -->
+		<!-- We cannot use tycho-0.25 or later since it doesn't support Java 7 
+			for building -->
+		<!-- Using Java 8 for Tycho with a Java 7 target should be possible but 
+			takes some config -->
+		<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
+		<tycho-version>0.23.1</tycho-version>
+		<tycho-extras-version>${tycho-version}</tycho-extras-version>
+		<maven-resources-version>2.7</maven-resources-version>
+		<maven-antrun-version>1.8</maven-antrun-version>
+		<gmaven-version>1.5</gmaven-version>
+		<findbugs-version>3.0.4</findbugs-version>
+		<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
+		<jacoco-version>0.7.9</jacoco-version>
+		<!-- Note: jarsigner-1.1.4 fails with Java 7 so stick to 1.1.2 -->
+		<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
 
-        <!-- JaCoCo global properties -->
-        <jacoco.skip>false</jacoco.skip>
-        <jacoco.output>file</jacoco.output>
-        <jacoco.dumpOnExit>true</jacoco.dumpOnExit>
+		<!-- Common global properties -->
+		<adminDir>${env.WORKSPACE}/admin</adminDir>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <terminal-stream>development</terminal-stream>
-        <terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
-        <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
-        <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
+		<!-- JaCoCo global properties -->
+		<jacoco.skip>false</jacoco.skip>
+		<jacoco.output>file</jacoco.output>
+		<jacoco.dumpOnExit>true</jacoco.dumpOnExit>
 
-        <sdk-version>4.7</sdk-version>
-        
-        <!-- Set up Mars as the default target platform to build against, -->
-        <!-- Because it supports Java 7, but also already has the cdt.native.serial plugin. -->
-        <!-- Also, PTP o.e.remote-2.0 from Mars is the oldes remote version that we can support. -->
-        <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
-        <platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
-        <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
-        <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
-        <tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
-        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
-        <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
-        <!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
-        <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
-        <!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: -->
-        <!-- See http://wiki.eclipse.org/SWTBot/Releases -->
-        <!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer -->
-        <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site>
-    </properties>
+		<terminal-stream>development</terminal-stream>
+		<terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
+		<terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
+		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
 
-    <repositories>
-        <repository>
-            <id>license-feature</id>
-            <url>${license-site}</url>
-            <layout>p2</layout>
-        </repository>    
-        <repository>
-            <id>platform</id>
-            <url>${platform-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>platform-release</id>
-            <url>${platform-release-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>orbit</id>
-            <url>${orbit-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>cdt</id>
-            <url>${cdt-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>tm</id>
-            <url>${tm-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>swtbot</id>
-            <url>${swtbot-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>remote</id>
-            <url>${remote-site}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>rxtx</id>
-            <url>${rxtx-site}</url>
-            <layout>p2</layout>
-        </repository>
-    </repositories>
+		<sdk-version>4.7</sdk-version>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/public</url>
-              <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>cbi</id>
-            <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>cbi-snapshots</id>
-            <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
+		<!-- Set up Mars as the default target platform to build against, -->
+		<!-- Because it supports Java 7, but also already has the cdt.native.serial 
+			plugin. -->
+		<!-- Also, PTP o.e.remote-2.0 from Mars is the oldest remote version that 
+			we can support. -->
+		<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
+		<platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
+		<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
+		<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
+		<tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
+		<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
+		<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
+		<!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
+		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
+		<!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: -->
+		<!-- See http://wiki.eclipse.org/SWTBot/Releases -->
+		<!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and 
+			newer -->
+		<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site>
+	</properties>
 
-    <profiles>
-        <profile>
-            <!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) -->
-            <id>juno</id>
-            
-            <properties>
-                <terminal-stream>juno</terminal-stream>
-                <sdk-version>3.8</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/juno</platform-release-site>
-                <!--  SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer
-                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site>
-                -->
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
-            </properties>
-        </profile>
-        <profile>
-            <!-- Eclipse 4.3.2 (Kepler SR2), CDT 8.4.0 (Luna SR0) -->
-            <id>kepler</id>
-            
-            <properties>
-                <terminal-stream>kepler</terminal-stream>
-                <sdk-version>4.3</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/4.3</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/kepler</platform-release-site>
-                <!--  SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer
-                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</orbit-site>
-                -->
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
-            </properties>
-        </profile>
-        <profile>
-            <!-- Eclipse 4.4.2 (Luna SR2), CDT 8.6.0 (Luna SR2) -->
-            <id>luna</id>
-            
-            <properties>
-                <terminal-stream>luna</terminal-stream>
-                <sdk-version>4.4</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/4.4</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/luna</platform-release-site>
-                <!--  SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer
-                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
-                -->
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
-            </properties>
-        </profile>
-        <profile>
-            <!-- Eclipse 4.5.2 (Mars.2), CDT 8.8.1 (Mars.2) -->
-            <id>mars</id>
-            
-            <properties>
-                <terminal-stream>mars</terminal-stream>
-                <sdk-version>4.5</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
-                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository</orbit-site>
-                <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.2</remote-site>
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
-            </properties>
-        </profile>
-        <profile>
-            <!-- Eclipse 4.6.3 (Neon.3), CDT 9.2.1 (Neon.3) -->
-            <id>neon</id>
-            
-            <properties>
-                <terminal-stream>neon</terminal-stream>
-                <sdk-version>4.6</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
-                <orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
-                <tm-site>http://download.eclipse.org/tm/updates/4.2</tm-site>
-                <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.1</remote-site>
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
-            </properties>
-        </profile>
-        <profile>
-            <!-- Eclipse 4.7 (Oxygen), CDT 9.3 -->
-            <id>oxygen</id>
-            
-            <properties>
-                <terminal-stream>oxygen</terminal-stream>
-                <sdk-version>4.7</sdk-version>
-                <platform-site>http://download.eclipse.org/eclipse/updates/4.7</platform-site>
-                <platform-release-site>http://download.eclipse.org/releases/oxygen</platform-release-site>
-                <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
-                <tm-site>http://download.eclipse.org/tm/updates/4.3milestones</tm-site>
-                <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
-                <cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
-                <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
-            </properties>
-        </profile>
+	<repositories>
+		<repository>
+			<id>license-feature</id>
+			<url>${license-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>platform</id>
+			<url>${platform-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>platform-release</id>
+			<url>${platform-release-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>orbit</id>
+			<url>${orbit-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>cdt</id>
+			<url>${cdt-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>tm</id>
+			<url>${tm-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>swtbot</id>
+			<url>${swtbot-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>remote</id>
+			<url>${remote-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>rxtx</id>
+			<url>${rxtx-site}</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/public</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</pluginRepository>
+		<pluginRepository>
+			<id>cbi</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>cbi-snapshots</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<profiles>
+		<profile>
+			<!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) -->
+			<id>juno</id>
+
+			<properties>
+				<terminal-stream>juno</terminal-stream>
+				<sdk-version>3.8</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/3.8</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/juno</platform-release-site>
+				<!-- SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site> -->
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.3.2 (Kepler SR2), CDT 8.4.0 (Luna SR0) -->
+			<id>kepler</id>
+
+			<properties>
+				<terminal-stream>kepler</terminal-stream>
+				<sdk-version>4.3</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.3</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/kepler</platform-release-site>
+				<!-- SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</orbit-site> -->
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.4.2 (Luna SR2), CDT 8.6.0 (Luna SR2) -->
+			<id>luna</id>
+
+			<properties>
+				<terminal-stream>luna</terminal-stream>
+				<sdk-version>4.4</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.4</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/luna</platform-release-site>
+				<!-- SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site> -->
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.5.2 (Mars.2), CDT 8.8.1 (Mars.2) -->
+			<id>mars</id>
+
+			<properties>
+				<terminal-stream>mars</terminal-stream>
+				<sdk-version>4.5</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository</orbit-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.2</remote-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.6.3 (Neon.3), CDT 9.2.1 (Neon.3) -->
+			<id>neon</id>
+
+			<properties>
+				<terminal-stream>neon</terminal-stream>
+				<sdk-version>4.6</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
+				<tm-site>http://download.eclipse.org/tm/updates/4.2</tm-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.1.1</remote-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.7 (Oxygen), CDT 9.3 -->
+			<id>oxygen</id>
+
+			<properties>
+				<terminal-stream>oxygen</terminal-stream>
+				<sdk-version>4.7</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.7</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/oxygen</platform-release-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository</orbit-site>
+				<tm-site>http://download.eclipse.org/tm/updates/4.3milestones</tm-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
+				<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
+			</properties>
+		</profile>
+		<profile>
+			<!-- Eclipse 4.8 (Photon), CDT 9.5 -->
+			<id>photon</id>
+
+			<properties>
+				<terminal-stream>photon</terminal-stream>
+				<sdk-version>4.8</sdk-version>
+				<platform-site>http://download.eclipse.org/eclipse/updates/4.8milestones</platform-site>
+				<platform-release-site>http://download.eclipse.org/releases/photon</platform-release-site>
+				<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20180119201206/repository</orbit-site>
+				<tm-site>http://download.eclipse.org/tm/updates/4.3milestones</tm-site>
+				<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
+				<cdt-site>http://download.eclipse.org/tools/cdt/builds/9.4</cdt-site>
+				<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
+			</properties>
+		</profile>
 	</profiles>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-maven-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-maven-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>target-platform-configuration</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <environments>
-                            <environment>
-                                <os>linux</os>
-                                <ws>gtk</ws>
-                                <arch>x86</arch>
-                            </environment>
-                            <environment>
-                                <os>linux</os>
-                                <ws>gtk</ws>
-                                <arch>x86_64</arch>
-                            </environment>
-                            <environment>
-                                <os>win32</os>
-                                <ws>win32</ws>
-                                <arch>x86</arch>
-                            </environment>
-                            <environment>
-                                <os>win32</os>
-                                <ws>win32</ws>
-                                <arch>x86_64</arch>
-                            </environment>
-                            <environment>
-                                <os>macosx</os>
-                                <ws>cocoa</ws>
-                                <arch>x86_64</arch>
-                            </environment>
-                        </environments>
-                        <resolver>p2</resolver>
-                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
-                        <includePackedArtifacts>true</includePackedArtifacts>
-                        <pomDependencies>consider</pomDependencies>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-compiler-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-source-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>plugin-source</id>
-                            <goals>
-                                <goal>plugin-source</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-packaging-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
-                            <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                            <version>${tycho-version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
-                            <artifactId>tycho-sourceref-jgit</artifactId>
-                            <version>${tycho-extras-version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <strictBinIncludes>false</strictBinIncludes>
-                        <timestampProvider>jgit</timestampProvider>
-                        <jgit.ignore>pom.xml</jgit.ignore>
-                        <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
-                        <sourceReferences>
-                            <generate>true</generate>
-                        </sourceReferences>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-p2-repository-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <configuration>
-                        <finalName>${project.artifactId}</finalName>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-version}</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>${maven-antrun-version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>${gmaven-version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>${findbugs-version}</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                        <effort>Max</effort>
-                        <threshold>Low</threshold>
-                        <xmlOutput>true</xmlOutput>
-                        <failOnError>false</failOnError>
-                        <excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>      
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco-version}</version>
-                </plugin>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.8</version>
-          <configuration>
-            <sourceEncoding>utf-8</sourceEncoding>
-            <minimumTokens>100</minimumTokens>
-            <targetJdk>1.7</targetJdk>
-            <format>xml</format>
-            <failOnViolation>false</failOnViolation>
-            <excludes>
-              <exclude>**/UbcCheck.java</exclude>
-            </excludes>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>cpd-check</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-                
-                <!-- Pack200 and Signing -->
-                <plugin>
-                    <groupId>org.eclipse.tycho.extras</groupId>
-                    <artifactId>tycho-pack200a-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <executions>
-                        <execution>
-                            <id>pack200-normalize</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>normalize</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.cbi.maven.plugins</groupId>
-                    <artifactId>eclipse-jarsigner-plugin</artifactId>
-                    <version>${eclipse-jarsigner-version}</version>
-                    <executions>
-                        <execution>
-                            <id>sign</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>sign</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.tycho.extras</groupId>
-                    <artifactId>tycho-pack200b-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <executions>
-                        <execution>
-                            <id>pack200-pack</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>pack</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
-                <!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-p2-plugin</artifactId>
-                    <version>${tycho-version}</version>
-                    <!-- Signing appears to mess with the baseline repository logic.
-                         Disable the baseline repository until we've figured out what is going on. -->
-                    <!--                    
-                    <configuration>
-                        <baselineRepositories>
-                            <repository>
-                                <url>http://download.eclipse.org/tools/tm/terminal/builds/${terminal-stream}/nightly</url>
-                            </repository>
-                        </baselineRepositories>
-                    </configuration>
-                    -->
-                    <executions>
-                        <execution>
-                            <id>p2-metadata</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>p2-metadata</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <defaultP2Metadata>false</defaultP2Metadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-maven-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<extensions>true</extensions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<environments>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86</arch>
+							</environment>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86</arch>
+							</environment>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>macosx</os>
+								<ws>cocoa</ws>
+								<arch>x86_64</arch>
+							</environment>
+						</environments>
+						<resolver>p2</resolver>
+						<ignoreTychoRepositories>true</ignoreTychoRepositories>
+						<includePackedArtifacts>true</includePackedArtifacts>
+						<pomDependencies>consider</pomDependencies>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-source-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+					<executions>
+						<execution>
+							<id>plugin-source</id>
+							<goals>
+								<goal>plugin-source</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-packaging-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho.extras</groupId>
+							<artifactId>tycho-buildtimestamp-jgit</artifactId>
+							<version>${tycho-version}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.eclipse.tycho.extras</groupId>
+							<artifactId>tycho-sourceref-jgit</artifactId>
+							<version>${tycho-extras-version}</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<strictBinIncludes>false</strictBinIncludes>
+						<timestampProvider>jgit</timestampProvider>
+						<jgit.ignore>pom.xml</jgit.ignore>
+						<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
+						<sourceReferences>
+							<generate>true</generate>
+						</sourceReferences>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<finalName>${project.artifactId}</finalName>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>${maven-resources-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>${maven-antrun-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.gmaven</groupId>
+					<artifactId>gmaven-plugin</artifactId>
+					<version>${gmaven-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>findbugs-maven-plugin</artifactId>
+					<version>${findbugs-version}</version>
+					<configuration>
+						<encoding>UTF-8</encoding>
+						<effort>Max</effort>
+						<threshold>Low</threshold>
+						<xmlOutput>true</xmlOutput>
+						<failOnError>false</failOnError>
+						<excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-pmd-plugin</artifactId>
+					<version>3.8</version>
+					<configuration>
+						<sourceEncoding>utf-8</sourceEncoding>
+						<minimumTokens>100</minimumTokens>
+						<targetJdk>1.7</targetJdk>
+						<format>xml</format>
+						<failOnViolation>false</failOnViolation>
+						<excludes>
+							<exclude>**/UbcCheck.java</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>cpd-check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- Pack200 and Signing -->
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200a-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<executions>
+						<execution>
+							<id>pack200-normalize</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>normalize</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.cbi.maven.plugins</groupId>
+					<artifactId>eclipse-jarsigner-plugin</artifactId>
+					<version>${eclipse-jarsigner-version}</version>
+					<executions>
+						<execution>
+							<id>sign</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>sign</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200b-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<executions>
+						<execution>
+							<id>pack200-pack</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>pack</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
+				<!-- Tycho p2 metadata generation shall happen _after_ the JAR has been 
+					packed. -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<!-- Signing appears to mess with the baseline repository logic. Disable 
+						the baseline repository until we've figured out what is going on. -->
+					<!-- <configuration> <baselineRepositories> <repository> <url>http://download.eclipse.org/tools/tm/terminal/builds/${terminal-stream}/nightly</url> 
+						</repository> </baselineRepositories> </configuration> -->
+					<executions>
+						<execution>
+							<id>p2-metadata</id>
+							<phase>package</phase>
+							<goals>
+								<goal>p2-metadata</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<defaultP2Metadata>false</defaultP2Metadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml
index 4c8c9d0cbf7..3bac84f8eca 100644
--- a/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml
index e15a625ed48..0d34254bb3a 100644
--- a/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml
index c80d7d8a8d4..dbb895f2b67 100644
--- a/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml
index 1bedbaa69e1..1f3df0a2b12 100644
--- a/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml
index 89897f1d315..ee09b14f821 100644
--- a/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml
index c89c22b3600..997dd670755 100644
--- a/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.serial.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.serial.feature/pom.xml
index a8144f3b8bb..a217e9705e7 100644
--- a/features/org.eclipse.tm.terminal.connector.serial.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.serial.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/pom.xml
index ddf3b5ad4e2..84a58ce8ba6 100644
--- a/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.serial.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml
index ec3e487730f..cf877c745cf 100644
--- a/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml
index b2d8e4d8bcc..e612d51c336 100644
--- a/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml
index bf3dad8a090..04b3bfd88d9 100644
--- a/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml
index 81cfeb643a2..c98c72c8dfe 100644
--- a/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.control.feature/pom.xml b/features/org.eclipse.tm.terminal.control.feature/pom.xml
index 74186497d99..8d7b13ee7d2 100644
--- a/features/org.eclipse.tm.terminal.control.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.control.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml
index f0838aaed9a..3ad16caf02e 100644
--- a/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.tm.terminal.feature/pom.xml b/features/org.eclipse.tm.terminal.feature/pom.xml
index 354ff605e61..c9652bbdecd 100644
--- a/features/org.eclipse.tm.terminal.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml
index 20750e372af..e6e88dfde25 100644
--- a/features/org.eclipse.tm.terminal.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.tm.terminal.view.feature/pom.xml b/features/org.eclipse.tm.terminal.view.feature/pom.xml
index 62950b05ca8..1369c1940d2 100644
--- a/features/org.eclipse.tm.terminal.view.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.view.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.tm.terminal.view.rse.feature/pom.xml b/features/org.eclipse.tm.terminal.view.rse.feature/pom.xml
index 70c3081360a..0c5ffbbb2fa 100644
--- a/features/org.eclipse.tm.terminal.view.rse.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.view.rse.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/pom.xml
index c9229a320a8..98ea01aeb0e 100644
--- a/features/org.eclipse.tm.terminal.view.rse.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.view.rse.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml b/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml
index bd4860e1999..eba1d866707 100644
--- a/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml
+++ b/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml b/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml
index 8770ff56d89..1aafe86d300 100644
--- a/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/pom.xml b/plugins/org.eclipse.tm.terminal.connector.local/pom.xml
index 1c6b14a9290..c0b9a095db8 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.local/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/pom.xml b/plugins/org.eclipse.tm.terminal.connector.process/pom.xml
index 57dceae4c2d..ba74f93e6d3 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.process/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml b/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml
index 18445243404..1fc2801bbc0 100644
--- a/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml
index 75a812e11d0..23e359c370c 100644
--- a/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.serial/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml b/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml
index b74d69125d4..39ce2b381a0 100644
--- a/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml b/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml
index 29c5c721611..5153c568e0b 100644
--- a/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.control/pom.xml b/plugins/org.eclipse.tm.terminal.control/pom.xml
index 6823fde9ba5..7af83a1c18c 100644
--- a/plugins/org.eclipse.tm.terminal.control/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.control/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.test/pom.xml b/plugins/org.eclipse.tm.terminal.test/pom.xml
index 20697fe3169..21557963149 100644
--- a/plugins/org.eclipse.tm.terminal.test/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.test/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.view.core/pom.xml b/plugins/org.eclipse.tm.terminal.view.core/pom.xml
index 527977a8806..f89653264f3 100644
--- a/plugins/org.eclipse.tm.terminal.view.core/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.view.core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml
index 561576b0938..6dff4aa5c4b 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/pom.xml b/plugins/org.eclipse.tm.terminal.view.ui/pom.xml
index 74924d6c2c0..7dfd11f3a3b 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/pom.xml
+++ b/plugins/org.eclipse.tm.terminal.view.ui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.tm.terminal</groupId>
     <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 31e6cbe5687..1fd7a18262a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,101 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.eclipse.tm.terminal</groupId>
-        <artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
-        <relativePath>admin/pom-build.xml</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.eclipse.tm.terminal</groupId>
+		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
+		<version>4.4.0-SNAPSHOT</version>
+		<relativePath>admin/pom-build.xml</relativePath>
+	</parent>
 
-    <groupId>org.eclipse.tm.terminal</groupId>
-    <artifactId>terminal-parent</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>TM Terminal, Maven Master</name>
+	<groupId>org.eclipse.tm.terminal</groupId>
+	<artifactId>terminal-parent</artifactId>
+	<version>4.4.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>TM Terminal, Maven Master</name>
 
-    <modules>
-        <!-- Terminal Control features and plug-ins -->
-        <module>plugins/org.eclipse.tm.terminal.control</module>
+	<modules>
+		<!-- Terminal Control features and plug-ins -->
+		<module>plugins/org.eclipse.tm.terminal.control</module>
 
-        <module>features/org.eclipse.tm.terminal.control.feature</module>
-        <module>features/org.eclipse.tm.terminal.control.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.control.feature</module>
+		<module>features/org.eclipse.tm.terminal.control.sdk.feature</module>
 
-        <!-- Terminal Connector features and plug-ins -->
-        <module>plugins/org.eclipse.tm.terminal.connector.local</module>
-        <module>plugins/org.eclipse.tm.terminal.connector.process</module>
-        <module>plugins/org.eclipse.tm.terminal.connector.remote</module>
-        <module>plugins/org.eclipse.tm.terminal.connector.ssh</module>
-        <module>plugins/org.eclipse.tm.terminal.connector.telnet</module>
-        
-        <module>features/org.eclipse.tm.terminal.connector.local.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.local.sdk.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.remote.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.remote.sdk.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.ssh.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.ssh.sdk.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.telnet.feature</module>
-        <module>features/org.eclipse.tm.terminal.connector.telnet.sdk.feature</module>
+		<!-- Terminal Connector features and plug-ins -->
+		<module>plugins/org.eclipse.tm.terminal.connector.local</module>
+		<module>plugins/org.eclipse.tm.terminal.connector.process</module>
+		<module>plugins/org.eclipse.tm.terminal.connector.remote</module>
+		<module>plugins/org.eclipse.tm.terminal.connector.ssh</module>
+		<module>plugins/org.eclipse.tm.terminal.connector.telnet</module>
 
-        <!-- Terminals View features and plug-ins -->
-        <module>plugins/org.eclipse.tm.terminal.view.core</module>
-        <module>plugins/org.eclipse.tm.terminal.view.ui</module>
-        <module>plugins/org.eclipse.tm.terminal.view.ui.rse</module>
-        
-        <module>features/org.eclipse.tm.terminal.view.feature</module>
-        <module>features/org.eclipse.tm.terminal.view.sdk.feature</module>
-        <module>features/org.eclipse.tm.terminal.view.rse.feature</module>
-        <module>features/org.eclipse.tm.terminal.view.rse.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.local.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.local.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.remote.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.remote.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.ssh.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.ssh.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.telnet.feature</module>
+		<module>features/org.eclipse.tm.terminal.connector.telnet.sdk.feature</module>
 
-        <!-- TM Terminal "all-in-one" features -->
-        <module>features/org.eclipse.tm.terminal.feature</module>
-        <module>features/org.eclipse.tm.terminal.sdk.feature</module>
+		<!-- Terminals View features and plug-ins -->
+		<module>plugins/org.eclipse.tm.terminal.view.core</module>
+		<module>plugins/org.eclipse.tm.terminal.view.ui</module>
+		<module>plugins/org.eclipse.tm.terminal.view.ui.rse</module>
 
-        <!-- TM Terminal Repository -->
-        <!-- Can only be built with cdtserial since it references cdtserial! -->
-        <!-- This is OK since older profiles are only for validation anyways. -->
-        <!-- <module>repos/org.eclipse.tm.terminal.repo</module>  -->
-    </modules>
+		<module>features/org.eclipse.tm.terminal.view.feature</module>
+		<module>features/org.eclipse.tm.terminal.view.sdk.feature</module>
+		<module>features/org.eclipse.tm.terminal.view.rse.feature</module>
+		<module>features/org.eclipse.tm.terminal.view.rse.sdk.feature</module>
 
-    <profiles>
-        <profile>
-	        <!--  The cdtserial connector can only be built with CDT Oxygen or newer. -->
-	        <id>cdtserial</id>
+		<!-- TM Terminal "all-in-one" features -->
+		<module>features/org.eclipse.tm.terminal.feature</module>
+		<module>features/org.eclipse.tm.terminal.sdk.feature</module>
+
+		<!-- TM Terminal Repository -->
+		<!-- Can only be built with cdtserial since it references cdtserial! -->
+		<!-- This is OK since older profiles are only for validation anyways. -->
+		<!-- <module>repos/org.eclipse.tm.terminal.repo</module> -->
+	</modules>
+
+	<profiles>
+		<profile>
+			<!-- The cdtserial connector can only be built with CDT Oxygen or newer. -->
+			<id>cdtserial</id>
 			<activation>
-				<!-- cdtserial is the future for master moving forward, so have it on by default. -->
-				<!-- This also affects the Gerrit validation job, which should work on cdtserial too. -->
+				<!-- cdtserial is the future for master moving forward, so have it on 
+					by default. -->
+				<!-- This also affects the Gerrit validation job, which should work on 
+					cdtserial too. -->
 				<activeByDefault>true</activeByDefault>
-				<property><name>!nocdtserial</name></property>
+				<property>
+					<name>!nocdtserial</name>
+				</property>
 			</activation>
-    	    <modules>
-		        <module>plugins/org.eclipse.tm.terminal.connector.cdtserial</module>
-		        <module>features/org.eclipse.tm.terminal.connector.cdtserial.feature</module>
-        		<module>features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</module>
-		        <module>repos/org.eclipse.tm.terminal.repo</module>
+			<modules>
+				<module>plugins/org.eclipse.tm.terminal.connector.cdtserial</module>
+				<module>features/org.eclipse.tm.terminal.connector.cdtserial.feature</module>
+				<module>features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</module>
+				<module>repos/org.eclipse.tm.terminal.repo</module>
 			</modules>
 		</profile>
-        <profile>
-	        <!--  The rxtxserial connector doesn't build on MacOSX. -->
-	        <id>rxtxserial</id>
+		<profile>
+			<!-- The rxtxserial connector doesn't build on MacOSX. -->
+			<id>rxtxserial</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<property><name>!norxtx</name></property>
+				<property>
+					<name>!norxtx</name>
+				</property>
 			</activation>
-    	    <modules>
-		        <module>plugins/org.eclipse.tm.terminal.connector.serial</module>
-        		<module>features/org.eclipse.tm.terminal.connector.serial.feature</module>
-		        <module>features/org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
+			<modules>
+				<module>plugins/org.eclipse.tm.terminal.connector.serial</module>
+				<module>features/org.eclipse.tm.terminal.connector.serial.feature</module>
+				<module>features/org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
 			</modules>
 		</profile>
-        <profile>
-	        <!--  The tests are only built with the tests profile. -->
-	        <id>tests</id>
-    	    <modules>
-        	    <module>plugins/org.eclipse.tm.terminal.test</module>
+		<profile>
+			<!-- The tests are only built with the tests profile. -->
+			<id>tests</id>
+			<modules>
+				<module>plugins/org.eclipse.tm.terminal.test</module>
 			</modules>
 		</profile>
-    </profiles>
+	</profiles>
 </project>
diff --git a/repos/org.eclipse.tm.terminal.repo/pom.xml b/repos/org.eclipse.tm.terminal.repo/pom.xml
index 215fcf22b59..dc22ff6e5e8 100644
--- a/repos/org.eclipse.tm.terminal.repo/pom.xml
+++ b/repos/org.eclipse.tm.terminal.repo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tm.terminal</groupId>
 		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.4.0-SNAPSHOT</version>
 		<relativePath>../../admin/pom-build.xml</relativePath>
 	</parent>