--- old/./pom.xml	2018-11-22 17:05:38.937800400 +0100
+++ new/./pom.xml	2018-11-22 17:05:38.822803900 +0100
@@ -44,8 +44,8 @@
 		administrators to collect and analyze data from Java applications 
 		running locally or deployed in production environments.
 	</description>
-  	<url>http://jdk.java.net/jmc</url>
-  	<licenses>
+	<url>http://jdk.java.net/jmc</url>
+	<licenses>
 		<license>
 			<name>Universal Permissive License Version 1.0</name>
 			<url>http://oss.oracle.com/licenses/upl</url>
@@ -75,7 +75,14 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<tycho-version>1.2.0</tycho-version>
+		<tycho.version>1.2.0</tycho.version>
+		<maven.buildnumber.version>1.4</maven.buildnumber.version>
+		<maven.deploy.version>2.8.2</maven.deploy.version>
+		<maven.directory.version>0.2</maven.directory.version>
+		<maven.enforcer.version>3.0.0-M1</maven.enforcer.version>
+		<maven.resources.version>3.0.2</maven.resources.version>
+		<m2e.lifecycle.version>1.0.0</m2e.lifecycle.version>
+		<spotbugs.version>3.1.3</spotbugs.version>
 		<buildId>${user.name}</buildId>
 		<scmConnection>scm:hg:http://hg.openjdk.java.net/jmc/jmc</scmConnection>
 	</properties>
@@ -83,7 +90,7 @@
 		<connection>${scmConnection}</connection>
 	</scm>
 	<distributionManagement>
-			<snapshotRepository>
+		<snapshotRepository>
 			<id>jmc-publish-snapshot</id>
 			<url>${snapshot.repo}</url>
 		</snapshotRepository>
@@ -99,7 +106,7 @@
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>target-platform-configuration</artifactId>
-						<version>${tycho-version}</version>
+						<version>${tycho.version}</version>
 						<configuration>
 							<target>
 								<artifact>
@@ -120,7 +127,7 @@
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>target-platform-configuration</artifactId>
-						<version>${tycho-version}</version>
+						<version>${tycho.version}</version>
 						<configuration>
 							<target>
 								<artifact>
@@ -140,7 +147,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
+				<version>${maven.deploy.version}</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -148,7 +155,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<environments>
 						<environment>
@@ -172,13 +179,13 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<useProjectSettings>false</useProjectSettings>
 				</configuration>
@@ -186,7 +193,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includeAllDependencies>true</includeAllDependencies>
 				</configuration>
@@ -194,7 +201,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<executions>
 					<execution>
 						<id>build-qualifier</id>
@@ -207,7 +214,7 @@
 				<configuration>
 					<archive>
 						<manifestEntries>
-							<Built-By/>
+							<Built-By />
 						</manifestEntries>
 					</archive>
 				</configuration>
@@ -215,7 +222,7 @@
 			<plugin>
 				<groupId>org.commonjava.maven.plugins</groupId>
 				<artifactId>directory-maven-plugin</artifactId>
-				<version>0.2</version>
+				<version>${maven.directory.version}</version>
 				<executions>
 					<execution>
 						<id>directories</id>
@@ -232,7 +239,7 @@
 			<plugin>
 				<groupId>com.github.spotbugs</groupId>
 				<artifactId>spotbugs-maven-plugin</artifactId>
-				<version>3.1.3</version>
+				<version>${spotbugs.version}</version>
 				<configuration>
 					<effort>Max</effort>
 					<threshold>Low</threshold>
@@ -249,7 +256,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.4</version>
+				<version>${maven.buildnumber.version}</version>
 				<executions>
 					<execution>
 						<phase>initialize</phase>
@@ -274,13 +281,13 @@
 							<timestampPropertyName>build.date</timestampPropertyName>
 						</configuration>
 					</execution>
-					<!-- TODO: Maybe add the create-metadata goal after we've made the switch to Mercurial  -->
+					<!-- TODO: Maybe add the create-metadata goal after we've made the switch to Mercurial -->
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M1</version>
+				<version>${maven.enforcer.version}</version>
 				<executions>
 					<execution>
 						<id>enforce-java</id>
@@ -293,7 +300,7 @@
 									<version>[1.8.0-40,)</version>
 									<message>Building JMC requires Java 8 version JDK 1.8.0_40 or later</message>
 								</requireJavaVersion>
-							</rules>		
+							</rules>
 						</configuration>
 					</execution>
 					<execution>
@@ -318,7 +325,7 @@
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
+					<version>${m2e.lifecycle.version}</version>
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
@@ -346,7 +353,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>${maven.resources.version}</version>
 					<executions>
 						<execution>
 							<id>copy-resources</id>