--- old/application/org.openjdk.jmc.attach/pom.xml	2018-11-22 17:05:20.595785100 +0100
+++ new/application/org.openjdk.jmc.attach/pom.xml	2018-11-22 17:05:20.484785000 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<!-- Disable error for forbidden access to sun.management.* APIs -->
 					<compilerArgument>-err:-forbidden</compilerArgument>
--- old/application/org.openjdk.jmc.browser.attach/pom.xml	2018-11-22 17:05:21.354788100 +0100
+++ new/application/org.openjdk.jmc.browser.attach/pom.xml	2018-11-22 17:05:21.238785500 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<extraClasspathElements>
 						<dependency>
--- old/application/org.openjdk.jmc.browser/pom.xml	2018-11-22 17:05:22.057785200 +0100
+++ new/application/org.openjdk.jmc.browser/pom.xml	2018-11-22 17:05:21.946785900 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<extraClasspathElements>
 						<dependency>
--- old/application/org.openjdk.jmc.console.jconsole/pom.xml	2018-11-22 17:05:22.786802100 +0100
+++ new/application/org.openjdk.jmc.console.jconsole/pom.xml	2018-11-22 17:05:22.674802400 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/Empty.java</exclude>
--- old/application/org.openjdk.jmc.javafx.osgi/pom.xml	2018-11-22 17:05:23.502804800 +0100
+++ new/application/org.openjdk.jmc.javafx.osgi/pom.xml	2018-11-22 17:05:23.389802200 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/Empty.java</exclude>
--- old/application/org.openjdk.jmc.jdp/pom.xml	2018-11-22 17:05:24.264803500 +0100
+++ new/application/org.openjdk.jmc.jdp/pom.xml	2018-11-22 17:05:24.142803100 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<extraClasspathElements>
 						<dependency>
--- old/application/org.openjdk.jmc.joverflow.ui/pom.xml	2018-11-22 17:05:24.971801100 +0100
+++ new/application/org.openjdk.jmc.joverflow.ui/pom.xml	2018-11-22 17:05:24.858802100 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<extraClasspathElements>
 						<dependency>
--- old/application/org.openjdk.jmc.rcp.application/pom.xml	2018-11-22 17:05:25.682801500 +0100
+++ new/application/org.openjdk.jmc.rcp.application/pom.xml	2018-11-22 17:05:25.569800300 +0100
@@ -45,7 +45,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
 				<executions>
 					<execution>
 						<id>process-version-files</id>
--- old/application/org.openjdk.jmc.rcp.product/pom.xml	2018-11-22 17:05:26.391805000 +0100
+++ new/application/org.openjdk.jmc.rcp.product/pom.xml	2018-11-22 17:05:26.278806000 +0100
@@ -48,7 +48,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includeAllDependencies>false</includeAllDependencies>
 					<!-- Skip mirroring to get rid of warning for Eclipse Babel when building rcp.product -->
@@ -58,7 +58,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-director-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<formats>
 						<win32>zip</win32>
--- old/application/org.openjdk.jmc.updatesite.ide/pom.xml	2018-11-22 17:05:27.109801800 +0100
+++ new/application/org.openjdk.jmc.updatesite.ide/pom.xml	2018-11-22 17:05:26.996804600 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includeAllDependencies>false</includeAllDependencies>
 				</configuration>
--- old/application/org.openjdk.jmc.updatesite.rcp/pom.xml	2018-11-22 17:05:27.851801100 +0100
+++ new/application/org.openjdk.jmc.updatesite.rcp/pom.xml	2018-11-22 17:05:27.740800800 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<includeAllDependencies>false</includeAllDependencies>
 				</configuration>
--- old/application/pom.xml	2018-11-22 17:05:28.572803300 +0100
+++ new/application/pom.xml	2018-11-22 17:05:28.452804900 +0100
@@ -170,7 +170,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<pomDependencies>consider</pomDependencies>
 				</configuration>
--- old/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml	2018-11-22 17:05:29.324804800 +0100
+++ new/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml	2018-11-22 17:05:29.210801600 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
 				</configuration>
--- old/application/tests/org.openjdk.jmc.jdp.test/pom.xml	2018-11-22 17:05:30.062801300 +0100
+++ new/application/tests/org.openjdk.jmc.jdp.test/pom.xml	2018-11-22 17:05:29.944802500 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<argLine>-Djava.net.preferIPv4Stack=true</argLine>
 				</configuration>
--- old/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml	2018-11-22 17:05:30.774802100 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml	2018-11-22 17:05:30.663802600 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
 					<failIfNoTests>false</failIfNoTests>
--- old/application/tests/org.openjdk.jmc.rjmx.test/pom.xml	2018-11-22 17:05:31.498805300 +0100
+++ new/application/tests/org.openjdk.jmc.rjmx.test/pom.xml	2018-11-22 17:05:31.385803500 +0100
@@ -45,7 +45,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<argLine>-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi</argLine>
 				</configuration>
--- old/application/tests/pom.xml	2018-11-22 17:05:32.209800800 +0100
+++ new/application/tests/pom.xml	2018-11-22 17:05:32.097800500 +0100
@@ -110,7 +110,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<appArgLine>-nl en</appArgLine>
 					<includes>${test.includes}</includes>
--- old/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml	2018-11-22 17:05:32.954802100 +0100
+++ new/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml	2018-11-22 17:05:32.842802100 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.test.excludes}</excludes>
 				</configuration>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<pomDependencies>consider</pomDependencies>
 					<dependency-resolution>
--- old/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml	2018-11-22 17:05:33.693804400 +0100
+++ new/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml	2018-11-22 17:05:33.579802200 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.test.excludes}</excludes>
 				</configuration>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
 						<extraRequirements>
--- old/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml	2018-11-22 17:05:34.468805800 +0100
+++ new/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml	2018-11-22 17:05:34.349801200 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.test.excludes}</excludes>
 				</configuration>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
 						<extraRequirements>
--- old/application/uitests/org.openjdk.jmc.console.uitest/pom.xml	2018-11-22 17:05:35.206804100 +0100
+++ new/application/uitests/org.openjdk.jmc.console.uitest/pom.xml	2018-11-22 17:05:35.087804600 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.test.excludes},**/*MemoryLeakTest*</excludes>
 				</configuration>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
 						<extraRequirements>
--- old/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml	2018-11-22 17:05:35.917802400 +0100
+++ new/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml	2018-11-22 17:05:35.804800900 +0100
@@ -63,7 +63,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.flr.test.excludes},**/*StackTraceComponentTest*,**/*MemoryLeakTest*,**/*RangeNavigatorComponentTest*,**/performance/*,**/jvmflags/*</excludes>
 				</configuration>
@@ -71,7 +71,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
 						<extraRequirements>
--- old/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml	2018-11-22 17:05:36.653804500 +0100
+++ new/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml	2018-11-22 17:05:36.540804600 +0100
@@ -46,7 +46,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<excludes>${ui.test.excludes}</excludes>
 				</configuration>
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<dependency-resolution>
 						<extraRequirements>
--- old/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml	2018-11-22 17:05:37.365801200 +0100
+++ new/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml	2018-11-22 17:05:37.249802200 +0100
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
+        <version>${tycho.version}</version>
         <configuration>
           <pomDependencies>consider</pomDependencies>
         </configuration>
--- old/application/uitests/pom.xml	2018-11-22 17:05:38.116802600 +0100
+++ new/application/uitests/pom.xml	2018-11-22 17:05:37.999802000 +0100
@@ -158,7 +158,7 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
+				<version>${tycho.version}</version>
 				<configuration>
 					<product>org.openjdk.jmc.rcp.application.product</product>
 					<application>org.openjdk.jmc.rcp.application.app</application>
--- 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>