diff --git a/.gitignore b/.gitignore
index e038ca9fed..8fb0e647ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ workspace/
 
 # Ignore dependency reduced pom
 dependency-reduced-pom.xml
+.flattened-pom.xml
 
 # Ignore coverage report
 core/coverage/coverage-report
@@ -51,4 +52,4 @@ releng/third-party/nohup.out
 *.log
 
 # Ignore the generated test baseline
-core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/baseline/Generated_JfrRuleBaseline.xml
\ No newline at end of file
+core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/baseline/Generated_JfrRuleBaseline.xml
diff --git a/agent/launchers/InstrumentMe.launch b/agent/launchers/InstrumentMe.launch
index 34229f6f12..bba271ee8a 100644
--- a/agent/launchers/InstrumentMe.launch
+++ b/agent/launchers/InstrumentMe.launch
@@ -6,10 +6,14 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="_JAVA_OPTIONS" value="-Djava.rmi.server.hostname=localhost "/>
+    </mapAttribute>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
diff --git a/agent/launchers/InstrumentMeConverter.launch b/agent/launchers/InstrumentMeConverter.launch
index 12ee1e70bf..5c19529274 100644
--- a/agent/launchers/InstrumentMeConverter.launch
+++ b/agent/launchers/InstrumentMeConverter.launch
@@ -6,10 +6,14 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="_JAVA_OPTIONS" value="-Djava.rmi.server.hostname=localhost "/>
+    </mapAttribute>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
diff --git a/application/coverage/pom.xml b/application/coverage/pom.xml
index 0a3a3a3b00..9469bb01e1 100644
--- a/application/coverage/pom.xml
+++ b/application/coverage/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>coverage</artifactId>
 	<name>Code coverage report jmc/application</name>
@@ -343,13 +343,13 @@
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>org.openjdk.jmc.updatesite.ide</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>org.openjdk.jmc.updatesite.rcp</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
@@ -480,7 +480,7 @@
 					<groupId>org.openjdk.jmc</groupId>
 					<artifactId>org.openjdk.jmc.test.jemmy</artifactId>
 					<scope>test</scope>
-					<version>8.0.0-SNAPSHOT</version>
+					<version>${revision}${changelist}</version>
 				</dependency>
 			</dependencies>
 		</profile>
diff --git a/application/l10n/org.openjdk.jmc.alert.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.alert.ja/META-INF/MANIFEST.MF
index 627ddbeaac..4ce6781ed9 100644
--- a/application/l10n/org.openjdk.jmc.alert.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.alert.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.alert.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.alert;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.alert;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.alert.ja
diff --git a/application/l10n/org.openjdk.jmc.alert.ja/pom.xml b/application/l10n/org.openjdk.jmc.alert.ja/pom.xml
index 6b78b2a1cc..c93ae347a1 100644
--- a/application/l10n/org.openjdk.jmc.alert.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.alert.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.alert.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.alert.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.alert.zh_CN/META-INF/MANIFEST.MF
index 341046ef99..9211b69d79 100644
--- a/application/l10n/org.openjdk.jmc.alert.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.alert.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.alert.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.alert;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.alert;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.alert.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.alert.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.alert.zh_CN/pom.xml
index d178ce1b45..db974373a1 100644
--- a/application/l10n/org.openjdk.jmc.alert.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.alert.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.alert.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.attach.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.attach.ja/META-INF/MANIFEST.MF
index 0cee160b79..0d4645e8ab 100644
--- a/application/l10n/org.openjdk.jmc.browser.attach.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.attach.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.attach.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.attach.ja
diff --git a/application/l10n/org.openjdk.jmc.browser.attach.ja/pom.xml b/application/l10n/org.openjdk.jmc.browser.attach.ja/pom.xml
index eaa47e678c..b28b1df2be 100644
--- a/application/l10n/org.openjdk.jmc.browser.attach.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.attach.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.attach.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/META-INF/MANIFEST.MF
index a92bd65447..4ae7c8fccd 100644
--- a/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.attach.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.attach.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/pom.xml
index 37afe3fd29..939938c3e5 100644
--- a/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.attach.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.attach.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.ja/META-INF/MANIFEST.MF
index d3c80582d7..a6ce057c14 100644
--- a/application/l10n/org.openjdk.jmc.browser.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.ja
diff --git a/application/l10n/org.openjdk.jmc.browser.ja/pom.xml b/application/l10n/org.openjdk.jmc.browser.ja/pom.xml
index 13c1827671..4419467942 100644
--- a/application/l10n/org.openjdk.jmc.browser.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.jdp.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.jdp.ja/META-INF/MANIFEST.MF
index 80580d5ae2..402ee13d8a 100644
--- a/application/l10n/org.openjdk.jmc.browser.jdp.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.jdp.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.jdp.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.jdp.ja
diff --git a/application/l10n/org.openjdk.jmc.browser.jdp.ja/pom.xml b/application/l10n/org.openjdk.jmc.browser.jdp.ja/pom.xml
index 60417d433d..1d18c20adf 100644
--- a/application/l10n/org.openjdk.jmc.browser.jdp.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.jdp.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.jdp.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/META-INF/MANIFEST.MF
index 7600cefb35..e36e7f33db 100644
--- a/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.jdp.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.jdp.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/pom.xml
index 7273e22134..b3c2c96a4f 100644
--- a/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.jdp.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.jdp.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.browser.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.browser.zh_CN/META-INF/MANIFEST.MF
index 2e1b366190..6d0f9e16b9 100644
--- a/application/l10n/org.openjdk.jmc.browser.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.browser.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.browser.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.browser;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.browser;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.browser.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.browser.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.browser.zh_CN/pom.xml
index e6c7288c82..625b1f18fd 100644
--- a/application/l10n/org.openjdk.jmc.browser.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.browser.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.persistence.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.persistence.ja/META-INF/MANIFEST.MF
index 7751aa239a..86e927e11d 100644
--- a/application/l10n/org.openjdk.jmc.console.persistence.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.persistence.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.persistence.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.persistence.ja
diff --git a/application/l10n/org.openjdk.jmc.console.persistence.ja/pom.xml b/application/l10n/org.openjdk.jmc.console.persistence.ja/pom.xml
index 6cc3b2e35d..624a85d5c5 100644
--- a/application/l10n/org.openjdk.jmc.console.persistence.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.persistence.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.persistence.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/META-INF/MANIFEST.MF
index 1b39549fdf..8da8a01eda 100644
--- a/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.persistence.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.persistence.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/pom.xml
index ca07760950..5147761fe5 100644
--- a/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.persistence.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.persistence.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/META-INF/MANIFEST.MF
index 828bbe8ee9..bd0dbae61d 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.diagnostic.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.diagnostic.ja
diff --git a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/pom.xml
index 88836e3187..fe6aaef76c 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.diagnostic.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/META-INF/MANIFEST.MF
index 689b4313fa..430245648d 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.diagnostic.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.diagnostic.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/pom.xml
index 6ca70d58d5..520e8d1456 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.diagnostic.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.diagnostic.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.ja/META-INF/MANIFEST.MF
index 0945a24aa4..53fd38cf07 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.console.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.ja/pom.xml
index 97583f32f9..25f970d256 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/META-INF/MANIFEST.MF
index 800c9838ed..c4d0d9873b 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.mbeanbrowser.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.mbeanbrowser.ja
diff --git a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/pom.xml
index 4c63f118c9..7c5e6f784c 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.mbeanbrowser.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/META-INF/MANIFEST.MF
index 083c8e59f3..1b4c6fa841 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/pom.xml
index c84d6c81e2..c9ab59cf0e 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.notification.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.notification.ja/META-INF/MANIFEST.MF
index 0e584dbe87..2dbd53e1e0 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.notification.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.notification.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.notification.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.notification.ja
diff --git a/application/l10n/org.openjdk.jmc.console.ui.notification.ja/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.notification.ja/pom.xml
index cd8d01772f..057db34a47 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.notification.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.notification.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.notification.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/META-INF/MANIFEST.MF
index 1dc87b5b40..4ae618948d 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.notification.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.notification.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/pom.xml
index e5335f0706..8612e04fef 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.notification.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.notification.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.console.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.console.ui.zh_CN/META-INF/MANIFEST.MF
index 3ca638ade1..8d977268cf 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.console.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.console.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.console.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.console.ui.zh_CN/pom.xml
index a99638486b..029a94c484 100644
--- a/application/l10n/org.openjdk.jmc.console.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.console.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.docs.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.docs.ja/META-INF/MANIFEST.MF
index 3611350aaa..41ade77040 100644
--- a/application/l10n/org.openjdk.jmc.docs.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.docs.ja/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.docs.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.docs;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.docs;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.docs.ja
diff --git a/application/l10n/org.openjdk.jmc.docs.ja/pom.xml b/application/l10n/org.openjdk.jmc.docs.ja/pom.xml
index c6c6d14971..ac953712a4 100644
--- a/application/l10n/org.openjdk.jmc.docs.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.docs.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.docs.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.docs.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.docs.zh_CN/META-INF/MANIFEST.MF
index 7586aac06b..6a049e649c 100644
--- a/application/l10n/org.openjdk.jmc.docs.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.docs.zh_CN/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.docs.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.docs;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.docs;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.docs.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.docs.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.docs.zh_CN/pom.xml
index c267b521f1..769266cb96 100644
--- a/application/l10n/org.openjdk.jmc.docs.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.docs.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.docs.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.feature.ja/feature.xml b/application/l10n/org.openjdk.jmc.feature.ja/feature.xml
index aa6c0b95ff..8c0a467338 100644
--- a/application/l10n/org.openjdk.jmc.feature.ja/feature.xml
+++ b/application/l10n/org.openjdk.jmc.feature.ja/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.ja"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/l10n/org.openjdk.jmc.feature.ja/pom.xml b/application/l10n/org.openjdk.jmc.feature.ja/pom.xml
index 2ca9921569..83f7d2c856 100644
--- a/application/l10n/org.openjdk.jmc.feature.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.feature.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.ja</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/l10n/org.openjdk.jmc.feature.rcp.ja/feature.xml b/application/l10n/org.openjdk.jmc.feature.rcp.ja/feature.xml
index 73eb560247..b00862dcf4 100644
--- a/application/l10n/org.openjdk.jmc.feature.rcp.ja/feature.xml
+++ b/application/l10n/org.openjdk.jmc.feature.rcp.ja/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.rcp.ja"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/l10n/org.openjdk.jmc.feature.rcp.ja/pom.xml b/application/l10n/org.openjdk.jmc.feature.rcp.ja/pom.xml
index d1265b3b56..acda7ff6ca 100644
--- a/application/l10n/org.openjdk.jmc.feature.rcp.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.feature.rcp.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.rcp.ja</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/feature.xml b/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/feature.xml
index f7587ff953..f6868d6e00 100644
--- a/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/feature.xml
+++ b/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.rcp.zh_CN"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/pom.xml
index 48b5e57d5c..aac54264e9 100644
--- a/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.feature.rcp.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.rcp.zh_CN</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/l10n/org.openjdk.jmc.feature.zh_CN/feature.xml b/application/l10n/org.openjdk.jmc.feature.zh_CN/feature.xml
index 316b5bd0b4..899c25d6d6 100644
--- a/application/l10n/org.openjdk.jmc.feature.zh_CN/feature.xml
+++ b/application/l10n/org.openjdk.jmc.feature.zh_CN/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.zh_CN"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/l10n/org.openjdk.jmc.feature.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.feature.zh_CN/pom.xml
index c6ebc6ac17..abf8c05cce 100644
--- a/application/l10n/org.openjdk.jmc.feature.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.feature.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.zh_CN</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/META-INF/MANIFEST.MF
index 62e2600bfd..424518fe69 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.flightrecorder.controlpanel.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.flightrecorder.controlpanel.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.flightrecorder.controlpanel.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/pom.xml
index 7f9cec78fe..ffb0c53376 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/META-INF/MANIFEST.MF
index e036439d89..5a45db01b5 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.flightrecorder.controlpanel.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.flightrecorder.controlpanel.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/pom.xml
index 000bd01cdb..4a59906c2a 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/META-INF/MANIFEST.MF
index b69d15e1c4..0631b60af9 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.flightrecorder.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.flightrecorder.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.flightrecorder.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/pom.xml
index 6c5362f5f0..74c95bdf0f 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/META-INF/MANIFEST.MF
index 18832a4fae..6d3f52ef7c 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.flightrecorder.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.flightrecorder.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.flightrecorder.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/pom.xml
index c901978e1b..6b4290d285 100644
--- a/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.flightrecorder.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.greychart.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.greychart.ui.ja/META-INF/MANIFEST.MF
index 4ea02d47e8..1dc2620c83 100644
--- a/application/l10n/org.openjdk.jmc.greychart.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.greychart.ui.ja/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.greychart.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.greychart.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.greychart.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.greychart.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.greychart.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.greychart.ui.ja/pom.xml
index 9912f107ef..d88c479bfd 100644
--- a/application/l10n/org.openjdk.jmc.greychart.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.greychart.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.greychart.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/META-INF/MANIFEST.MF
index edd1dae966..94a943a6ad 100644
--- a/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.greychart.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.greychart.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.greychart.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.greychart.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/pom.xml
index 9de42e8e0e..e294155422 100644
--- a/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.greychart.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.greychart.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ide.jdt.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ide.jdt.ja/META-INF/MANIFEST.MF
index 84b6c926b7..795de9f502 100644
--- a/application/l10n/org.openjdk.jmc.ide.jdt.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ide.jdt.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ide.jdt.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ide.jdt;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ide.jdt;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.ide.jdt.ja
diff --git a/application/l10n/org.openjdk.jmc.ide.jdt.ja/pom.xml b/application/l10n/org.openjdk.jmc.ide.jdt.ja/pom.xml
index e57aebd622..1c207f139d 100644
--- a/application/l10n/org.openjdk.jmc.ide.jdt.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ide.jdt.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.jdt.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/META-INF/MANIFEST.MF
index 5fc9d8b6a3..7b6ed1b512 100644
--- a/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ide.jdt.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ide.jdt;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ide.jdt;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.ide.jdt.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/pom.xml
index 5f0d4a1df7..9466bcaf4d 100644
--- a/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ide.jdt.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.jdt.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ide.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ide.ui.ja/META-INF/MANIFEST.MF
index 649f12ea86..e0a09598b8 100644
--- a/application/l10n/org.openjdk.jmc.ide.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ide.ui.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ide.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ide.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ide.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.ide.ui.ja
 
diff --git a/application/l10n/org.openjdk.jmc.ide.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.ide.ui.ja/pom.xml
index 5ede625f4c..b07b3988b4 100644
--- a/application/l10n/org.openjdk.jmc.ide.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ide.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/META-INF/MANIFEST.MF
index 42fb0daf8d..e3e76fce69 100644
--- a/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ide.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ide.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ide.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.ide.ui.zh_CN
 
diff --git a/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/pom.xml
index e44fb28b5d..2b09929ef4 100644
--- a/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ide.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rcp.application.ja/META-INF/MANIFEST.MF
index 6880b34554..18d057e8bf 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rcp.application.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rcp.application.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rcp.application;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rcp.application;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.rcp.application.ja
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.ja/pom.xml b/application/l10n/org.openjdk.jmc.rcp.application.ja/pom.xml
index 65636cee97..d87f44a6ea 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rcp.application.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.application.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.ja/src/main/resources/org/openjdk/jmc/rcp/application/messages_ja.properties b/application/l10n/org.openjdk.jmc.rcp.application.ja/src/main/resources/org/openjdk/jmc/rcp/application/messages_ja.properties
index bd7b268b25..f4b0ba48d3 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.ja/src/main/resources/org/openjdk/jmc/rcp/application/messages_ja.properties
+++ b/application/l10n/org.openjdk.jmc.rcp.application.ja/src/main/resources/org/openjdk/jmc/rcp/application/messages_ja.properties
@@ -53,4 +53,4 @@ LockedWorkspaceDialog_LOCKED_WORKSPACE1_TEXT=Mission Control\u306E\u30EF\u30FC\u
 LockedWorkspaceDialog_LOCKED_WORKSPACE3_TEXT=\u672C\u5F53\u306B\u7D9A\u884C\u3057\u307E\u3059\u304B\u3002
 LockedWorkspaceDialog_OK_BUTTON_TEXT=OK
 LockedWorkspaceDialog_CANCEL_BUTTON_TEXT=\u53D6\u6D88
-JMC_RCP_P2_UPDATESITE_NICK_NAME=JDK Mission Control 8.0.0 RCP\u66F4\u65B0\u30B5\u30A4\u30C8
+JMC_RCP_P2_UPDATESITE_NICK_NAME=JDK Mission Control 8.1.0 RCP\u66F4\u65B0\u30B5\u30A4\u30C8
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/META-INF/MANIFEST.MF
index 4ef8813398..bb7d437f86 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rcp.application.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rcp.application;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rcp.application;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.rcp.application.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/pom.xml
index 8cc7678103..75750ee4c4 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.application.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/src/main/resources/org/openjdk/jmc/rcp/application/messages_zh_CN.properties b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/src/main/resources/org/openjdk/jmc/rcp/application/messages_zh_CN.properties
index 4c50b3782e..7dd98091e0 100644
--- a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/src/main/resources/org/openjdk/jmc/rcp/application/messages_zh_CN.properties
+++ b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/src/main/resources/org/openjdk/jmc/rcp/application/messages_zh_CN.properties
@@ -53,4 +53,4 @@ LockedWorkspaceDialog_LOCKED_WORKSPACE1_TEXT=Mission Control \u7684\u5DE5\u4F5C\
 LockedWorkspaceDialog_LOCKED_WORKSPACE3_TEXT=\u662F\u5426\u786E\u5B9E\u8981\u7EE7\u7EED?
 LockedWorkspaceDialog_OK_BUTTON_TEXT=\u786E\u5B9A
 LockedWorkspaceDialog_CANCEL_BUTTON_TEXT=\u53D6\u6D88
-JMC_RCP_P2_UPDATESITE_NICK_NAME=JDK Mission Control 8.0.0 RCP \u66F4\u65B0\u7AD9\u70B9
+JMC_RCP_P2_UPDATESITE_NICK_NAME=JDK Mission Control 8.1.0 RCP \u66F4\u65B0\u7AD9\u70B9
diff --git a/application/l10n/org.openjdk.jmc.rcp.intro.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rcp.intro.ja/META-INF/MANIFEST.MF
index 7499ff2e29..955784cda3 100644
--- a/application/l10n/org.openjdk.jmc.rcp.intro.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rcp.intro.ja/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rcp.intro.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rcp.intro;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rcp.intro;bundle-version="8.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.openjdk.jmc.rcp.intro.ja
diff --git a/application/l10n/org.openjdk.jmc.rcp.intro.ja/pom.xml b/application/l10n/org.openjdk.jmc.rcp.intro.ja/pom.xml
index 7f3253a627..ac2306b3d8 100644
--- a/application/l10n/org.openjdk.jmc.rcp.intro.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rcp.intro.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.intro.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/META-INF/MANIFEST.MF
index 6ab9354410..25cb77c0fc 100644
--- a/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rcp.intro.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rcp.intro;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rcp.intro;bundle-version="8.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.openjdk.jmc.rcp.intro.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/pom.xml
index aacad0ec0e..3e79813e7a 100644
--- a/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rcp.intro.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.intro.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rjmx.ja/META-INF/MANIFEST.MF
index a6de39d09c..e7e549bd46 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rjmx.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rjmx;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rjmx;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.rjmx.ja
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ja/pom.xml b/application/l10n/org.openjdk.jmc.rjmx.ja/pom.xml
index d28d920950..7cdab5042d 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rjmx.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rjmx.ui.ja/META-INF/MANIFEST.MF
index 658a1ffcf5..6e5b4b0a37 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rjmx.ui.ja/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rjmx.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rjmx.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.rjmx.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.rjmx.ui.ja/pom.xml
index ef17358091..cbc3bc3848 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rjmx.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/META-INF/MANIFEST.MF
index 87c371a146..ac4689518e 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rjmx.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rjmx.ui;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.rjmx.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/pom.xml
index f0940e3025..c96f31770b 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rjmx.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.rjmx.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.rjmx.zh_CN/META-INF/MANIFEST.MF
index e99d9069f3..3a74ec4226 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.rjmx.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.rjmx;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.rjmx;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.rjmx.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.rjmx.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.rjmx.zh_CN/pom.xml
index 02bdd2fe43..24e986cd0e 100644
--- a/application/l10n/org.openjdk.jmc.rjmx.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.rjmx.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ui.common.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ui.common.ja/META-INF/MANIFEST.MF
index 9fe57bb626..8a8e5f4ccb 100644
--- a/application/l10n/org.openjdk.jmc.ui.common.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ui.common.ja/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ui.common.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ui.common;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ui.common;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.ui.common.ja
diff --git a/application/l10n/org.openjdk.jmc.ui.common.ja/pom.xml b/application/l10n/org.openjdk.jmc.ui.common.ja/pom.xml
index 69adbc8851..c86485bcbe 100644
--- a/application/l10n/org.openjdk.jmc.ui.common.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ui.common.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.common.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ui.common.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ui.common.zh_CN/META-INF/MANIFEST.MF
index 3c8ddfe2c3..181bc5e881 100644
--- a/application/l10n/org.openjdk.jmc.ui.common.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ui.common.zh_CN/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ui.common.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ui.common;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ui.common;bundle-version="8.1.0"
 Automatic-Module-Name: org.openjdk.jmc.ui.common.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.ui.common.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.ui.common.zh_CN/pom.xml
index 24036eefb2..a9dab95534 100644
--- a/application/l10n/org.openjdk.jmc.ui.common.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ui.common.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.common.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ui.ja/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ui.ja/META-INF/MANIFEST.MF
index 0466f80811..2eaef7307d 100644
--- a/application/l10n/org.openjdk.jmc.ui.ja/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ui.ja/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Japanese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ui.ja
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.ui.ja
diff --git a/application/l10n/org.openjdk.jmc.ui.ja/pom.xml b/application/l10n/org.openjdk.jmc.ui.ja/pom.xml
index 7c985c0c15..a262e52b79 100644
--- a/application/l10n/org.openjdk.jmc.ui.ja/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ui.ja/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.ja</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/org.openjdk.jmc.ui.zh_CN/META-INF/MANIFEST.MF b/application/l10n/org.openjdk.jmc.ui.zh_CN/META-INF/MANIFEST.MF
index 58f3334ee0..bc7d4298df 100644
--- a/application/l10n/org.openjdk.jmc.ui.zh_CN/META-INF/MANIFEST.MF
+++ b/application/l10n/org.openjdk.jmc.ui.zh_CN/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Simplified Chinese Language Fragment
 Bundle-SymbolicName: org.openjdk.jmc.ui.zh_CN
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.ui;bundle-version="8.0.0"
+Fragment-Host: org.openjdk.jmc.ui;bundle-version="8.1.0"
 Bundle-Localization: plugin
 Automatic-Module-Name: org.openjdk.jmc.ui.zh_CN
diff --git a/application/l10n/org.openjdk.jmc.ui.zh_CN/pom.xml b/application/l10n/org.openjdk.jmc.ui.zh_CN/pom.xml
index 97b64332a0..ab2db54e53 100644
--- a/application/l10n/org.openjdk.jmc.ui.zh_CN/pom.xml
+++ b/application/l10n/org.openjdk.jmc.ui.zh_CN/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.l10n</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.zh_CN</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/l10n/pom.xml b/application/l10n/pom.xml
index 4217348c3b..d49c9441c2 100644
--- a/application/l10n/pom.xml
+++ b/application/l10n/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.application.l10n</artifactId>
 	<packaging>pom</packaging>
diff --git a/application/org.openjdk.jmc.alert/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.alert/META-INF/MANIFEST.MF
index 6ea0e64f84..80fa0b8f79 100644
--- a/application/org.openjdk.jmc.alert/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.alert/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Alert Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.alert; singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.alert.AlertPlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.alert/pom.xml b/application/org.openjdk.jmc.alert/pom.xml
index 4e5cb1c493..fac4a6fa18 100644
--- a/application/org.openjdk.jmc.alert/pom.xml
+++ b/application/org.openjdk.jmc.alert/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.alert</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.attach/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.attach/META-INF/MANIFEST.MF
index 5d1001bdd3..2ed57f9e54 100644
--- a/application/org.openjdk.jmc.attach/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.attach/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Attach Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.attach;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Classpath: .,
diff --git a/application/org.openjdk.jmc.attach/pom.xml b/application/org.openjdk.jmc.attach/pom.xml
index f8163ffe34..c31d6bc55d 100644
--- a/application/org.openjdk.jmc.attach/pom.xml
+++ b/application/org.openjdk.jmc.attach/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.attach</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.browser.attach/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.browser.attach/META-INF/MANIFEST.MF
index c414fa11e6..892e1be5e1 100644
--- a/application/org.openjdk.jmc.browser.attach/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.browser.attach/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Browser Attach Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.browser.attach;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.rjmx,
diff --git a/application/org.openjdk.jmc.browser.attach/pom.xml b/application/org.openjdk.jmc.browser.attach/pom.xml
index 02e1277b5d..58cac25653 100644
--- a/application/org.openjdk.jmc.browser.attach/pom.xml
+++ b/application/org.openjdk.jmc.browser.attach/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.attach</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.browser.jdp/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.browser.jdp/META-INF/MANIFEST.MF
index 258e9fc3b1..798cd0a907 100644
--- a/application/org.openjdk.jmc.browser.jdp/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.browser.jdp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: JDP Browser Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.browser.jdp;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.ui,
diff --git a/application/org.openjdk.jmc.browser.jdp/pom.xml b/application/org.openjdk.jmc.browser.jdp/pom.xml
index d911e30efc..a4dbf2cae0 100644
--- a/application/org.openjdk.jmc.browser.jdp/pom.xml
+++ b/application/org.openjdk.jmc.browser.jdp/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.jdp</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.browser/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.browser/META-INF/MANIFEST.MF
index 2a1e9af82b..7545588c4b 100644
--- a/application/org.openjdk.jmc.browser/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.browser/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: JVMBrowser Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.browser;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.browser.JVMBrowserPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.ui,
diff --git a/application/org.openjdk.jmc.browser/pom.xml b/application/org.openjdk.jmc.browser/pom.xml
index 14050e2e27..9eb0b4c4bb 100644
--- a/application/org.openjdk.jmc.browser/pom.xml
+++ b/application/org.openjdk.jmc.browser/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.commands/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.commands/META-INF/MANIFEST.MF
index c0ef0a4aba..e642d3b3ac 100644
--- a/application/org.openjdk.jmc.commands/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commands Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.commands;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/org.openjdk.jmc.commands/pom.xml b/application/org.openjdk.jmc.commands/pom.xml
index dbdb5d9266..a90ff10836 100644
--- a/application/org.openjdk.jmc.commands/pom.xml
+++ b/application/org.openjdk.jmc.commands/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.commands</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.jconsole/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.jconsole/META-INF/MANIFEST.MF
index 8490aedee6..ae451a1e27 100644
--- a/application/org.openjdk.jmc.console.jconsole/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.jconsole/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JConsole Meta Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.console.jconsole; singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.console.jconsole.Activator
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.console.jconsole/pom.xml b/application/org.openjdk.jmc.console.jconsole/pom.xml
index a8e83bbb6e..2723fefca0 100644
--- a/application/org.openjdk.jmc.console.jconsole/pom.xml
+++ b/application/org.openjdk.jmc.console.jconsole/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.jconsole</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.pde/pom.xml b/application/org.openjdk.jmc.console.pde/pom.xml
index 65f47f2b15..45b0cec8ed 100644
--- a/application/org.openjdk.jmc.console.pde/pom.xml
+++ b/application/org.openjdk.jmc.console.pde/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.pde</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.console.persistence/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.persistence/META-INF/MANIFEST.MF
index ceac373a80..cd83ac5a68 100644
--- a/application/org.openjdk.jmc.console.persistence/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.persistence/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: JMX Data Persistence Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.console.persistence;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.console.persistence.PersistencePlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.console.persistence/pom.xml b/application/org.openjdk.jmc.console.persistence/pom.xml
index 8efc65a7ec..ef0f7a65ef 100644
--- a/application/org.openjdk.jmc.console.persistence/pom.xml
+++ b/application/org.openjdk.jmc.console.persistence/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.persistence</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.twitter/pom.xml b/application/org.openjdk.jmc.console.twitter/pom.xml
index 2b326377b2..063cb78286 100644
--- a/application/org.openjdk.jmc.console.twitter/pom.xml
+++ b/application/org.openjdk.jmc.console.twitter/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.twitter</artifactId>
 	<version>1.0.2-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.console.ui.diagnostic/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui.diagnostic/META-INF/MANIFEST.MF
index c3fee584f0..e93e026d47 100644
--- a/application/org.openjdk.jmc.console.ui.diagnostic/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.ui.diagnostic/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Diagnostic Command Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.diagnostic;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.console.ui.diagnostic.DiagnosticPlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.console.ui.diagnostic/pom.xml b/application/org.openjdk.jmc.console.ui.diagnostic/pom.xml
index 2bb52cd40f..b1c70de568 100644
--- a/application/org.openjdk.jmc.console.ui.diagnostic/pom.xml
+++ b/application/org.openjdk.jmc.console.ui.diagnostic/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.diagnostic</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.ui.mbeanbrowser/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui.mbeanbrowser/META-INF/MANIFEST.MF
index cb8999ec8b..f50a0ab0f2 100644
--- a/application/org.openjdk.jmc.console.ui.mbeanbrowser/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.ui.mbeanbrowser/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: MBeanbrowser Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.mbeanbrowser;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.console.ui,
diff --git a/application/org.openjdk.jmc.console.ui.mbeanbrowser/pom.xml b/application/org.openjdk.jmc.console.ui.mbeanbrowser/pom.xml
index e2369ddf3b..db03adf642 100644
--- a/application/org.openjdk.jmc.console.ui.mbeanbrowser/pom.xml
+++ b/application/org.openjdk.jmc.console.ui.mbeanbrowser/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.mbeanbrowser</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.ui.notification/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui.notification/META-INF/MANIFEST.MF
index a10cc7684f..7edac65105 100644
--- a/application/org.openjdk.jmc.console.ui.notification/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.ui.notification/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Console Notification Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.console.ui.notification; singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.ui.common,
diff --git a/application/org.openjdk.jmc.console.ui.notification/pom.xml b/application/org.openjdk.jmc.console.ui.notification/pom.xml
index 1366fdc834..319aa83c52 100644
--- a/application/org.openjdk.jmc.console.ui.notification/pom.xml
+++ b/application/org.openjdk.jmc.console.ui.notification/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.notification</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.console.ui.subscriptions/pom.xml b/application/org.openjdk.jmc.console.ui.subscriptions/pom.xml
index aad314a82b..ac5f65d732 100644
--- a/application/org.openjdk.jmc.console.ui.subscriptions/pom.xml
+++ b/application/org.openjdk.jmc.console.ui.subscriptions/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui.subscriptions</artifactId>
 	<version>0.0.3-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
index 7970d6a925..31f2f5e3ee 100644
--- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: JMX Console
 Bundle-SymbolicName: org.openjdk.jmc.console.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.console.ui.ConsolePlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.console.ui/pom.xml b/application/org.openjdk.jmc.console.ui/pom.xml
index 3b29412db3..1969457e4d 100644
--- a/application/org.openjdk.jmc.console.ui/pom.xml
+++ b/application/org.openjdk.jmc.console.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.docs/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.docs/META-INF/MANIFEST.MF
index 732d9730fd..017e40df18 100644
--- a/application/org.openjdk.jmc.docs/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.docs/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Mission Control Documentation
 Bundle-SymbolicName: org.openjdk.jmc.docs;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Automatic-Module-Name: org.openjdk.jmc.docs
diff --git a/application/org.openjdk.jmc.docs/pom.xml b/application/org.openjdk.jmc.docs/pom.xml
index 39cde0d658..e7b6643f25 100644
--- a/application/org.openjdk.jmc.docs/pom.xml
+++ b/application/org.openjdk.jmc.docs/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.docs</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.feature.console.ui.subscriptions/feature.xml b/application/org.openjdk.jmc.feature.console.ui.subscriptions/feature.xml
index 9cf6016ef2..9494c44f82 100644
--- a/application/org.openjdk.jmc.feature.console.ui.subscriptions/feature.xml
+++ b/application/org.openjdk.jmc.feature.console.ui.subscriptions/feature.xml
@@ -37,7 +37,7 @@
       version="0.0.3.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
       
 
    <description url="%descriptionUrl">
diff --git a/application/org.openjdk.jmc.feature.console.ui.subscriptions/pom.xml b/application/org.openjdk.jmc.feature.console.ui.subscriptions/pom.xml
index 2723316966..42e5abea80 100644
--- a/application/org.openjdk.jmc.feature.console.ui.subscriptions/pom.xml
+++ b/application/org.openjdk.jmc.feature.console.ui.subscriptions/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.console.ui.subscriptions</artifactId>
 	<version>0.0.3-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.feature.console/feature.xml b/application/org.openjdk.jmc.feature.console/feature.xml
index cbe6ed5b60..d1085c0e70 100644
--- a/application/org.openjdk.jmc.feature.console/feature.xml
+++ b/application/org.openjdk.jmc.feature.console/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.console"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.console/pom.xml b/application/org.openjdk.jmc.feature.console/pom.xml
index cbe2b439f5..d35c1b58d4 100644
--- a/application/org.openjdk.jmc.feature.console/pom.xml
+++ b/application/org.openjdk.jmc.feature.console/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.console</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
index f42eed325c..b9781c78de 100644
--- a/application/org.openjdk.jmc.feature.core/feature.xml
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
@@ -34,11 +34,11 @@
 <feature
       id="org.openjdk.jmc.feature.core"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       plugin="org.openjdk.jmc.ui"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.core/pom.xml b/application/org.openjdk.jmc.feature.core/pom.xml
index 47d4f912c4..fb6cdcb9d0 100644
--- a/application/org.openjdk.jmc.feature.core/pom.xml
+++ b/application/org.openjdk.jmc.feature.core/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.core</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/feature.xml
index 084ce90699..3ed9e7f0f5 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/feature.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/feature.xml
@@ -37,7 +37,7 @@
       version="1.0.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/pom.xml b/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/pom.xml
index 239e61d02c..33cff60315 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/pom.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.ext.g1/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.flightrecorder.ext.g1</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/feature.xml
index b763d8b157..2d3461cefb 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/feature.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.flightrecorder.ext.jfx"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/pom.xml b/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/pom.xml
index 8b3d227ecb..42e76b21ce 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/pom.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.ext.jfx/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.flightrecorder.ext.jfx</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.metadata/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder.metadata/feature.xml
index 1b7423bef1..d12cfb7675 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.metadata/feature.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.metadata/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.flightrecorder.metadata"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.flightrecorder.metadata/pom.xml b/application/org.openjdk.jmc.feature.flightrecorder.metadata/pom.xml
index 5736def9a7..fcde70545e 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder.metadata/pom.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder.metadata/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.flightrecorder.metadata</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
index cd6d0f9cff..f68895ef80 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.flightrecorder"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.flightrecorder/pom.xml b/application/org.openjdk.jmc.feature.flightrecorder/pom.xml
index 03b882bd8e..16211da233 100644
--- a/application/org.openjdk.jmc.feature.flightrecorder/pom.xml
+++ b/application/org.openjdk.jmc.feature.flightrecorder/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.flightrecorder</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.ide.launch/feature.xml b/application/org.openjdk.jmc.feature.ide.launch/feature.xml
index ca6e6abb16..92be6f6060 100644
--- a/application/org.openjdk.jmc.feature.ide.launch/feature.xml
+++ b/application/org.openjdk.jmc.feature.ide.launch/feature.xml
@@ -37,7 +37,7 @@
       version="0.0.4.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.ide.launch/pom.xml b/application/org.openjdk.jmc.feature.ide.launch/pom.xml
index b6e34b176e..80a8ee453a 100644
--- a/application/org.openjdk.jmc.feature.ide.launch/pom.xml
+++ b/application/org.openjdk.jmc.feature.ide.launch/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.ide.launch</artifactId>
 	<version>0.0.4-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml
index 8e2f469ace..491a52de8f 100644
--- a/application/org.openjdk.jmc.feature.ide/feature.xml
+++ b/application/org.openjdk.jmc.feature.ide/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.ide"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.ide/pom.xml b/application/org.openjdk.jmc.feature.ide/pom.xml
index c4add8e016..c538ed91a2 100644
--- a/application/org.openjdk.jmc.feature.ide/pom.xml
+++ b/application/org.openjdk.jmc.feature.ide/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.ide</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.jconsole/feature.xml b/application/org.openjdk.jmc.feature.jconsole/feature.xml
index c82e204943..6840c7fcda 100644
--- a/application/org.openjdk.jmc.feature.jconsole/feature.xml
+++ b/application/org.openjdk.jmc.feature.jconsole/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.jconsole"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.jconsole/pom.xml b/application/org.openjdk.jmc.feature.jconsole/pom.xml
index ad2315fc11..ebdf701390 100644
--- a/application/org.openjdk.jmc.feature.jconsole/pom.xml
+++ b/application/org.openjdk.jmc.feature.jconsole/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.jconsole</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.joverflow/feature.xml b/application/org.openjdk.jmc.feature.joverflow/feature.xml
index 361d86161a..d742c4ece5 100644
--- a/application/org.openjdk.jmc.feature.joverflow/feature.xml
+++ b/application/org.openjdk.jmc.feature.joverflow/feature.xml
@@ -37,7 +37,7 @@
       version="1.0.1.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.joverflow/pom.xml b/application/org.openjdk.jmc.feature.joverflow/pom.xml
index 5c6b11966f..c512470be5 100644
--- a/application/org.openjdk.jmc.feature.joverflow/pom.xml
+++ b/application/org.openjdk.jmc.feature.joverflow/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.joverflow</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.feature.license/feature.xml b/application/org.openjdk.jmc.feature.license/feature.xml
index 4df6b0f9b4..7a4c925867 100644
--- a/application/org.openjdk.jmc.feature.license/feature.xml
+++ b/application/org.openjdk.jmc.feature.license/feature.xml
@@ -34,7 +34,7 @@
 <feature
       id="org.openjdk.jmc.feature.license"
       label="JDK Mission Control License Feature"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="Oracle">
 
    <description url="http://www.oracle.com/missioncontrol">
diff --git a/application/org.openjdk.jmc.feature.license/pom.xml b/application/org.openjdk.jmc.feature.license/pom.xml
index 512b961a2b..1d069e2928 100644
--- a/application/org.openjdk.jmc.feature.license/pom.xml
+++ b/application/org.openjdk.jmc.feature.license/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.license</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.pde/feature.xml b/application/org.openjdk.jmc.feature.pde/feature.xml
index 3d5c7d1949..e3d07b6e7b 100644
--- a/application/org.openjdk.jmc.feature.pde/feature.xml
+++ b/application/org.openjdk.jmc.feature.pde/feature.xml
@@ -37,7 +37,7 @@
       version="2.0.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.pde/pom.xml b/application/org.openjdk.jmc.feature.pde/pom.xml
index 6c49c33482..11cf6d1b7e 100644
--- a/application/org.openjdk.jmc.feature.pde/pom.xml
+++ b/application/org.openjdk.jmc.feature.pde/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.pde</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.feature.rcp.update/feature.xml b/application/org.openjdk.jmc.feature.rcp.update/feature.xml
index bc377f47f6..3f95f4a3d3 100644
--- a/application/org.openjdk.jmc.feature.rcp.update/feature.xml
+++ b/application/org.openjdk.jmc.feature.rcp.update/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.rcp.update"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.rcp.update/pom.xml b/application/org.openjdk.jmc.feature.rcp.update/pom.xml
index a891e99895..124cca0863 100644
--- a/application/org.openjdk.jmc.feature.rcp.update/pom.xml
+++ b/application/org.openjdk.jmc.feature.rcp.update/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.rcp.update</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
index af0c2f2faa..ee1992fed3 100644
--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.feature.rcp"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.rcp/pom.xml b/application/org.openjdk.jmc.feature.rcp/pom.xml
index 9424bc84f9..82eb7bd629 100644
--- a/application/org.openjdk.jmc.feature.rcp/pom.xml
+++ b/application/org.openjdk.jmc.feature.rcp/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.rcp</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.feature.twitter/feature.xml b/application/org.openjdk.jmc.feature.twitter/feature.xml
index a61343ecd7..94c9bbad87 100644
--- a/application/org.openjdk.jmc.feature.twitter/feature.xml
+++ b/application/org.openjdk.jmc.feature.twitter/feature.xml
@@ -37,7 +37,7 @@
       version="1.0.2.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.feature.twitter/pom.xml b/application/org.openjdk.jmc.feature.twitter/pom.xml
index d8cc0b6e6e..3677886a14 100644
--- a/application/org.openjdk.jmc.feature.twitter/pom.xml
+++ b/application/org.openjdk.jmc.feature.twitter/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.feature.twitter</artifactId>
 	<version>1.0.2-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.flightrecorder.configuration/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.configuration/META-INF/MANIFEST.MF
index 4bb6322081..2883748fe8 100644
--- a/application/org.openjdk.jmc.flightrecorder.configuration/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDK Flight Recorder Configuration
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.configuration;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.openjdk.jmc.common
diff --git a/application/org.openjdk.jmc.flightrecorder.configuration/pom.xml b/application/org.openjdk.jmc.flightrecorder.configuration/pom.xml
index d611eeba45..6a4294fbf3 100644
--- a/application/org.openjdk.jmc.flightrecorder.configuration/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.configuration/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.configuration</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/META-INF/MANIFEST.MF
index 01a49b0f62..71c0a939ce 100644
--- a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Configuration UI
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Bundle: org.openjdk.jmc.ui,
  org.openjdk.jmc.flightrecorder.configuration,
  org.openjdk.jmc.ui.common
diff --git a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/pom.xml b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/pom.xml
index 92051c1da6..e9b7eb55c5 100644
--- a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/META-INF/MANIFEST.MF
index a2f62e4e5e..a717a149ce 100644
--- a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Control Panel Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.flightrecorder.controlpanel.ui.ControlPanel
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/pom.xml b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/pom.xml
index f2aabba0c2..4549312e85 100644
--- a/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.controlpanel.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.ext.g1/pom.xml b/application/org.openjdk.jmc.flightrecorder.ext.g1/pom.xml
index 32223d6d6d..27159d4fdd 100644
--- a/application/org.openjdk.jmc.flightrecorder.ext.g1/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.ext.g1/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ext.g1</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.flightrecorder.ext.jfx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ext.jfx/META-INF/MANIFEST.MF
index af8467d45f..2bfdea0cc3 100644
--- a/application/org.openjdk.jmc.flightrecorder.ext.jfx/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.ext.jfx/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Name: Java FX for JFR
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ext.jfx;singleton:=true
diff --git a/application/org.openjdk.jmc.flightrecorder.ext.jfx/pom.xml b/application/org.openjdk.jmc.flightrecorder.ext.jfx/pom.xml
index 11a6e7b0cf..8773295b06 100644
--- a/application/org.openjdk.jmc.flightrecorder.ext.jfx/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.ext.jfx/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ext.jfx</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.flameview/META-INF/MANIFEST.MF
index e829449c53..95c7ad1b35 100644
--- a/application/org.openjdk.jmc.flightrecorder.flameview/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: FlameView
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.flameview;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Bundle: org.openjdk.jmc.flightrecorder,
  org.openjdk.jmc.flightrecorder.ui,
  org.openjdk.jmc.flightrecorder.rules,
diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
index 89cc5e9a4f..5379a77226 100644
--- a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
@@ -38,7 +38,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.flameview</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.graphview/META-INF/MANIFEST.MF
index 685e1e0d9e..f53d2e1efb 100644
--- a/application/org.openjdk.jmc.flightrecorder.graphview/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GraphView
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.graphview;singleton:=true
-Bundle-Version: 8.0.0.qualifier
-Require-Bundle: org.openjdk.jmc.flightrecorder;bundle-version="8.0.0",
- org.openjdk.jmc.flightrecorder.ui;bundle-version="8.0.0",
+Bundle-Version: 8.1.0.qualifier
+Require-Bundle: org.openjdk.jmc.flightrecorder;bundle-version="8.1.0",
+ org.openjdk.jmc.flightrecorder.ui;bundle-version="8.1.0",
  org.junit,
  org.junit.jupiter.api,
  org.junit.jupiter.engine,
diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
index 9e054087f7..1b4609e32e 100644
--- a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
@@ -38,7 +38,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.graphview</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.metadata/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.metadata/META-INF/MANIFEST.MF
index f306f7fb83..dd3adaf83f 100644
--- a/application/org.openjdk.jmc.flightrecorder.metadata/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.metadata/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JFR Metadata Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.metadata;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.openjdk.jmc.flightrecorder,
  org.openjdk.jmc.flightrecorder.ui
diff --git a/application/org.openjdk.jmc.flightrecorder.metadata/pom.xml b/application/org.openjdk.jmc.flightrecorder.metadata/pom.xml
index 274f7b5423..bf925291b5 100644
--- a/application/org.openjdk.jmc.flightrecorder.metadata/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.metadata/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.metadata</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.pde/pom.xml b/application/org.openjdk.jmc.flightrecorder.pde/pom.xml
index fb0ce29142..8869143887 100644
--- a/application/org.openjdk.jmc.flightrecorder.pde/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.pde/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.pde</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/META-INF/MANIFEST.MF
index 1063864127..b94382f779 100644
--- a/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mission Control Flight Recorder Rule Provider For OSGi
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.rules.extensionprovider
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.flightrecorder.rules
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/pom.xml b/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/pom.xml
index 1f7887cbaa..738b2a9a61 100644
--- a/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.rules.extensionprovider/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.rules.extensionprovider</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
index a2b381acd6..cbbd06b225 100644
--- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Flightrecorder Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.rjmx,
diff --git a/application/org.openjdk.jmc.flightrecorder.ui/pom.xml b/application/org.openjdk.jmc.flightrecorder.ui/pom.xml
index f214406d97..a51c79b054 100644
--- a/application/org.openjdk.jmc.flightrecorder.ui/pom.xml
+++ b/application/org.openjdk.jmc.flightrecorder.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.greychart.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.greychart.ui/META-INF/MANIFEST.MF
index 5449947686..2faa968d8b 100644
--- a/application/org.openjdk.jmc.greychart.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.greychart.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Greychart UI Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.greychart.ui
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.openjdk.jmc.greychart;visibility:=reexport,
diff --git a/application/org.openjdk.jmc.greychart.ui/pom.xml b/application/org.openjdk.jmc.greychart.ui/pom.xml
index ef07619bd6..50f4920ae1 100644
--- a/application/org.openjdk.jmc.greychart.ui/pom.xml
+++ b/application/org.openjdk.jmc.greychart.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.greychart.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.greychart/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.greychart/META-INF/MANIFEST.MF
index f3d5f23977..25dc152fd4 100644
--- a/application/org.openjdk.jmc.greychart/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.greychart/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: GreyChart Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.greychart;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Export-Package: org.openjdk.jmc.greychart,
  org.openjdk.jmc.greychart.data,
diff --git a/application/org.openjdk.jmc.greychart/pom.xml b/application/org.openjdk.jmc.greychart/pom.xml
index 339e3326f5..174cfb8c4c 100644
--- a/application/org.openjdk.jmc.greychart/pom.xml
+++ b/application/org.openjdk.jmc.greychart/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.greychart</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.ide.jdt/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.ide.jdt/META-INF/MANIFEST.MF
index cccc2ac05f..81eb3ff6e0 100644
--- a/application/org.openjdk.jmc.ide.jdt/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.ide.jdt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Support for Eclipse JDT
 Bundle-SymbolicName: org.openjdk.jmc.ide.jdt;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.openjdk.jmc.ui.common,
diff --git a/application/org.openjdk.jmc.ide.jdt/pom.xml b/application/org.openjdk.jmc.ide.jdt/pom.xml
index e3f06b04eb..6793ba2f16 100644
--- a/application/org.openjdk.jmc.ide.jdt/pom.xml
+++ b/application/org.openjdk.jmc.ide.jdt/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.jdt</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.ide.launch/pom.xml b/application/org.openjdk.jmc.ide.launch/pom.xml
index f5aa2a45c3..c189e0b4c1 100644
--- a/application/org.openjdk.jmc.ide.launch/pom.xml
+++ b/application/org.openjdk.jmc.ide.launch/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.launch</artifactId>
 	<version>0.0.4-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.ide.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.ide.ui/META-INF/MANIFEST.MF
index 1afe5d413d..1fe6884369 100644
--- a/application/org.openjdk.jmc.ide.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.ide.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: IDE UI Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.ide.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.openjdk.jmc.ui,
  org.eclipse.core.resources,
diff --git a/application/org.openjdk.jmc.ide.ui/pom.xml b/application/org.openjdk.jmc.ide.ui/pom.xml
index 52c39d2a4f..122cc1918f 100644
--- a/application/org.openjdk.jmc.ide.ui/pom.xml
+++ b/application/org.openjdk.jmc.ide.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.joverflow.ui/pom.xml b/application/org.openjdk.jmc.joverflow.ui/pom.xml
index 988b2ac9dc..a766cac645 100644
--- a/application/org.openjdk.jmc.joverflow.ui/pom.xml
+++ b/application/org.openjdk.jmc.joverflow.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.joverflow.ui</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.joverflow/pom.xml b/application/org.openjdk.jmc.joverflow/pom.xml
index c56013a636..93dad7e765 100644
--- a/application/org.openjdk.jmc.joverflow/pom.xml
+++ b/application/org.openjdk.jmc.joverflow/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.joverflow</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.osgi.extension/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.osgi.extension/META-INF/MANIFEST.MF
index 7d2c93b8aa..7064f34ec7 100644
--- a/application/org.openjdk.jmc.osgi.extension/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.osgi.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mission Control External class loader
 Bundle-SymbolicName: org.openjdk.jmc.osgi.extension
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)"
 Automatic-Module-Name: org.openjdk.jmc.ext.hook
diff --git a/application/org.openjdk.jmc.osgi.extension/pom.xml b/application/org.openjdk.jmc.osgi.extension/pom.xml
index 6d66234422..d957381a83 100644
--- a/application/org.openjdk.jmc.osgi.extension/pom.xml
+++ b/application/org.openjdk.jmc.osgi.extension/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.osgi.extension</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.pde/pom.xml b/application/org.openjdk.jmc.pde/pom.xml
index 48c2b1bc1f..3076944dd9 100644
--- a/application/org.openjdk.jmc.pde/pom.xml
+++ b/application/org.openjdk.jmc.pde/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.pde</artifactId>
 	<version>1.0.2-SNAPSHOT</version>
diff --git a/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF
index 188d98b153..7f72d10002 100644
--- a/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rcp.application/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: JDK Mission Control
 Bundle-SymbolicName: org.openjdk.jmc.rcp.application; singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.rcp.application.ApplicationPlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.rcp.application/pom.xml b/application/org.openjdk.jmc.rcp.application/pom.xml
index 54e85bed74..3dc33eb556 100644
--- a/application/org.openjdk.jmc.rcp.application/pom.xml
+++ b/application/org.openjdk.jmc.rcp.application/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.application</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.rcp.intro/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rcp.intro/META-INF/MANIFEST.MF
index a569615f51..df727feac5 100644
--- a/application/org.openjdk.jmc.rcp.intro/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rcp.intro/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Intro Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.rcp.intro;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/application/org.openjdk.jmc.rcp.intro/pom.xml b/application/org.openjdk.jmc.rcp.intro/pom.xml
index 082c15255c..cc9f58ee4a 100644
--- a/application/org.openjdk.jmc.rcp.intro/pom.xml
+++ b/application/org.openjdk.jmc.rcp.intro/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.intro</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.rcp.product.feature/feature.xml b/application/org.openjdk.jmc.rcp.product.feature/feature.xml
index 4b10799880..2d9a9aa768 100644
--- a/application/org.openjdk.jmc.rcp.product.feature/feature.xml
+++ b/application/org.openjdk.jmc.rcp.product.feature/feature.xml
@@ -34,10 +34,10 @@
 <feature
       id="org.openjdk.jmc.rcp.product.feature"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider"
       license-feature="org.openjdk.jmc.feature.license"
-      license-feature-version="8.0.0.qualifier">
+      license-feature-version="8.1.0.qualifier">
 
    <description url="%descriptionUrl">
       %description
diff --git a/application/org.openjdk.jmc.rcp.product.feature/pom.xml b/application/org.openjdk.jmc.rcp.product.feature/pom.xml
index 6e761dae49..c46b87d8e7 100644
--- a/application/org.openjdk.jmc.rcp.product.feature/pom.xml
+++ b/application/org.openjdk.jmc.rcp.product.feature/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.product.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/application/org.openjdk.jmc.rcp.product/feature.xml b/application/org.openjdk.jmc.rcp.product/feature.xml
index 354bd17271..b8507c8519 100644
--- a/application/org.openjdk.jmc.rcp.product/feature.xml
+++ b/application/org.openjdk.jmc.rcp.product/feature.xml
@@ -34,7 +34,7 @@
 <feature
       id="org.openjdk.jmc.rcp.product"
       label="%name"
-      version="8.0.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="%provider">
 
    <description url="%descriptionUrl">
diff --git a/application/org.openjdk.jmc.rcp.product/jmc.product b/application/org.openjdk.jmc.rcp.product/jmc.product
index 54b259033b..49b49ca060 100644
--- a/application/org.openjdk.jmc.rcp.product/jmc.product
+++ b/application/org.openjdk.jmc.rcp.product/jmc.product
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
 <!--   
    Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
    
@@ -31,9 +33,7 @@
    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
    WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<?pde version="3.5"?>
-
-<product name="JDK Mission Control" uid="org.openjdk.jmc" id="org.openjdk.jmc.rcp.application.product" application="org.openjdk.jmc.rcp.application.app" version="8.0.0" useFeatures="true" includeLaunchers="true">
+<product name="JDK Mission Control" uid="org.openjdk.jmc" id="org.openjdk.jmc.rcp.application.product" application="org.openjdk.jmc.rcp.application.app" version="8.1.0" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="../org.openjdk.jmc.rcp.application/icons/mission_control_abt_Oracle.gif"/>
@@ -46,16 +46,10 @@
    </configIni>
 
    <launcherArgs>
-      <!-- Note: if embedding a JDK, remember to override the -vm option on the various platforms to 
-           point to the relative path of your embedded JDK. e.g.
-           <programArgsMac>-ws cocoa -vm ../jdk/Contents/Home/bin/</programArgsMac> -->
       <programArgs>--launcher.appendVmargs
       </programArgs>
-      <programArgsLin></programArgsLin>
       <programArgsMac>-ws cocoa
       </programArgsMac>
-      <programArgsWin>
-      </programArgsWin>
       <vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
       -Dsun.java.command=JMC
       </vmArgs>
@@ -96,25 +90,25 @@
    </features>
 
    <configurations>
-      <plugin id="org.openjdk.jmc.rcp.application" autoStart="false" startLevel="5" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
-      <plugin id="org.openjdk.jmc.osgi.extension" fragment="true" startLevel="4" />
-      <property name="eclipse.application" value="org.openjdk.jmc.rcp.application.app" />
+      <plugin id="org.openjdk.jmc.osgi.extension" autoStart="false" startLevel="4" />
+      <plugin id="org.openjdk.jmc.rcp.application" autoStart="false" startLevel="5" />
+      <property name="osgi.signedcontent.support" value="true" />
       <property name="eclipse.home.location" value="$osgi.install.area$" />
+      <property name="osgi.splashPath" value="platform:/base/plugins/org.openjdk.jmc.rcp.application" />
+      <property name="eclipse.application" value="org.openjdk.jmc.rcp.application.app" />
       <property name="eclipse.p2.profile" value="JMC" />
       <property name="eclipse.p2.unsignedPolicy" value="prompt" />
       <property name="eclipse.product" value="org.openjdk.jmc.rcp.application.product" />
+      <property name="osgi.instance.area.default" value="@user.home/.jmc/8.1.0" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/.jmc/8.0.0" />
-      <property name="osgi.signedcontent.support" value="true" />
-      <property name="osgi.splashPath" value="platform:/base/plugins/org.openjdk.jmc.rcp.application" />
    </configurations>
 
    <preferencesInfo>
diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
index 1a4bc42f0c..2601ef9ac8 100644
--- a/application/org.openjdk.jmc.rcp.product/pom.xml
+++ b/application/org.openjdk.jmc.rcp.product/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.product</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/application/org.openjdk.jmc.rjmx.ext/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx.ext/META-INF/MANIFEST.MF
index 282ac2a6e7..1fe955c84b 100644
--- a/application/org.openjdk.jmc.rjmx.ext/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rjmx.ext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RJMX extensions
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.ext;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.rjmx
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/org.openjdk.jmc.rjmx.ext/pom.xml b/application/org.openjdk.jmc.rjmx.ext/pom.xml
index 928733500d..709bd877f1 100644
--- a/application/org.openjdk.jmc.rjmx.ext/pom.xml
+++ b/application/org.openjdk.jmc.rjmx.ext/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.ext</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.rjmx.services.jfr/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx.services.jfr/META-INF/MANIFEST.MF
index 9888b58860..724af8b37c 100644
--- a/application/org.openjdk.jmc.rjmx.services.jfr/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rjmx.services.jfr/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JFR RJMX Service
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.services.jfr;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.openjdk.jmc.flightrecorder.configuration,
diff --git a/application/org.openjdk.jmc.rjmx.services.jfr/pom.xml b/application/org.openjdk.jmc.rjmx.services.jfr/pom.xml
index 55330d4d48..869ef5cecf 100644
--- a/application/org.openjdk.jmc.rjmx.services.jfr/pom.xml
+++ b/application/org.openjdk.jmc.rjmx.services.jfr/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.services.jfr</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.rjmx.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx.ui/META-INF/MANIFEST.MF
index 0ff59aa3ba..b86cdf76d6 100644
--- a/application/org.openjdk.jmc.rjmx.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rjmx.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: RJMX Services UI Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.eclipse.ui.forms,
  org.openjdk.jmc.ui;visibility:=reexport,
diff --git a/application/org.openjdk.jmc.rjmx.ui/pom.xml b/application/org.openjdk.jmc.rjmx.ui/pom.xml
index f932fdbc42..b33c7926b8 100644
--- a/application/org.openjdk.jmc.rjmx.ui/pom.xml
+++ b/application/org.openjdk.jmc.rjmx.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
index 775f1d8c52..0c4872d0b8 100644
--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: RJMX
 Bundle-SymbolicName: org.openjdk.jmc.rjmx;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.rjmx.RJMXPlugin
 Eclipse-BuddyPolicy: app
 Import-Package: javax.mail,
diff --git a/application/org.openjdk.jmc.rjmx/pom.xml b/application/org.openjdk.jmc.rjmx/pom.xml
index 564ae8c8a3..575920417c 100644
--- a/application/org.openjdk.jmc.rjmx/pom.xml
+++ b/application/org.openjdk.jmc.rjmx/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.ui.common/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.ui.common/META-INF/MANIFEST.MF
index 2e1d815a87..a2f1c5f8c9 100644
--- a/application/org.openjdk.jmc.ui.common/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.ui.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openjdk.jmc.ui.common;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.ui.common.CorePlugin
 Bundle-Vendor: Oracle Corporation
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
diff --git a/application/org.openjdk.jmc.ui.common/pom.xml b/application/org.openjdk.jmc.ui.common/pom.xml
index 75e3fb3208..8775ae057b 100644
--- a/application/org.openjdk.jmc.ui.common/pom.xml
+++ b/application/org.openjdk.jmc.ui.common/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.ui/META-INF/MANIFEST.MF
index 2f1bae91d9..32298d999c 100644
--- a/application/org.openjdk.jmc.ui/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: JDK Mission Control Core
 Bundle-SymbolicName: org.openjdk.jmc.ui;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.openjdk.jmc.ui.UIPlugin
 Bundle-Vendor: Oracle Corporation
 Bundle-Localization: plugin
diff --git a/application/org.openjdk.jmc.ui/pom.xml b/application/org.openjdk.jmc.ui/pom.xml
index 1b808bdf3d..0501f1eeb6 100644
--- a/application/org.openjdk.jmc.ui/pom.xml
+++ b/application/org.openjdk.jmc.ui/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/application/org.openjdk.jmc.updatesite.ide/feature.xml b/application/org.openjdk.jmc.updatesite.ide/feature.xml
index 4c26e972db..564c011290 100644
--- a/application/org.openjdk.jmc.updatesite.ide/feature.xml
+++ b/application/org.openjdk.jmc.updatesite.ide/feature.xml
@@ -34,7 +34,7 @@
 <feature
       id="org.openjdk.jmc.updatesite.ide"
       label="JDK Mission Control Site"
-      version="8.0.0">
+      version="8.1.0">
 
    <description>
       This is a release engineering internal &quot;feature&quot;. It just happen
diff --git a/application/org.openjdk.jmc.updatesite.ide/pom.xml b/application/org.openjdk.jmc.updatesite.ide/pom.xml
index b5c1eb5779..1d8aada4d9 100644
--- a/application/org.openjdk.jmc.updatesite.ide/pom.xml
+++ b/application/org.openjdk.jmc.updatesite.ide/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.updatesite.ide</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/application/org.openjdk.jmc.updatesite.rcp/feature.xml b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
index 182f1f2a3b..5889e578ea 100644
--- a/application/org.openjdk.jmc.updatesite.rcp/feature.xml
+++ b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
@@ -34,7 +34,7 @@
 <feature
       id="org.openjdk.jmc.updatesite.rcp"
       label="JDK Mission Control Supported RCP Site"
-      version="8.0.0.qualifier">
+      version="8.1.0.qualifier">
 
    <description>
       This is a release engineering internal &quot;feature&quot;. It just happen
diff --git a/application/org.openjdk.jmc.updatesite.rcp/pom.xml b/application/org.openjdk.jmc.updatesite.rcp/pom.xml
index 335496e488..069607b494 100644
--- a/application/org.openjdk.jmc.updatesite.rcp/pom.xml
+++ b/application/org.openjdk.jmc.updatesite.rcp/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.updatesite.rcp</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/application/pom.xml b/application/pom.xml
index 9f8783a0fe..bc79d3d08d 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.application</artifactId>
 	<packaging>pom</packaging>
@@ -144,37 +144,37 @@
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common.test</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder.rules</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder.rules.jdk</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>jdp</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder.test</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jacoco</groupId>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/META-INF/MANIFEST.MF
index c8a4c81790..c1fa551c9b 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDK Flight Recorder Configuration Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.configuration.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/pom.xml
index 07ffb7e50c..d1cc619f1e 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.configuration.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.configuration.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/META-INF/MANIFEST.MF
index 00de2b677c..1f821ada1f 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Configuration UI Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/pom.xml
index a36592bccf..abab640544 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/META-INF/MANIFEST.MF
index 12d53a4709..3aa1f39e57 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Control Panel Plug-in Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.controlpanel.ui.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml
index 14403fbf97..d968dd29ed 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.controlpanel.ui.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/META-INF/MANIFEST.MF
index 7cf298fa06..b7c05bf12a 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Name: Java FX for JFR Tests
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ext.jfx.test;singleton:=true
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/pom.xml
index 34312ea924..066771e8e1 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.ext.jfx.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ext.jfx.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/META-INF/MANIFEST.MF
index d2b818285b..8c1ff5d0da 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Name: Flameview Tests
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.flameview.test;singleton:=true
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/pom.xml
index 1c109681ca..d64d286a38 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.flameview.test/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.flameview.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.ui.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.flightrecorder.ui.test/META-INF/MANIFEST.MF
index 37a89adc5a..a2d6034fb7 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.ui.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.flightrecorder.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flightrecorder Plug-in Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.ui.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.ui.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.ui.test/pom.xml
index c6004d12bd..34abf16228 100644
--- a/application/tests/org.openjdk.jmc.flightrecorder.ui.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.flightrecorder.ui.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.ui.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.greychart.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.greychart.test/META-INF/MANIFEST.MF
index 3903cb0d50..5c3d6636e6 100644
--- a/application/tests/org.openjdk.jmc.greychart.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.greychart.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GreyChart Plug-in Test
 Bundle-SymbolicName: org.openjdk.jmc.greychart.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.greychart
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/tests/org.openjdk.jmc.greychart.test/pom.xml b/application/tests/org.openjdk.jmc.greychart.test/pom.xml
index 049aeba21e..ec25c0e382 100644
--- a/application/tests/org.openjdk.jmc.greychart.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.greychart.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.greychart.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.ide.launch.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.ide.launch.test/META-INF/MANIFEST.MF
index 67c00f974e..426dd480d5 100644
--- a/application/tests/org.openjdk.jmc.ide.launch.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.ide.launch.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE Launch Test
 Bundle-SymbolicName: org.openjdk.jmc.ide.launch.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.ide.launch
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/tests/org.openjdk.jmc.ide.launch.test/pom.xml b/application/tests/org.openjdk.jmc.ide.launch.test/pom.xml
index 2a1b7544ae..bb8bb9a53c 100644
--- a/application/tests/org.openjdk.jmc.ide.launch.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.ide.launch.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ide.launch.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF
index 6fdf349cd3..ae7c15bb06 100644
--- a/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Joverflow Test
 Bundle-SymbolicName: org.openjdk.jmc.joverflow.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.joverflow
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/pom.xml b/application/tests/org.openjdk.jmc.joverflow.test/pom.xml
index b96b5ba02e..73902a2872 100644
--- a/application/tests/org.openjdk.jmc.joverflow.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.joverflow.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.joverflow.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
index f47d19e997..c0c5b10026 100644
--- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JFR RJMX Service Test
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.services.jfr.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml
index a0f97605f6..51936a16fa 100644
--- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.services.jfr.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.rjmx.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.test/META-INF/MANIFEST.MF
index d5d0cae880..c0a21f4b57 100644
--- a/application/tests/org.openjdk.jmc.rjmx.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.rjmx.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RJMX Test
 Bundle-SymbolicName: org.openjdk.jmc.rjmx.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.rjmx.test/pom.xml b/application/tests/org.openjdk.jmc.rjmx.test/pom.xml
index f37e3fbeb1..26ac565595 100644
--- a/application/tests/org.openjdk.jmc.rjmx.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.rjmx.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rjmx.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.ui.common.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.ui.common.test/META-INF/MANIFEST.MF
index d224e3030e..771fd1088e 100644
--- a/application/tests/org.openjdk.jmc.ui.common.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.ui.common.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in Test
 Bundle-SymbolicName: org.openjdk.jmc.ui.common.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.ui.common.test/pom.xml b/application/tests/org.openjdk.jmc.ui.common.test/pom.xml
index fc69ec9475..5c1b92b40a 100644
--- a/application/tests/org.openjdk.jmc.ui.common.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.ui.common.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.common.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/org.openjdk.jmc.ui.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.ui.test/META-INF/MANIFEST.MF
index c81a25c431..5be7971471 100644
--- a/application/tests/org.openjdk.jmc.ui.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDK Mission Control Core Test
 Bundle-SymbolicName: org.openjdk.jmc.ui.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/application/tests/org.openjdk.jmc.ui.test/pom.xml b/application/tests/org.openjdk.jmc.ui.test/pom.xml
index bb91e9c505..a4826462b5 100644
--- a/application/tests/org.openjdk.jmc.ui.test/pom.xml
+++ b/application/tests/org.openjdk.jmc.ui.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.ui.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/application/tests/pom.xml b/application/tests/pom.xml
index c957d24590..99226d405d 100644
--- a/application/tests/pom.xml
+++ b/application/tests/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.application.tests</artifactId>
 	<packaging>pom</packaging>
diff --git a/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml b/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml
index 163f2cfd1d..c1ad8239d7 100644
--- a/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.browser.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.browser.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml b/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml
index 7323f392d5..0a500731c0 100644
--- a/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.console.jconsole.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.jconsole.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml b/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml
index deae18fb4f..2b3a78802b 100644
--- a/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.console.persistence.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.persistence.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.console.uitest/pom.xml b/application/uitests/org.openjdk.jmc.console.uitest/pom.xml
index 621df3f6bf..4f5ae64ce9 100644
--- a/application/uitests/org.openjdk.jmc.console.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.console.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.console.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml b/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml
index ae1c13d893..77d66632b2 100644
--- a/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.flightrecorder.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.flightrecorder.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml b/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml
index 6533fd421e..963cfc41e4 100644
--- a/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml
+++ b/application/uitests/org.openjdk.jmc.rcp.application.uitest/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.rcp.application.uitest</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
diff --git a/application/uitests/org.openjdk.jmc.rcp.application.uitest/src/test/java/org/openjdk/jmc/rcp/application/uitest/UpdateSiteTest.java b/application/uitests/org.openjdk.jmc.rcp.application.uitest/src/test/java/org/openjdk/jmc/rcp/application/uitest/UpdateSiteTest.java
index 9b6dad7df9..4a483085b4 100644
--- a/application/uitests/org.openjdk.jmc.rcp.application.uitest/src/test/java/org/openjdk/jmc/rcp/application/uitest/UpdateSiteTest.java
+++ b/application/uitests/org.openjdk.jmc.rcp.application.uitest/src/test/java/org/openjdk/jmc/rcp/application/uitest/UpdateSiteTest.java
@@ -56,7 +56,7 @@
  */
 public class UpdateSiteTest extends MCJemmyTestBase {
 	private static final String UPDATESITE_PROP_PREFIX = "updatesite.";
-	private static final String JMC_VERSION = System.getProperty("jmc.test.jmc.version", "8.0.0");
+	private static final String JMC_VERSION = System.getProperty("jmc.test.jmc.version", "8.1.0");
 	private static final String KEY_UPDATE_PROPERTIES_PATH = "org.openjdk.jmc.updatesites.properties";
 
 	/**
diff --git a/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF b/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF
index 6e609a31b2..c9a20169de 100644
--- a/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF
+++ b/application/uitests/org.openjdk.jmc.test.jemmy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JMC Jemmy Test Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.test.jemmy; singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml b/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml
index 9f51e2735c..1ce9a7aaae 100644
--- a/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml
+++ b/application/uitests/org.openjdk.jmc.test.jemmy/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application.uitests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>org.openjdk.jmc.test.jemmy</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -49,29 +49,29 @@
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>common.test</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder.rules</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmc</groupId>
 			<artifactId>flightrecorder.rules.jdk</artifactId>
-			<version>8.0.0-SNAPSHOT</version>
+			<version>${revision}${changelist}</version>
 		</dependency>
 	</dependencies>
 
diff --git a/application/uitests/pom.xml b/application/uitests/pom.xml
index 915f3a1538..ee07592e09 100644
--- a/application/uitests/pom.xml
+++ b/application/uitests/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.application</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.application.uitests</artifactId>
 	<packaging>pom</packaging>
@@ -51,7 +51,7 @@
 		<ui.test.excludes>**/uitest/**,${test.excludes.default}</ui.test.excludes>
 		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
 		<jacoco.plugin.version>0.8.3</jacoco.plugin.version>
-		<jmc.version>8.0.0-SNAPSHOT</jmc.version>
+		<jmc.version>${revision}${changelist}</jmc.version>
 	</properties>
 	
 	<modules>
diff --git a/core/coverage/pom.xml b/core/coverage/pom.xml
index d1e98f5af2..4c71a1adec 100644
--- a/core/coverage/pom.xml
+++ b/core/coverage/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>coverage</artifactId>
 	<name>Code coverage report jmc/core</name>
diff --git a/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF
index af4ea12110..4eaccbf7e9 100644
--- a/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Common Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.common;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Export-Package: org.openjdk.jmc.common,
  org.openjdk.jmc.common.collection,
diff --git a/core/org.openjdk.jmc.common/pom.xml b/core/org.openjdk.jmc.common/pom.xml
index a0b07cb3cc..eeb708ba44 100644
--- a/core/org.openjdk.jmc.common/pom.xml
+++ b/core/org.openjdk.jmc.common/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>common</artifactId>
 	<dependencies>
diff --git a/core/org.openjdk.jmc.flightrecorder.rules.jdk/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.flightrecorder.rules.jdk/META-INF/MANIFEST.MF
index 51f60e0b69..46388bca9b 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules.jdk/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.flightrecorder.rules.jdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mission Control Flight Recorder Rules
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.rules.jdk;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.openjdk.jmc.flightrecorder.rules.jdk.cpu;x-friends:="org.openjdk.jmc.flightrecorder.ui",
diff --git a/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml b/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml
index 9fe419f1a6..92639a0835 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml
+++ b/core/org.openjdk.jmc.flightrecorder.rules.jdk/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder.rules.jdk</artifactId>
 	<properties>
diff --git a/core/org.openjdk.jmc.flightrecorder.rules/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.flightrecorder.rules/META-INF/MANIFEST.MF
index 17d7ad8087..cd0c4ffa08 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.flightrecorder.rules/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mission Control Flight Recorder Rules
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.rules;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.openjdk.jmc.flightrecorder.rules,
diff --git a/core/org.openjdk.jmc.flightrecorder.rules/pom.xml b/core/org.openjdk.jmc.flightrecorder.rules/pom.xml
index 9afd4aa27a..28467770bc 100644
--- a/core/org.openjdk.jmc.flightrecorder.rules/pom.xml
+++ b/core/org.openjdk.jmc.flightrecorder.rules/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder.rules</artifactId>
 	<properties>
diff --git a/core/org.openjdk.jmc.flightrecorder.writer/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.flightrecorder.writer/META-INF/MANIFEST.MF
index c024d84be8..7e93e60758 100644
--- a/core/org.openjdk.jmc.flightrecorder.writer/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.flightrecorder.writer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mission Control Flight Recorder Writer
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.writer;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.openjdk.jmc.flightrecorder.writer.api
diff --git a/core/org.openjdk.jmc.flightrecorder.writer/pom.xml b/core/org.openjdk.jmc.flightrecorder.writer/pom.xml
index afd52f8375..b299c737ed 100644
--- a/core/org.openjdk.jmc.flightrecorder.writer/pom.xml
+++ b/core/org.openjdk.jmc.flightrecorder.writer/pom.xml
@@ -37,7 +37,7 @@
     <parent>
         <groupId>org.openjdk.jmc</groupId>
         <artifactId>missioncontrol.core</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>${revision}${changelist}</version>
     </parent>
     <artifactId>flightrecorder.writer</artifactId>
     <properties>
diff --git a/core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF
index b7d4c5eeac..edb98c53db 100644
--- a/core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: Flight Recorder Model Plug-in
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Export-Package: org.openjdk.jmc.flightrecorder,
  org.openjdk.jmc.flightrecorder.internal;x-friends:="org.openjdk.jmc.flightrecorder.ui,org.openjdk.jmc.flightrecorder.configuration",
diff --git a/core/org.openjdk.jmc.flightrecorder/pom.xml b/core/org.openjdk.jmc.flightrecorder/pom.xml
index dab974b5f2..63e6aa8643 100644
--- a/core/org.openjdk.jmc.flightrecorder/pom.xml
+++ b/core/org.openjdk.jmc.flightrecorder/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder</artifactId>
 	<properties>
diff --git a/core/org.openjdk.jmc.jdp/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.jdp/META-INF/MANIFEST.MF
index c76063271b..5f089dbc1a 100644
--- a/core/org.openjdk.jmc.jdp/META-INF/MANIFEST.MF
+++ b/core/org.openjdk.jmc.jdp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDP Client
 Bundle-SymbolicName: org.openjdk.jmc.jdp;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.openjdk.jmc.jdp.client,
diff --git a/core/org.openjdk.jmc.jdp/pom.xml b/core/org.openjdk.jmc.jdp/pom.xml
index 759c108b03..6e20dfc67c 100644
--- a/core/org.openjdk.jmc.jdp/pom.xml
+++ b/core/org.openjdk.jmc.jdp/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>jdp</artifactId>
 
diff --git a/core/pom.xml b/core/pom.xml
index d2db2001cf..b920bac98f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,11 +31,12 @@
    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
    WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openjdk.jmc</groupId>
 	<artifactId>missioncontrol.core</artifactId>
-	<version>8.0.0-SNAPSHOT</version>
+	<version>${revision}${changelist}</version>
 	<packaging>pom</packaging>
 	<description>JDK Mission Control is an advanced set of tools that enables
 		efficient and detailed analysis of the extensive of data collected by
@@ -43,6 +44,26 @@
 		administrators to collect and analyze data from Java applications
 		running locally or deployed in production environments.
 	</description>
+	<properties>
+		<revision>8.1.0</revision>
+		<changelist>-SNAPSHOT</changelist>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<manifest-location>META-INF</manifest-location>
+		<maven.jar.version>3.2.0</maven.jar.version>
+		<maven.bundle.version>5.1.1</maven.bundle.version>
+		<spotless.version>2.5.0</spotless.version>
+		<maven.directory.version>0.3.1</maven.directory.version>
+		<maven.resources.version>3.2.0</maven.resources.version>
+		<maven.source.version>3.2.1</maven.source.version>
+		<maven.javadoc.version>3.2.0</maven.javadoc.version>
+		<nexus.staging.version>1.6.8</nexus.staging.version>
+		<maven.gpg.version>1.6</maven.gpg.version>
+		<build.helper.maven.version>3.2.0</build.helper.maven.version>
+		<spotless.config.path>${basedir}/../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+	</properties>
 	<url>http://jdk.java.net/jmc</url>
 	<licenses>
 		<license>
@@ -68,24 +89,6 @@
 			<archive>http://mail.openjdk.java.net/pipermail/jmc-dev/</archive>
 		</mailingList>
 	</mailingLists>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<manifest-location>META-INF</manifest-location>
-		<maven.jar.version>3.2.0</maven.jar.version>
-		<maven.bundle.version>5.1.1</maven.bundle.version>
-		<spotless.version>2.5.0</spotless.version>
-		<maven.directory.version>0.3.1</maven.directory.version>
-		<maven.resources.version>3.2.0</maven.resources.version>
-		<maven.source.version>3.2.1</maven.source.version>
-		<maven.javadoc.version>3.2.0</maven.javadoc.version>
-		<nexus.staging.version>1.6.8</nexus.staging.version>
-		<maven.gpg.version>1.6</maven.gpg.version>
-		<build.helper.maven.version>3.2.0</build.helper.maven.version>
-		<spotless.config.path>${basedir}/../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
-	</properties>
 
 	<modules>
 		<module>org.openjdk.jmc.common</module>
@@ -126,45 +129,45 @@
 					</configuration>
 				</plugin>
 				<plugin>
-  					<groupId>com.diffplug.spotless</groupId>
-  					<artifactId>spotless-maven-plugin</artifactId>
-  					<version>${spotless.version}</version>
-  					<configuration>
-    					<java>
-      						<eclipse>
-        							<file>${spotless.config.path}</file>
-        							<version>4.8.0</version>
-      						</eclipse>
-    					</java>
-  					</configuration>
+					<groupId>com.diffplug.spotless</groupId>
+					<artifactId>spotless-maven-plugin</artifactId>
+					<version>${spotless.version}</version>
+					<configuration>
+						<java>
+							<eclipse>
+								<file>${spotless.config.path}</file>
+								<version>4.8.0</version>
+							</eclipse>
+						</java>
+					</configuration>
 				</plugin>
 				<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<resources>
-								<resource>
-									<targetPath>${basedir}/target/classes</targetPath>
-									<directory>${rootDir}/license</directory>
-								</resource>
-								<resource>
-									<targetPath>${basedir}/target/apidocs</targetPath>
-									<directory>${rootDir}/license</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>${maven.resources.version}</version>
+					<executions>
+						<execution>
+							<id>copy-resources</id>
+							<phase>process-resources</phase>
+							<goals>
+								<goal>copy-resources</goal>
+							</goals>
+							<configuration>
+								<outputDirectory>${project.build.directory}</outputDirectory>
+								<resources>
+									<resource>
+										<targetPath>${basedir}/target/classes</targetPath>
+										<directory>${rootDir}/license</directory>
+									</resource>
+									<resource>
+										<targetPath>${basedir}/target/apidocs</targetPath>
+										<directory>${rootDir}/license</directory>
+									</resource>
+								</resources>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -266,6 +269,31 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>resolveCiFriendliesOnly</flattenMode>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/core/tests/org.openjdk.jmc.common.test/META-INF/MANIFEST.MF b/core/tests/org.openjdk.jmc.common.test/META-INF/MANIFEST.MF
index 38b1d72bef..294bf5beac 100644
--- a/core/tests/org.openjdk.jmc.common.test/META-INF/MANIFEST.MF
+++ b/core/tests/org.openjdk.jmc.common.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test
 Bundle-SymbolicName: org.openjdk.jmc.common.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/core/tests/org.openjdk.jmc.common.test/pom.xml b/core/tests/org.openjdk.jmc.common.test/pom.xml
index 49b821462e..75065d4ba7 100644
--- a/core/tests/org.openjdk.jmc.common.test/pom.xml
+++ b/core/tests/org.openjdk.jmc.common.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>common.test</artifactId>
 	<properties>
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/META-INF/MANIFEST.MF b/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/META-INF/MANIFEST.MF
index e7b4d1b758..48ab21284a 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/META-INF/MANIFEST.MF
+++ b/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.rules.jdk.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/pom.xml b/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/pom.xml
index d3277b04a3..b0adf5336d 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/pom.xml
+++ b/core/tests/org.openjdk.jmc.flightrecorder.rules.jdk.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder.rules.jdk.test</artifactId>
 	<properties>
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.rules.test/META-INF/MANIFEST.MF b/core/tests/org.openjdk.jmc.flightrecorder.rules.test/META-INF/MANIFEST.MF
index 9d767ba7e2..506e028c15 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.rules.test/META-INF/MANIFEST.MF
+++ b/core/tests/org.openjdk.jmc.flightrecorder.rules.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.rules.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.rules.test/pom.xml b/core/tests/org.openjdk.jmc.flightrecorder.rules.test/pom.xml
index 71d9160250..5c6c9c062d 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.rules.test/pom.xml
+++ b/core/tests/org.openjdk.jmc.flightrecorder.rules.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder.rules.test</artifactId>
 	<properties>
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.test/META-INF/MANIFEST.MF b/core/tests/org.openjdk.jmc.flightrecorder.test/META-INF/MANIFEST.MF
index 0d66df629e..7bee692f82 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.test/META-INF/MANIFEST.MF
+++ b/core/tests/org.openjdk.jmc.flightrecorder.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Flight Recorder Test
 Bundle-SymbolicName: org.openjdk.jmc.flightrecorder.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/core/tests/org.openjdk.jmc.flightrecorder.test/pom.xml b/core/tests/org.openjdk.jmc.flightrecorder.test/pom.xml
index 3f128f0250..8902732039 100644
--- a/core/tests/org.openjdk.jmc.flightrecorder.test/pom.xml
+++ b/core/tests/org.openjdk.jmc.flightrecorder.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>flightrecorder.test</artifactId>
 	<properties>
diff --git a/core/tests/org.openjdk.jmc.jdp.test/META-INF/MANIFEST.MF b/core/tests/org.openjdk.jmc.jdp.test/META-INF/MANIFEST.MF
index 7b0865b7d4..3fe5a7e617 100644
--- a/core/tests/org.openjdk.jmc.jdp.test/META-INF/MANIFEST.MF
+++ b/core/tests/org.openjdk.jmc.jdp.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDP Client Test
 Bundle-SymbolicName: org.openjdk.jmc.jdp.test;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: Oracle Corporation
 Fragment-Host: org.openjdk.jmc.jdp
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.openjdk.jmc.jdp.test/pom.xml b/core/tests/org.openjdk.jmc.jdp.test/pom.xml
index 6c85a854fc..0a143596e0 100644
--- a/core/tests/org.openjdk.jmc.jdp.test/pom.xml
+++ b/core/tests/org.openjdk.jmc.jdp.test/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core.tests</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>jdp.test</artifactId>
 
diff --git a/core/tests/pom.xml b/core/tests/pom.xml
index 7cf7d801ec..2218a32b4b 100644
--- a/core/tests/pom.xml
+++ b/core/tests/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.core</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.core.tests</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 587d175579..8b234e4713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openjdk.jmc</groupId>
 	<artifactId>missioncontrol</artifactId>
-	<version>8.0.0-SNAPSHOT</version>
+	<version>${revision}${changelist}</version>
 	<packaging>pom</packaging>
 	<name>JDK Mission Control</name>
 	<description>JDK Mission Control is an advanced set of tools that enables 
@@ -75,6 +75,8 @@
 		<module>releng</module>
 	</modules>
 	<properties>
+		<revision>8.1.0</revision>
+		<changelist>-SNAPSHOT</changelist>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<tycho.version>2.0.0</tycho.version>
@@ -123,7 +125,7 @@
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
 									<artifactId>platform-definition-2020-12</artifactId>
-									<version>8.0.0-SNAPSHOT</version>
+									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
 						</configuration>
@@ -147,7 +149,7 @@
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
 									<artifactId>platform-definition-2020-09</artifactId>
-									<version>8.0.0-SNAPSHOT</version>
+									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
 						</configuration>
@@ -168,7 +170,7 @@
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
 									<artifactId>platform-definition-2020-06</artifactId>
-									<version>8.0.0-SNAPSHOT</version>
+									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
 						</configuration>
@@ -189,7 +191,7 @@
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
 									<artifactId>platform-definition-2020-03</artifactId>
-									<version>8.0.0-SNAPSHOT</version>
+									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
 						</configuration>
@@ -367,8 +369,8 @@
 						<configuration>
 							<rules>
 								<requireMavenVersion>
-									<version>3.3.1</version>
-									<message>Building JMC requires at least Maven 3.3.1</message>
+									<version>3.5.0</version>
+									<message>Building JMC requires at least Maven 3.5.0</message>
 								</requireMavenVersion>
 							</rules>
 						</configuration>
@@ -388,6 +390,31 @@
 					</java>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>resolveCiFriendliesOnly</flattenMode>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/releng/platform-definitions/platform-definition-2019-12/pom.xml b/releng/platform-definitions/platform-definition-2019-12/pom.xml
index 58e3ef418e..a95f4d9ef6 100644
--- a/releng/platform-definitions/platform-definition-2019-12/pom.xml
+++ b/releng/platform-definitions/platform-definition-2019-12/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>platform-definitions</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definition-2019-12</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/releng/platform-definitions/platform-definition-2020-03/pom.xml b/releng/platform-definitions/platform-definition-2020-03/pom.xml
index 169ed804be..322b824794 100644
--- a/releng/platform-definitions/platform-definition-2020-03/pom.xml
+++ b/releng/platform-definitions/platform-definition-2020-03/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>platform-definitions</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definition-2020-03</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/releng/platform-definitions/platform-definition-2020-06/pom.xml b/releng/platform-definitions/platform-definition-2020-06/pom.xml
index 64cf491d24..d72cf568be 100644
--- a/releng/platform-definitions/platform-definition-2020-06/pom.xml
+++ b/releng/platform-definitions/platform-definition-2020-06/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>platform-definitions</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definition-2020-06</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/releng/platform-definitions/platform-definition-2020-09/pom.xml b/releng/platform-definitions/platform-definition-2020-09/pom.xml
index 254a5fb81e..b849e840de 100644
--- a/releng/platform-definitions/platform-definition-2020-09/pom.xml
+++ b/releng/platform-definitions/platform-definition-2020-09/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>platform-definitions</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definition-2020-09</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/releng/platform-definitions/platform-definition-2020-12/pom.xml b/releng/platform-definitions/platform-definition-2020-12/pom.xml
index ab394c750d..267fcdfb1b 100644
--- a/releng/platform-definitions/platform-definition-2020-12/pom.xml
+++ b/releng/platform-definitions/platform-definition-2020-12/pom.xml
@@ -37,7 +37,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>platform-definitions</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definition-2020-12</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/releng/platform-definitions/pom.xml b/releng/platform-definitions/pom.xml
index 2e2363ad0c..b4d4bd8eab 100644
--- a/releng/platform-definitions/pom.xml
+++ b/releng/platform-definitions/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol.releng</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>platform-definitions</artifactId>
 	<packaging>pom</packaging>
diff --git a/releng/pom.xml b/releng/pom.xml
index 476e5807cf..88989fd86b 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -36,7 +36,7 @@
 	<parent>
 		<groupId>org.openjdk.jmc</groupId>
 		<artifactId>missioncontrol</artifactId>
-		<version>8.0.0-SNAPSHOT</version>
+		<version>${revision}${changelist}</version>
 	</parent>
 	<artifactId>missioncontrol.releng</artifactId>
 	<packaging>pom</packaging>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index 8e0dd869d6..e2d094ba9e 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -36,7 +36,7 @@
 	<groupId>org.openjdk.jmc</groupId>
 	<artifactId>external-dependencies</artifactId>
 	<packaging>war</packaging>
-	<version>8.0.0-SNAPSHOT</version>
+	<version>${revision}${changelist}</version>
 
 	<properties>
 		<!-- Config -->