From b18727b3030dbd262d04ad32430acb25920b6e1b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 25 2021 00:16:19 +0000
Subject: import jmc-8.0.1-2.module+el8.5.0+12270+8ceab496


---

diff --git a/.gitignore b/.gitignore
index 5d1009f..e569d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz
+SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
diff --git a/.jmc.metadata b/.jmc.metadata
index 6f8a31c..caf14a2 100644
--- a/.jmc.metadata
+++ b/.jmc.metadata
@@ -1 +1 @@
-84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz
+d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
diff --git a/SOURCES/1-remove-profiles.patch b/SOURCES/1-remove-profiles.patch
index 6e51aef..1ac59c6 100644
--- a/SOURCES/1-remove-profiles.patch
+++ b/SOURCES/1-remove-profiles.patch
@@ -1,5 +1,5 @@
 diff --git a/pom.xml b/pom.xml
-index 587d175..1c7c1f1 100644
+index 3c27d3b..22ce8b7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -109,95 +109,6 @@
@@ -20,7 +20,7 @@ index 587d175..1c7c1f1 100644
 -								<artifact>
 -									<groupId>org.openjdk.jmc</groupId>
 -									<artifactId>platform-definition-2020-12</artifactId>
--									<version>8.0.0-SNAPSHOT</version>
+-									<version>8.0.1-SNAPSHOT</version>
 -								</artifact>
 -							</target>
 -						</configuration>
@@ -44,7 +44,7 @@ index 587d175..1c7c1f1 100644
 -								<artifact>
 -									<groupId>org.openjdk.jmc</groupId>
 -									<artifactId>platform-definition-2020-09</artifactId>
--									<version>8.0.0-SNAPSHOT</version>
+-									<version>8.0.1-SNAPSHOT</version>
 -								</artifact>
 -							</target>
 -						</configuration>
@@ -65,7 +65,7 @@ index 587d175..1c7c1f1 100644
 -								<artifact>
 -									<groupId>org.openjdk.jmc</groupId>
 -									<artifactId>platform-definition-2020-06</artifactId>
--									<version>8.0.0-SNAPSHOT</version>
+-									<version>8.0.1-SNAPSHOT</version>
 -								</artifact>
 -							</target>
 -						</configuration>
@@ -86,7 +86,7 @@ index 587d175..1c7c1f1 100644
 -								<artifact>
 -									<groupId>org.openjdk.jmc</groupId>
 -									<artifactId>platform-definition-2020-03</artifactId>
--									<version>8.0.0-SNAPSHOT</version>
+-									<version>8.0.1-SNAPSHOT</version>
 -								</artifact>
 -							</target>
 -						</configuration>
diff --git a/SOURCES/12-remove-chromium.patch b/SOURCES/12-remove-chromium.patch
deleted file mode 100644
index ac30732..0000000
--- a/SOURCES/12-remove-chromium.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
-index b53c5e5..1eb682d 100644
---- a/application/org.openjdk.jmc.feature.core/feature.xml
-+++ b/application/org.openjdk.jmc.feature.core/feature.xml
-@@ -62,17 +62,6 @@
-       <import plugin="org.eclipse.e4.core.contexts"/>
-    </requires>
- 
--   <plugin
--         id="com.make.chromium.cef.win32.win32.x86_64"
--         os="win32"
--         ws="win32"
--         arch="x86_64"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
-    <plugin
-          id="org.openjdk.jmc.attach"
-          download-size="0"
diff --git a/SOURCES/12-revert-graphview.patch b/SOURCES/12-revert-graphview.patch
new file mode 100644
index 0000000..9b7239b
--- /dev/null
+++ b/SOURCES/12-revert-graphview.patch
@@ -0,0 +1,130 @@
+diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
+index 9e05408..733fcd4 100644
+--- a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
++++ b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
+@@ -42,80 +42,4 @@
+ 	</parent>
+ 	<artifactId>org.openjdk.jmc.flightrecorder.graphview</artifactId>
+ 	<packaging>eclipse-plugin</packaging>
+-
+-	<properties>
+-		<download.maven.plugin.version>1.4.2</download.maven.plugin.version>
+-		<download-maven-plugin.phase>process-resources</download-maven-plugin.phase>
+-		<download-maven-plugin.output>${project.basedir}/src/main/resources/jslibs</download-maven-plugin.output>
+-		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+-		<spotless.config.path.js>${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml</spotless.config.path.js>
+-	</properties>
+-
+-	<build>
+-		<plugins>
+-			<plugin>
+-				<groupId>com.googlecode.maven-download-plugin</groupId>
+-				<artifactId>download-maven-plugin</artifactId>
+-				<version>${download.maven.plugin.version}</version>
+-				<executions>
+-					<execution>
+-						<id>d3-v5-js</id>
+-						<phase>${download-maven-plugin.phase}</phase>
+-						<goals>
+-							<goal>wget</goal>
+-						</goals>
+-						<configuration>
+-							<url>https://d3js.org/d3.v5.min.js</url>
+-							<unpack>false</unpack>
+-							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
+-							<skipCache>true</skipCache>
+-							<overwrite>true</overwrite>
+-						</configuration>
+-					</execution>
+-					<execution>
+-						<id>wasm</id>
+-						<phase>${download-maven-plugin.phase}</phase>
+-						<goals>
+-							<goal>wget</goal>
+-						</goals>
+-						<configuration>
+-							<url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js</url>
+-							<unpack>false</unpack>
+-							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
+-							<skipCache>true</skipCache>
+-							<overwrite>true</overwrite>
+-						</configuration>
+-					</execution>
+-					<execution>
+-						<id>d3-graphviz-js</id>
+-						<phase>${download-maven-plugin.phase}</phase>
+-						<goals>
+-							<goal>wget</goal>
+-						</goals>
+-						<configuration>
+-							<url>https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js</url>
+-							<unpack>false</unpack>
+-							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
+-							<skipCache>true</skipCache>
+-							<overwrite>true</overwrite>
+-						</configuration>
+-					</execution>
+-					<execution>
+-						<id>graphvizlib-wasm</id>
+-						<phase>${download-maven-plugin.phase}</phase>
+-						<goals>
+-							<goal>wget</goal>
+-						</goals>
+-						<configuration>
+-							<url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm</url>
+-							<unpack>false</unpack>
+-							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
+-							<skipCache>true</skipCache>
+-							<overwrite>true</overwrite>
+-						</configuration>
+-					</execution>
+-				</executions>
+-			</plugin>
+-		</plugins>
+-	</build>
+ </project>
+diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
+index 1389545..d356c2e 100644
+--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
++++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
+@@ -85,18 +85,7 @@ import org.openjdk.jmc.ui.misc.DisplayToolkit;
+ public class GraphView extends ViewPart implements ISelectionListener {
+ 	private static final String HTML_PAGE;
+ 	static {
+-		String jsD3V5 = "jslibs/d3.v5.min.js";
+-		String jsGraphviz = "jslibs/index.js";
+-		String wasmGraphviz = "jslibs/graphvizlib.wasm";
+-		String jsGraphizD3 = "jslibs/d3-graphviz.js";
+-
+-		String wasmBase64 = loadBase64FromFile(wasmGraphviz);
+-
+-		HTML_PAGE = String.format(loadStringFromFile("page.template"), loadLibraries(jsD3V5),
+-				// we inline base64 wasm in the library code to avoid fetching it at runtime
+-				loadStringFromFile(jsGraphviz, "wasmBinaryFile=\"graphvizlib.wasm\";",
+-						"wasmBinaryFile=dataURIPrefix + '" + wasmBase64 + "';"),
+-				loadLibraries(jsGraphizD3));
++        HTML_PAGE = String.format(loadStringFromFile("page.template"));
+ 	}
+ 
+ 	private enum ModelState {
+diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
+index eb7423a..e424576 100644
+--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
++++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
+@@ -3,12 +3,13 @@
+ 
+ <head>
+ 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+-	<script>%1$s</script>
+-	<script>%2$s</script>
+-	<script>%3$s</script>
+ </head>
+ 
+ <body>
++    <script type="text/javascript" src="https://d3js.org/d3.v5.min.js"></script>
++    <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js"></script>
++    <script type="text/javascript" src="https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js"></script>
++    <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm"></script>
+ 	<div id="graph" style="text-align: center;"></div>
+ 	<script type="text/javascript">
+ 		
diff --git a/SOURCES/13-revert-6852.patch b/SOURCES/13-revert-6852.patch
new file mode 100644
index 0000000..7624bea
--- /dev/null
+++ b/SOURCES/13-revert-6852.patch
@@ -0,0 +1,12 @@
+diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
+index 2ebccfb..1cc8aca 100644
+--- a/application/org.openjdk.jmc.rcp.product/pom.xml
++++ b/application/org.openjdk.jmc.rcp.product/pom.xml
+@@ -74,7 +74,6 @@
+ 							<rootFolders>
+ 								<win32>${productName}</win32>
+ 								<macosx>${productName}.app</macosx>
+-								<linux>${productName}</linux>
+ 							</rootFolders>
+ 						</product>
+ 					</products>
diff --git a/SOURCES/13-revert-graphview.patch b/SOURCES/13-revert-graphview.patch
deleted file mode 100644
index 9b7239b..0000000
--- a/SOURCES/13-revert-graphview.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
-index 9e05408..733fcd4 100644
---- a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
-+++ b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml
-@@ -42,80 +42,4 @@
- 	</parent>
- 	<artifactId>org.openjdk.jmc.flightrecorder.graphview</artifactId>
- 	<packaging>eclipse-plugin</packaging>
--
--	<properties>
--		<download.maven.plugin.version>1.4.2</download.maven.plugin.version>
--		<download-maven-plugin.phase>process-resources</download-maven-plugin.phase>
--		<download-maven-plugin.output>${project.basedir}/src/main/resources/jslibs</download-maven-plugin.output>
--		<spotless.config.path>${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
--		<spotless.config.path.js>${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml</spotless.config.path.js>
--	</properties>
--
--	<build>
--		<plugins>
--			<plugin>
--				<groupId>com.googlecode.maven-download-plugin</groupId>
--				<artifactId>download-maven-plugin</artifactId>
--				<version>${download.maven.plugin.version}</version>
--				<executions>
--					<execution>
--						<id>d3-v5-js</id>
--						<phase>${download-maven-plugin.phase}</phase>
--						<goals>
--							<goal>wget</goal>
--						</goals>
--						<configuration>
--							<url>https://d3js.org/d3.v5.min.js</url>
--							<unpack>false</unpack>
--							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
--							<skipCache>true</skipCache>
--							<overwrite>true</overwrite>
--						</configuration>
--					</execution>
--					<execution>
--						<id>wasm</id>
--						<phase>${download-maven-plugin.phase}</phase>
--						<goals>
--							<goal>wget</goal>
--						</goals>
--						<configuration>
--							<url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js</url>
--							<unpack>false</unpack>
--							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
--							<skipCache>true</skipCache>
--							<overwrite>true</overwrite>
--						</configuration>
--					</execution>
--					<execution>
--						<id>d3-graphviz-js</id>
--						<phase>${download-maven-plugin.phase}</phase>
--						<goals>
--							<goal>wget</goal>
--						</goals>
--						<configuration>
--							<url>https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js</url>
--							<unpack>false</unpack>
--							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
--							<skipCache>true</skipCache>
--							<overwrite>true</overwrite>
--						</configuration>
--					</execution>
--					<execution>
--						<id>graphvizlib-wasm</id>
--						<phase>${download-maven-plugin.phase}</phase>
--						<goals>
--							<goal>wget</goal>
--						</goals>
--						<configuration>
--							<url>https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm</url>
--							<unpack>false</unpack>
--							<outputDirectory>${download-maven-plugin.output}</outputDirectory>
--							<skipCache>true</skipCache>
--							<overwrite>true</overwrite>
--						</configuration>
--					</execution>
--				</executions>
--			</plugin>
--		</plugins>
--	</build>
- </project>
-diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
-index 1389545..d356c2e 100644
---- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
-+++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java
-@@ -85,18 +85,7 @@ import org.openjdk.jmc.ui.misc.DisplayToolkit;
- public class GraphView extends ViewPart implements ISelectionListener {
- 	private static final String HTML_PAGE;
- 	static {
--		String jsD3V5 = "jslibs/d3.v5.min.js";
--		String jsGraphviz = "jslibs/index.js";
--		String wasmGraphviz = "jslibs/graphvizlib.wasm";
--		String jsGraphizD3 = "jslibs/d3-graphviz.js";
--
--		String wasmBase64 = loadBase64FromFile(wasmGraphviz);
--
--		HTML_PAGE = String.format(loadStringFromFile("page.template"), loadLibraries(jsD3V5),
--				// we inline base64 wasm in the library code to avoid fetching it at runtime
--				loadStringFromFile(jsGraphviz, "wasmBinaryFile=\"graphvizlib.wasm\";",
--						"wasmBinaryFile=dataURIPrefix + '" + wasmBase64 + "';"),
--				loadLibraries(jsGraphizD3));
-+        HTML_PAGE = String.format(loadStringFromFile("page.template"));
- 	}
- 
- 	private enum ModelState {
-diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
-index eb7423a..e424576 100644
---- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
-+++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template
-@@ -3,12 +3,13 @@
- 
- <head>
- 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
--	<script>%1$s</script>
--	<script>%2$s</script>
--	<script>%3$s</script>
- </head>
- 
- <body>
-+    <script type="text/javascript" src="https://d3js.org/d3.v5.min.js"></script>
-+    <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js"></script>
-+    <script type="text/javascript" src="https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js"></script>
-+    <script type="text/javascript" src="https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm"></script>
- 	<div id="graph" style="text-align: center;"></div>
- 	<script type="text/javascript">
- 		
diff --git a/SOURCES/14-fix-javamail.patch b/SOURCES/14-fix-javamail.patch
new file mode 100644
index 0000000..7c5aef7
--- /dev/null
+++ b/SOURCES/14-fix-javamail.patch
@@ -0,0 +1,13 @@
+diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
+index 1eb682d..569f7e2 100644
+--- a/application/org.openjdk.jmc.feature.core/feature.xml
++++ b/application/org.openjdk.jmc.feature.core/feature.xml
+@@ -168,7 +168,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="com.sun.mail.jakarta.mail"
++         id="com.sun.mail.javax.mail"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
diff --git a/SOURCES/14-revert-6852.patch b/SOURCES/14-revert-6852.patch
deleted file mode 100644
index 7624bea..0000000
--- a/SOURCES/14-revert-6852.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
-index 2ebccfb..1cc8aca 100644
---- a/application/org.openjdk.jmc.rcp.product/pom.xml
-+++ b/application/org.openjdk.jmc.rcp.product/pom.xml
-@@ -74,7 +74,6 @@
- 							<rootFolders>
- 								<win32>${productName}</win32>
- 								<macosx>${productName}.app</macosx>
--								<linux>${productName}</linux>
- 							</rootFolders>
- 						</product>
- 					</products>
diff --git a/SOURCES/15-fix-javamail.patch b/SOURCES/15-fix-javamail.patch
deleted file mode 100644
index 7c5aef7..0000000
--- a/SOURCES/15-fix-javamail.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
-index 1eb682d..569f7e2 100644
---- a/application/org.openjdk.jmc.feature.core/feature.xml
-+++ b/application/org.openjdk.jmc.feature.core/feature.xml
-@@ -168,7 +168,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="com.sun.mail.jakarta.mail"
-+         id="com.sun.mail.javax.mail"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
diff --git a/SOURCES/15-revert-resourcelocator.patch b/SOURCES/15-revert-resourcelocator.patch
new file mode 100644
index 0000000..7fe4334
--- /dev/null
+++ b/SOURCES/15-revert-resourcelocator.patch
@@ -0,0 +1,208 @@
+diff --git a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
+index a6a2a7c..a252f9e 100644
+--- a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
++++ b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
+@@ -43,7 +43,6 @@ import org.eclipse.jface.action.IToolBarManager;
+ import org.eclipse.jface.dialogs.IMessageProvider;
+ import org.eclipse.jface.resource.ImageDescriptor;
+ import org.eclipse.jface.resource.JFaceResources;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.swt.graphics.Image;
+ import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.swt.widgets.Display;
+@@ -54,6 +53,7 @@ import org.eclipse.ui.forms.IManagedForm;
+ import org.eclipse.ui.forms.IMessageManager;
+ import org.eclipse.ui.forms.editor.FormPage;
+ import org.eclipse.ui.forms.widgets.Form;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.console.ui.ConsolePlugin;
+ import org.openjdk.jmc.console.ui.editor.IConsolePageContainer;
+ import org.openjdk.jmc.console.ui.editor.IConsolePageStateHandler;
+@@ -175,7 +175,7 @@ public class ConsoleFormPage extends FormPage implements IConsolePageContainer {
+ 		String iconName = config.getAttribute(ATTRIBUTE_ICON);
+ 		if (iconName != null) {
+ 			String pluginId = config.getDeclaringExtension().getContributor().getName();
+-			ImageDescriptor iconDesc = ResourceLocator.imageDescriptorFromBundle(pluginId, iconName).orElse(null);
++			ImageDescriptor iconDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconName);
+ 			if (iconDesc != null) {
+ 				icon = (Image) JFaceResources.getResources().get(iconDesc);
+ 			} else {
+diff --git a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
+index d0be24a..e3f1000 100644
+--- a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
++++ b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
+@@ -38,7 +38,6 @@ import java.util.List;
+ import java.util.stream.Stream;
+ 
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.swt.SWT;
+ import org.eclipse.swt.custom.SashForm;
+ import org.eclipse.swt.graphics.Image;
+@@ -46,6 +45,7 @@ import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.ui.forms.widgets.Form;
+ import org.eclipse.ui.forms.widgets.FormToolkit;
+ import org.eclipse.ui.forms.widgets.Section;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.common.IState;
+ import org.openjdk.jmc.common.IWritableState;
+ import org.openjdk.jmc.common.item.Aggregators;
+@@ -98,8 +98,8 @@ public class JfxPage extends AbstractDataPage {
+ 
+ 		@Override
+ 		public ImageDescriptor getImageDescriptor(IState state) {
+-			return ResourceLocator.imageDescriptorFromBundle("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
+-					"icons/pulse.png").orElse(null); //$NON-NLS-1$
++			return AbstractUIPlugin.imageDescriptorFromPlugin("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
++					"icons/pulse.png"); //$NON-NLS-1$
+ 		}
+ 
+ 		@Override
+diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
+index a8b76b0..bb57f10 100644
+--- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
++++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
+@@ -69,7 +69,6 @@ import org.eclipse.jface.action.IMenuManager;
+ import org.eclipse.jface.action.IToolBarManager;
+ import org.eclipse.jface.action.Separator;
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.jface.viewers.ISelection;
+ import org.eclipse.jface.viewers.IStructuredSelection;
+ import org.eclipse.swt.SWT;
+@@ -93,6 +92,7 @@ import org.eclipse.ui.IWorkbenchPart;
+ import org.eclipse.ui.PartInitException;
+ import org.eclipse.ui.PlatformUI;
+ import org.eclipse.ui.part.ViewPart;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.common.item.IItemCollection;
+ import org.openjdk.jmc.common.item.ItemCollectionToolkit;
+ import org.openjdk.jmc.common.util.StringToolkit;
+@@ -490,7 +490,7 @@ public class FlameGraphView extends ViewPart implements ISelectionListener {
+ 	}
+ 
+ 	private static ImageDescriptor flameviewImageDescriptor(String iconName) {
+-		return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, DIR_ICONS + iconName).orElse(null); //$NON-NLS-1$
++		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, DIR_ICONS + iconName); //$NON-NLS-1$
+ 	}
+ 
+ 	private static String getIconBase64(String iconName) {
+diff --git a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
+index 748cebc..019ce5e 100644
+--- a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
++++ b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
+@@ -39,7 +39,6 @@ import java.util.stream.Stream;
+ import org.eclipse.jface.layout.GridDataFactory;
+ import org.eclipse.jface.layout.GridLayoutFactory;
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+ import org.eclipse.jface.viewers.ISelection;
+ import org.eclipse.jface.viewers.TreePath;
+@@ -51,6 +50,7 @@ import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.swt.widgets.Text;
+ import org.eclipse.ui.forms.widgets.Form;
+ import org.eclipse.ui.forms.widgets.FormToolkit;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.common.IState;
+ import org.openjdk.jmc.common.IWritableState;
+ import org.openjdk.jmc.common.item.IItemIterable;
+@@ -231,7 +231,7 @@ public class MetadataPage extends AbstractDataPage {
+ 
+ 		@Override
+ 		public ImageDescriptor getImageDescriptor(IState state) {
+-			return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, ICON).orElse(null);
++			return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ICON);
+ 		}
+ 
+ 		@Override
+diff --git a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
+index bcdf8b9..fff9296 100644
+--- a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
++++ b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
+@@ -39,7 +39,6 @@ import java.util.logging.Logger;
+ 
+ import org.eclipse.jface.resource.ImageDescriptor;
+ import org.eclipse.jface.resource.ImageRegistry;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.common.io.IOToolkit;
+ import org.openjdk.jmc.rcp.application.p2.AddRepositoriesJob;
+@@ -144,6 +143,6 @@ public class ApplicationPlugin extends AbstractUIPlugin {
+ 	 * @return the image descriptor
+ 	 */
+ 	public static ImageDescriptor getImageDescriptor(String path) {
+-		return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
++		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ 	}
+ }
+diff --git a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
+index 6380709..4a66939 100644
+--- a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
++++ b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
+@@ -34,16 +34,16 @@ package org.openjdk.jmc.rjmx.ui.internal;
+ 
+ import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
+ import org.eclipse.ui.forms.SectionPart;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ import org.openjdk.jmc.ui.misc.MCSectionPart;
+ 
+ /**
+  * Action for removing a {@link SectionPart} in a {@link SectionPartManager}
+  */
+ public class RemoveAction extends Action {
+-	private final static ImageDescriptor ICON = ResourceLocator.imageDescriptorFromBundle("org.eclipse.ui", //$NON-NLS-1$
+-			"icons/full/elcl16/close_view.gif").orElse(null); //$NON-NLS-1$
++	private final static ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ui", //$NON-NLS-1$
++			"icons/full/elcl16/close_view.gif"); //$NON-NLS-1$
+ 	final private SectionPartManager m_sectionPartmanager;
+ 	final private MCSectionPart m_part;
+ 
+diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
+index 5cd717b..d6a19a9 100644
+--- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
++++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
+@@ -35,7 +35,7 @@ package org.openjdk.jmc.ui;
+ import java.util.MissingResourceException;
+ 
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
+ 
+ /**
+  * Storage for common ImageDescriptors.
+@@ -177,7 +177,7 @@ public class CoreImages {
+ 	}
+ 
+ 	private static ImageDescriptor createDescriptor(String relPath) {
+-		ImageDescriptor desc = ResourceLocator.imageDescriptorFromBundle(UIPlugin.PLUGIN_ID, relPath).orElse(null);
++		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(UIPlugin.PLUGIN_ID, relPath);
+ 		if (desc == null) {
+ 			// FIXME: Throwing an exception has the development time advantage of being very intrusive. For release time, logging might be better.
+ 			throw new MissingResourceException("Missing image '" + relPath + '\'', ImageDescriptor.class.getName(), //$NON-NLS-1$
+diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
+index de112b0..e04e796 100644
+--- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
++++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
+@@ -34,7 +34,8 @@ package org.openjdk.jmc.ui.misc;
+ 
+ import org.eclipse.core.runtime.IAdapterFactory;
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.resource.ResourceLocator;
++import org.eclipse.ui.plugin.AbstractUIPlugin;
++
+ import org.openjdk.jmc.ui.common.resource.IImageResource;
+ import org.openjdk.jmc.ui.common.resource.Resource;
+ import org.openjdk.jmc.ui.common.util.AdapterUtil;
+@@ -49,8 +50,7 @@ public class ImageDescriptorAdapterFactory implements IAdapterFactory {
+ 			if (imageResource != null) {
+ 				Resource r = imageResource.getImageResource();
+ 				if (r != null) {
+-					return adapterType.cast(ResourceLocator
+-							.imageDescriptorFromBundle(r.getPluginId(), r.getResourcePath()).orElse(null));
++					return adapterType.cast(AbstractUIPlugin.imageDescriptorFromPlugin(r.getPluginId(), r.getResourcePath()));
+ 				}
+ 			}
+ 			IGraphical g = AdapterUtil.getAdapter(adaptableObject, IGraphical.class);
diff --git a/SOURCES/16-remove-chromium.patch b/SOURCES/16-remove-chromium.patch
new file mode 100644
index 0000000..ac30732
--- /dev/null
+++ b/SOURCES/16-remove-chromium.patch
@@ -0,0 +1,22 @@
+diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
+index b53c5e5..1eb682d 100644
+--- a/application/org.openjdk.jmc.feature.core/feature.xml
++++ b/application/org.openjdk.jmc.feature.core/feature.xml
+@@ -62,17 +62,6 @@
+       <import plugin="org.eclipse.e4.core.contexts"/>
+    </requires>
+ 
+-   <plugin
+-         id="com.make.chromium.cef.win32.win32.x86_64"
+-         os="win32"
+-         ws="win32"
+-         arch="x86_64"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-
+    <plugin
+          id="org.openjdk.jmc.attach"
+          download-size="0"
diff --git a/SOURCES/16-revert-resourcelocator.patch b/SOURCES/16-revert-resourcelocator.patch
deleted file mode 100644
index 7fe4334..0000000
--- a/SOURCES/16-revert-resourcelocator.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff --git a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
-index a6a2a7c..a252f9e 100644
---- a/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
-+++ b/application/org.openjdk.jmc.console.ui/src/main/java/org/openjdk/jmc/console/ui/editor/internal/ConsoleFormPage.java
-@@ -43,7 +43,6 @@ import org.eclipse.jface.action.IToolBarManager;
- import org.eclipse.jface.dialogs.IMessageProvider;
- import org.eclipse.jface.resource.ImageDescriptor;
- import org.eclipse.jface.resource.JFaceResources;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.swt.graphics.Image;
- import org.eclipse.swt.widgets.Composite;
- import org.eclipse.swt.widgets.Display;
-@@ -54,6 +53,7 @@ import org.eclipse.ui.forms.IManagedForm;
- import org.eclipse.ui.forms.IMessageManager;
- import org.eclipse.ui.forms.editor.FormPage;
- import org.eclipse.ui.forms.widgets.Form;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.console.ui.ConsolePlugin;
- import org.openjdk.jmc.console.ui.editor.IConsolePageContainer;
- import org.openjdk.jmc.console.ui.editor.IConsolePageStateHandler;
-@@ -175,7 +175,7 @@ public class ConsoleFormPage extends FormPage implements IConsolePageContainer {
- 		String iconName = config.getAttribute(ATTRIBUTE_ICON);
- 		if (iconName != null) {
- 			String pluginId = config.getDeclaringExtension().getContributor().getName();
--			ImageDescriptor iconDesc = ResourceLocator.imageDescriptorFromBundle(pluginId, iconName).orElse(null);
-+			ImageDescriptor iconDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconName);
- 			if (iconDesc != null) {
- 				icon = (Image) JFaceResources.getResources().get(iconDesc);
- 			} else {
-diff --git a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
-index d0be24a..e3f1000 100644
---- a/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
-+++ b/application/org.openjdk.jmc.flightrecorder.ext.jfx/src/main/java/org/openjdk/jmc/flightrecorder/ext/jfx/JfxPage.java
-@@ -38,7 +38,6 @@ import java.util.List;
- import java.util.stream.Stream;
- 
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.swt.SWT;
- import org.eclipse.swt.custom.SashForm;
- import org.eclipse.swt.graphics.Image;
-@@ -46,6 +45,7 @@ import org.eclipse.swt.widgets.Composite;
- import org.eclipse.ui.forms.widgets.Form;
- import org.eclipse.ui.forms.widgets.FormToolkit;
- import org.eclipse.ui.forms.widgets.Section;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.common.IState;
- import org.openjdk.jmc.common.IWritableState;
- import org.openjdk.jmc.common.item.Aggregators;
-@@ -98,8 +98,8 @@ public class JfxPage extends AbstractDataPage {
- 
- 		@Override
- 		public ImageDescriptor getImageDescriptor(IState state) {
--			return ResourceLocator.imageDescriptorFromBundle("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
--					"icons/pulse.png").orElse(null); //$NON-NLS-1$
-+			return AbstractUIPlugin.imageDescriptorFromPlugin("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
-+					"icons/pulse.png"); //$NON-NLS-1$
- 		}
- 
- 		@Override
-diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
-index a8b76b0..bb57f10 100644
---- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
-+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
-@@ -69,7 +69,6 @@ import org.eclipse.jface.action.IMenuManager;
- import org.eclipse.jface.action.IToolBarManager;
- import org.eclipse.jface.action.Separator;
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.jface.viewers.ISelection;
- import org.eclipse.jface.viewers.IStructuredSelection;
- import org.eclipse.swt.SWT;
-@@ -93,6 +92,7 @@ import org.eclipse.ui.IWorkbenchPart;
- import org.eclipse.ui.PartInitException;
- import org.eclipse.ui.PlatformUI;
- import org.eclipse.ui.part.ViewPart;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.common.item.IItemCollection;
- import org.openjdk.jmc.common.item.ItemCollectionToolkit;
- import org.openjdk.jmc.common.util.StringToolkit;
-@@ -490,7 +490,7 @@ public class FlameGraphView extends ViewPart implements ISelectionListener {
- 	}
- 
- 	private static ImageDescriptor flameviewImageDescriptor(String iconName) {
--		return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, DIR_ICONS + iconName).orElse(null); //$NON-NLS-1$
-+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, DIR_ICONS + iconName); //$NON-NLS-1$
- 	}
- 
- 	private static String getIconBase64(String iconName) {
-diff --git a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
-index 748cebc..019ce5e 100644
---- a/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
-+++ b/application/org.openjdk.jmc.flightrecorder.metadata/src/main/java/org/openjdk/jmc/flightrecorder/metadata/MetadataPage.java
-@@ -39,7 +39,6 @@ import java.util.stream.Stream;
- import org.eclipse.jface.layout.GridDataFactory;
- import org.eclipse.jface.layout.GridLayoutFactory;
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
- import org.eclipse.jface.viewers.ISelection;
- import org.eclipse.jface.viewers.TreePath;
-@@ -51,6 +50,7 @@ import org.eclipse.swt.widgets.Composite;
- import org.eclipse.swt.widgets.Text;
- import org.eclipse.ui.forms.widgets.Form;
- import org.eclipse.ui.forms.widgets.FormToolkit;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.common.IState;
- import org.openjdk.jmc.common.IWritableState;
- import org.openjdk.jmc.common.item.IItemIterable;
-@@ -231,7 +231,7 @@ public class MetadataPage extends AbstractDataPage {
- 
- 		@Override
- 		public ImageDescriptor getImageDescriptor(IState state) {
--			return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, ICON).orElse(null);
-+			return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ICON);
- 		}
- 
- 		@Override
-diff --git a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
-index bcdf8b9..fff9296 100644
---- a/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
-+++ b/application/org.openjdk.jmc.rcp.application/src/main/java/org/openjdk/jmc/rcp/application/ApplicationPlugin.java
-@@ -39,7 +39,6 @@ import java.util.logging.Logger;
- 
- import org.eclipse.jface.resource.ImageDescriptor;
- import org.eclipse.jface.resource.ImageRegistry;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.common.io.IOToolkit;
- import org.openjdk.jmc.rcp.application.p2.AddRepositoriesJob;
-@@ -144,6 +143,6 @@ public class ApplicationPlugin extends AbstractUIPlugin {
- 	 * @return the image descriptor
- 	 */
- 	public static ImageDescriptor getImageDescriptor(String path) {
--		return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
-+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
- 	}
- }
-diff --git a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
-index 6380709..4a66939 100644
---- a/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
-+++ b/application/org.openjdk.jmc.rjmx.ui/src/main/java/org/openjdk/jmc/rjmx/ui/internal/RemoveAction.java
-@@ -34,16 +34,16 @@ package org.openjdk.jmc.rjmx.ui.internal;
- 
- import org.eclipse.jface.action.Action;
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
- import org.eclipse.ui.forms.SectionPart;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- import org.openjdk.jmc.ui.misc.MCSectionPart;
- 
- /**
-  * Action for removing a {@link SectionPart} in a {@link SectionPartManager}
-  */
- public class RemoveAction extends Action {
--	private final static ImageDescriptor ICON = ResourceLocator.imageDescriptorFromBundle("org.eclipse.ui", //$NON-NLS-1$
--			"icons/full/elcl16/close_view.gif").orElse(null); //$NON-NLS-1$
-+	private final static ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ui", //$NON-NLS-1$
-+			"icons/full/elcl16/close_view.gif"); //$NON-NLS-1$
- 	final private SectionPartManager m_sectionPartmanager;
- 	final private MCSectionPart m_part;
- 
-diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
-index 5cd717b..d6a19a9 100644
---- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
-+++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/CoreImages.java
-@@ -35,7 +35,7 @@ package org.openjdk.jmc.ui;
- import java.util.MissingResourceException;
- 
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
- 
- /**
-  * Storage for common ImageDescriptors.
-@@ -177,7 +177,7 @@ public class CoreImages {
- 	}
- 
- 	private static ImageDescriptor createDescriptor(String relPath) {
--		ImageDescriptor desc = ResourceLocator.imageDescriptorFromBundle(UIPlugin.PLUGIN_ID, relPath).orElse(null);
-+		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(UIPlugin.PLUGIN_ID, relPath);
- 		if (desc == null) {
- 			// FIXME: Throwing an exception has the development time advantage of being very intrusive. For release time, logging might be better.
- 			throw new MissingResourceException("Missing image '" + relPath + '\'', ImageDescriptor.class.getName(), //$NON-NLS-1$
-diff --git a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
-index de112b0..e04e796 100644
---- a/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
-+++ b/application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ImageDescriptorAdapterFactory.java
-@@ -34,7 +34,8 @@ package org.openjdk.jmc.ui.misc;
- 
- import org.eclipse.core.runtime.IAdapterFactory;
- import org.eclipse.jface.resource.ImageDescriptor;
--import org.eclipse.jface.resource.ResourceLocator;
-+import org.eclipse.ui.plugin.AbstractUIPlugin;
-+
- import org.openjdk.jmc.ui.common.resource.IImageResource;
- import org.openjdk.jmc.ui.common.resource.Resource;
- import org.openjdk.jmc.ui.common.util.AdapterUtil;
-@@ -49,8 +50,7 @@ public class ImageDescriptorAdapterFactory implements IAdapterFactory {
- 			if (imageResource != null) {
- 				Resource r = imageResource.getImageResource();
- 				if (r != null) {
--					return adapterType.cast(ResourceLocator
--							.imageDescriptorFromBundle(r.getPluginId(), r.getResourcePath()).orElse(null));
-+					return adapterType.cast(AbstractUIPlugin.imageDescriptorFromPlugin(r.getPluginId(), r.getResourcePath()));
- 				}
- 			}
- 			IGraphical g = AdapterUtil.getAdapter(adaptableObject, IGraphical.class);
diff --git a/SOURCES/7-remove-jacoco-dep.patch b/SOURCES/7-remove-jacoco-dep.patch
index a2625bb..a5a4bfc 100644
--- a/SOURCES/7-remove-jacoco-dep.patch
+++ b/SOURCES/7-remove-jacoco-dep.patch
@@ -1,10 +1,10 @@
 diff --git a/application/pom.xml b/application/pom.xml
-index 3f179d4..5a4add3 100644
+index 6b92b98..34b9077 100644
 --- a/application/pom.xml
 +++ b/application/pom.xml
-@@ -175,11 +175,6 @@
+@@ -173,11 +173,6 @@
  			<artifactId>flightrecorder.test</artifactId>
- 			<version>8.0.0-SNAPSHOT</version>
+ 			<version>8.0.1-SNAPSHOT</version>
  		</dependency>
 -		<dependency>
 -			<groupId>org.jacoco</groupId>
diff --git a/SPECS/jmc.spec b/SPECS/jmc.spec
index 81e51e2..eb532b2 100644
--- a/SPECS/jmc.spec
+++ b/SPECS/jmc.spec
@@ -1,16 +1,16 @@
 # Version
 %global major 8
 %global minor 0
-%global patchlevel 0
+%global patchlevel 1
 
 # Revision
-%global revnum 8
+%global revnum 2
 # set to 1 for snapshots, 0 for release
 %global usesnapshot 0
 
 # SNAPSHOT version
-%global revhash 8ab40bfb565c1002e84bb238a620ab81bb64eceb
-%global revdate 20210212
+%global revhash 699a121bd449fe8a9350221282bd3f809691a766
+%global revdate 20210623
 
 %global tarball_name jmc-%{revhash}
 
@@ -83,16 +83,16 @@ Patch9:     9-update-flags.patch
 Patch10:    10-revert-lz4-java-name-override.patch
 # Patch pom.xml Use to tycho version 2.1
 Patch11:    11-tycho.patch
-# Remove Chromium (currently Windows-only) from the plugin list
-Patch12:    12-remove-chromium.patch
 # Revert downloading of graphview assets from the web
-Patch13:    13-revert-graphview.patch
+Patch12:    12-revert-graphview.patch
 # Simplify the path to the jmc product
-Patch14:    14-revert-6852.patch
+Patch13:    13-revert-6852.patch
 # Update javamail dependency names
-Patch15:    15-fix-javamail.patch
+Patch14:    14-fix-javamail.patch
 # Revert usage of ResourceLocator as it isn't available in Eclipse 4.12
-Patch16:    16-revert-resourcelocator.patch
+Patch15:    15-revert-resourcelocator.patch
+# Remove Chromium (currently Windows-only) from the plugin list
+Patch16:    16-remove-chromium.patch
 # Revert usage of List.of in GraphView
 Patch17:    17-revert-list-of.patch
 
@@ -115,6 +115,7 @@ BuildRequires:  osgi(org.openjdk.jmc.flightrecorder.test)
 BuildRequires:  osgi(javax.annotation-api)
 
 Requires:  java-openjdk >= 1:1.8
+Requires:  lz4-java
 
 Requires:  osgi(com.sun.activation.jakarta.activation)
 Requires:  osgi(org.openjdk.jmc.common)
@@ -244,6 +245,15 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Aug 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-2
+- Re-set the buildId, buildNumber, and build.date during maven build
+
+* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
+- Update to jmc 8.0.1-ga
+
+* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.1.0-1
+- Update to jmc-ga tagged commit d0f89f0
+
 * Wed Feb 24 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-8
 - Set the buildId, buildNumber, and build.date during maven build