From 1cb1a7203aaca1c41dc30b3fad73d7e8a1398061 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Nov 30 2018 19:19:52 +0000
Subject: Update jmc package


---

diff --git a/jmc/0_remove_twitter.patch b/jmc/0_remove_twitter.patch
deleted file mode 100644
index 545e843..0000000
--- a/jmc/0_remove_twitter.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
---- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-@@ -54,7 +54,6 @@
-  org.openjdk.jmc.rjmx.triggers;
-   x-friends:="org.openjdk.jmc.console.ui.notification,
-    org.openjdk.jmc.alert,
--   org.openjdk.jmc.console.twitter,
-    org.openjdk.jmc.rjmx.test",
-  org.openjdk.jmc.rjmx.triggers.actions.internal;x-friends:="org.openjdk.jmc.console.ui.notification",
-  org.openjdk.jmc.rjmx.triggers.condition.internal;x-friends:="org.openjdk.jmc.console.ui.notification,org.openjdk.jmc.test.jemmy",
-diff --git a/application/org.openjdk.jmc.updatesite.ide/category.xml b/application/org.openjdk.jmc.updatesite.ide/category.xml
---- a/application/org.openjdk.jmc.updatesite.ide/category.xml
-+++ b/application/org.openjdk.jmc.updatesite.ide/category.xml
-@@ -55,10 +55,6 @@
- 		id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0">
- 		<category name="Console (Experimental)" />
- 	</feature>
--	<feature url="features/org.openjdk.jmc.feature.twitter_0.0.0.jar"
--		id="org.openjdk.jmc.feature.twitter" version="0.0.0">
--		<category name="Console (Experimental)" />
--	</feature>
- 	<feature
- 		url="features/org.openjdk.jmc.feature.flightrecorder.ext.g1_0.0.0.jar"
- 		id="org.openjdk.jmc.feature.flightrecorder.ext.g1" version="0.0.0">
-diff --git a/application/org.openjdk.jmc.updatesite.ide/feature.xml b/application/org.openjdk.jmc.updatesite.ide/feature.xml
---- a/application/org.openjdk.jmc.updatesite.ide/feature.xml
-+++ b/application/org.openjdk.jmc.updatesite.ide/feature.xml
-@@ -67,10 +67,6 @@
-          version="0.0.0"/>
- 
-    <includes
--         id="org.openjdk.jmc.feature.twitter"
--         version="0.0.0"/>
--
--   <includes
-          id="org.openjdk.jmc.feature.joverflow"
-          version="0.0.0"/>
- 
-diff --git a/application/org.openjdk.jmc.updatesite.rcp/category.xml b/application/org.openjdk.jmc.updatesite.rcp/category.xml
---- a/application/org.openjdk.jmc.updatesite.rcp/category.xml
-+++ b/application/org.openjdk.jmc.updatesite.rcp/category.xml
-@@ -55,10 +55,6 @@
- 		id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0">
- 		<category name="Console (Experimental)" />
- 	</feature>
--	<feature url="features/org.openjdk.jmc.feature.twitter_0.0.0.jar"
--		id="org.openjdk.jmc.feature.twitter" version="0.0.0">
--		<category name="Console (Experimental)" />
--	</feature>
- 	<feature
- 		url="features/org.openjdk.jmc.feature.joverflow_0.0.0.jar"
- 		id="org.openjdk.jmc.feature.joverflow" version="0.0.0">
-diff --git a/application/org.openjdk.jmc.updatesite.rcp/feature.xml b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
---- a/application/org.openjdk.jmc.updatesite.rcp/feature.xml
-+++ b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
-@@ -67,10 +67,6 @@
-          version="0.0.0"/>
- 
-    <includes
--         id="org.openjdk.jmc.feature.twitter"
--         version="0.0.0"/>
--
--   <includes
-          id="org.openjdk.jmc.feature.joverflow"
-          version="0.0.0"/>
- 
-diff --git a/application/pom.xml b/application/pom.xml
---- a/application/pom.xml
-+++ b/application/pom.xml
-@@ -50,7 +50,6 @@
- 		<module>org.openjdk.jmc.console.jconsole</module>
- 		<module>org.openjdk.jmc.console.pde</module>
- 		<module>org.openjdk.jmc.console.persistence</module>
--		<module>org.openjdk.jmc.console.twitter</module>
- 		<module>org.openjdk.jmc.console.ui</module>
- 		<module>org.openjdk.jmc.console.ui.diagnostic</module>
- 		<module>org.openjdk.jmc.console.ui.mbeanbrowser</module>
-@@ -72,7 +71,6 @@
- 		<module>org.openjdk.jmc.feature.pde</module>
- 		<module>org.openjdk.jmc.feature.rcp</module>
- 		<module>org.openjdk.jmc.feature.rcp.update</module>
--		<module>org.openjdk.jmc.feature.twitter</module>
- 		<module>org.openjdk.jmc.flightrecorder.configuration</module>
- 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
- 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
-diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt
---- a/license/THIRDPARTYREADME.txt
-+++ b/license/THIRDPARTYREADME.txt
-@@ -367,187 +367,3 @@
- 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.
--
--
--%% The following notice is provided with respect to Twitter4J 4.0.6,
--which may be included with this product.
--
--
--                                 Apache License
--                           Version 2.0, January 2004
--                        http://www.apache.org/licenses/
--
--   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
--
--   1. Definitions.
--
--      "License" shall mean the terms and conditions for use, reproduction,
--      and distribution as defined by Sections 1 through 9 of this document.
--
--      "Licensor" shall mean the copyright owner or entity authorized by
--      the copyright owner that is granting the License.
--
--      "Legal Entity" shall mean the union of the acting entity and all
--      other entities that control, are controlled by, or are under common
--      control with that entity. For the purposes of this definition,
--      "control" means (i) the power, direct or indirect, to cause the
--      direction or management of such entity, whether by contract or
--      otherwise, or (ii) ownership of fifty percent (50%) or more of the
--      outstanding shares, or (iii) beneficial ownership of such entity.
--
--      "You" (or "Your") shall mean an individual or Legal Entity
--      exercising permissions granted by this License.
--
--      "Source" form shall mean the preferred form for making modifications,
--      including but not limited to software source code, documentation
--      source, and configuration files.
--
--      "Object" form shall mean any form resulting from mechanical
--      transformation or translation of a Source form, including but
--      not limited to compiled object code, generated documentation,
--      and conversions to other media types.
--
--      "Work" shall mean the work of authorship, whether in Source or
--      Object form, made available under the License, as indicated by a
--      copyright notice that is included in or attached to the work
--      (an example is provided in the Appendix below).
--
--      "Derivative Works" shall mean any work, whether in Source or Object
--      form, that is based on (or derived from) the Work and for which the
--      editorial revisions, annotations, elaborations, or other modifications
--      represent, as a whole, an original work of authorship. For the purposes
--      of this License, Derivative Works shall not include works that remain
--      separable from, or merely link (or bind by name) to the interfaces of,
--      the Work and Derivative Works thereof.
--
--      "Contribution" shall mean any work of authorship, including
--      the original version of the Work and any modifications or additions
--      to that Work or Derivative Works thereof, that is intentionally
--      submitted to Licensor for inclusion in the Work by the copyright owner
--      or by an individual or Legal Entity authorized to submit on behalf of
--      the copyright owner. For the purposes of this definition, "submitted"
--      means any form of electronic, verbal, or written communication sent
--      to the Licensor or its representatives, including but not limited to
--      communication on electronic mailing lists, source code control systems,
--      and issue tracking systems that are managed by, or on behalf of, the
--      Licensor for the purpose of discussing and improving the Work, but
--      excluding communication that is conspicuously marked or otherwise
--      designated in writing by the copyright owner as "Not a Contribution."
--
--      "Contributor" shall mean Licensor and any individual or Legal Entity
--      on behalf of whom a Contribution has been received by Licensor and
--      subsequently incorporated within the Work.
--
--   2. Grant of Copyright License. Subject to the terms and conditions of
--      this License, each Contributor hereby grants to You a perpetual,
--      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
--      copyright license to reproduce, prepare Derivative Works of,
--      publicly display, publicly perform, sublicense, and distribute the
--      Work and such Derivative Works in Source or Object form.
--
--   3. Grant of Patent License. Subject to the terms and conditions of
--      this License, each Contributor hereby grants to You a perpetual,
--      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
--      (except as stated in this section) patent license to make, have made,
--      use, offer to sell, sell, import, and otherwise transfer the Work,
--      where such license applies only to those patent claims licensable
--      by such Contributor that are necessarily infringed by their
--      Contribution(s) alone or by combination of their Contribution(s)
--      with the Work to which such Contribution(s) was submitted. If You
--      institute patent litigation against any entity (including a
--      cross-claim or counterclaim in a lawsuit) alleging that the Work
--      or a Contribution incorporated within the Work constitutes direct
--      or contributory patent infringement, then any patent licenses
--      granted to You under this License for that Work shall terminate
--      as of the date such litigation is filed.
--
--   4. Redistribution. You may reproduce and distribute copies of the
--      Work or Derivative Works thereof in any medium, with or without
--      modifications, and in Source or Object form, provided that You
--      meet the following conditions:
--
--      (a) You must give any other recipients of the Work or
--          Derivative Works a copy of this License; and
--
--      (b) You must cause any modified files to carry prominent notices
--          stating that You changed the files; and
--
--      (c) You must retain, in the Source form of any Derivative Works
--          that You distribute, all copyright, patent, trademark, and
--          attribution notices from the Source form of the Work,
--          excluding those notices that do not pertain to any part of
--          the Derivative Works; and
--
--      (d) If the Work includes a "NOTICE" text file as part of its
--          distribution, then any Derivative Works that You distribute must
--          include a readable copy of the attribution notices contained
--          within such NOTICE file, excluding those notices that do not
--          pertain to any part of the Derivative Works, in at least one
--          of the following places: within a NOTICE text file distributed
--          as part of the Derivative Works; within the Source form or
--          documentation, if provided along with the Derivative Works; or,
--          within a display generated by the Derivative Works, if and
--          wherever such third-party notices normally appear. The contents
--          of the NOTICE file are for informational purposes only and
--          do not modify the License. You may add Your own attribution
--          notices within Derivative Works that You distribute, alongside
--          or as an addendum to the NOTICE text from the Work, provided
--          that such additional attribution notices cannot be construed
--          as modifying the License.
--
--      You may add Your own copyright statement to Your modifications and
--      may provide additional or different license terms and conditions
--      for use, reproduction, or distribution of Your modifications, or
--      for any such Derivative Works as a whole, provided Your use,
--      reproduction, and distribution of the Work otherwise complies with
--      the conditions stated in this License.
--
--   5. Submission of Contributions. Unless You explicitly state otherwise,
--      any Contribution intentionally submitted for inclusion in the Work
--      by You to the Licensor shall be under the terms and conditions of
--      this License, without any additional terms or conditions.
--      Notwithstanding the above, nothing herein shall supersede or modify
--      the terms of any separate license agreement you may have executed
--      with Licensor regarding such Contributions.
--
--   6. Trademarks. This License does not grant permission to use the trade
--      names, trademarks, service marks, or product names of the Licensor,
--      except as required for reasonable and customary use in describing the
--      origin of the Work and reproducing the content of the NOTICE file.
--
--   7. Disclaimer of Warranty. Unless required by applicable law or
--      agreed to in writing, Licensor provides the Work (and each
--      Contributor provides its Contributions) on an "AS IS" BASIS,
--      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
--      implied, including, without limitation, any warranties or conditions
--      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
--      PARTICULAR PURPOSE. You are solely responsible for determining the
--      appropriateness of using or redistributing the Work and assume any
--      risks associated with Your exercise of permissions under this License.
--
--   8. Limitation of Liability. In no event and under no legal theory,
--      whether in tort (including negligence), contract, or otherwise,
--      unless required by applicable law (such as deliberate and grossly
--      negligent acts) or agreed to in writing, shall any Contributor be
--      liable to You for damages, including any direct, indirect, special,
--      incidental, or consequential damages of any character arising as a
--      result of this License or out of the use or inability to use the
--      Work (including but not limited to damages for loss of goodwill,
--      work stoppage, computer failure or malfunction, or any and all
--      other commercial damages or losses), even if such Contributor
--      has been advised of the possibility of such damages.
--
--   9. Accepting Warranty or Additional Liability. While redistributing
--      the Work or Derivative Works thereof, You may choose to offer,
--      and charge a fee for, acceptance of support, warranty, indemnity,
--      or other liability obligations and/or rights consistent with this
--      License. However, in accepting such obligations, You may act only
--      on Your own behalf and on Your sole responsibility, not on behalf
--      of any other Contributor, and only if You agree to indemnify,
--      defend, and hold each Contributor harmless for any liability
--      incurred by, or claims asserted against, such Contributor by reason
--      of your accepting any such warranty or additional liability.
--
--Twitter4J SUBCOMPONENTS:
--
--Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
diff --git a/jmc/1_javamail.patch b/jmc/1_javamail.patch
deleted file mode 100644
index b16787e..0000000
--- a/jmc/1_javamail.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
---- a/application/org.openjdk.jmc.feature.core/feature.xml
-+++ b/application/org.openjdk.jmc.feature.core/feature.xml
-@@ -161,35 +161,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="javax.mail.api"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.mail.dsn"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.mail.imap"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.mail.pop3"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.mail.smtp"
-+         id="com.sun.mail.javax.mail"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
diff --git a/jmc/2_javax.patch b/jmc/2_javax.patch
deleted file mode 100644
index e9456f6..0000000
--- a/jmc/2_javax.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
---- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
-@@ -10,7 +10,7 @@
- Require-Bundle: org.openjdk.jmc.rjmx.ui;visibility:=reexport,
-  org.eclipse.e4.core.contexts;bundle-version="1.3.0",
-  org.eclipse.e4.core.di;bundle-version="1.3.0";visibility:=reexport,
-- javax.annotation;bundle-version="1.0.0";visibility:=reexport,
-+ javax.annotation-api;bundle-version="1.2.0";visibility:=reexport,
-  javax.inject;bundle-version="1.0.0";visibility:=reexport,
-  org.openjdk.jmc.commands
- Bundle-ActivationPolicy: lazy
-@@ -22,7 +22,7 @@
-  org.openjdk.jmc.console.ui.editor,
-  org.openjdk.jmc.console.ui.editor.internal;x-friends:="org.openjdk.jmc.console.ui.mbeanbrowser,org.openjdk.jmc.rcp.intro"
- Bundle-ClassPath: .
--Import-Package: javax.annotation;version="1.0.0",
-+Import-Package: javax.annotation;version="1.2.0",
-  javax.inject;version="1.0.0"
- Automatic-Module-Name: org.openjdk.jmc.console.ui
- 
-diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
---- a/application/org.openjdk.jmc.feature.rcp/feature.xml
-+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
-@@ -84,7 +84,8 @@
-       <import plugin="org.eclipse.ui.intro"/>
-       <import plugin="org.eclipse.ui.net"/>
-       <import plugin="org.eclipse.equinox.event"/>
--      <import plugin="javax.el"/>
-+      <import plugin="javax.el-api"/>
-+      <import plugin="javax.activation-api"/>
-       <import plugin="org.eclipse.equinox.p2.director.app"/>
-    </requires>
- 
diff --git a/jmc/3_remove_profiles.patch b/jmc/3_remove_profiles.patch
deleted file mode 100644
index 70be804..0000000
--- a/jmc/3_remove_profiles.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/pom.xml b/pom.xml
---- a/pom.xml
-+++ b/pom.xml
-@@ -88,53 +88,6 @@
- 			<url>${snapshot.repo}</url>
- 		</snapshotRepository>
- 	</distributionManagement>
--	<profiles>
--		<profile>
--			<id>photon</id>
--			<activation>
--				<activeByDefault>true</activeByDefault>
--			</activation>
--			<build>
--				<plugins>
--					<plugin>
--						<groupId>org.eclipse.tycho</groupId>
--						<artifactId>target-platform-configuration</artifactId>
--						<version>${tycho-version}</version>
--						<configuration>
--							<target>
--								<artifact>
--									<groupId>org.openjdk.jmc</groupId>
--									<artifactId>platform-definition-photon</artifactId>
--									<version>7.0.0-SNAPSHOT</version>
--								</artifact>
--							</target>
--						</configuration>
--					</plugin>
--				</plugins>
--			</build>
--		</profile>
--		<profile>
--			<id>oxygen</id>
--			<build>
--				<plugins>
--					<plugin>
--						<groupId>org.eclipse.tycho</groupId>
--						<artifactId>target-platform-configuration</artifactId>
--						<version>${tycho-version}</version>
--						<configuration>
--							<target>
--								<artifact>
--									<groupId>org.openjdk.jmc</groupId>
--									<artifactId>platform-definition-oxygen</artifactId>
--									<version>7.0.0-SNAPSHOT</version>
--								</artifact>
--							</target>
--						</configuration>
--					</plugin>
--				</plugins>
--			</build>
--		</profile>
--	</profiles>
- 	<build>
- 		<plugins>
- 			<plugin>
diff --git a/jmc/4_remove_localization.patch b/jmc/4_remove_localization.patch
deleted file mode 100644
index 4ba10d2..0000000
--- a/jmc/4_remove_localization.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# HG changeset patch
-# Parent  6dfe58a53a9c2f2148ff30f94b9859112ca05bad
-
-diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
---- a/application/org.openjdk.jmc.feature.rcp/feature.xml
-+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
-@@ -52,18 +52,10 @@
-          version="0.0.0"/>
- 
-    <includes
--         id="org.openjdk.jmc.feature.rcp.ja"
--         version="0.0.0"/>
--
--   <includes
-          id="org.openjdk.jmc.feature.core"
-          version="0.0.0"/>
- 
-    <includes
--         id="org.openjdk.jmc.feature.rcp.zh_CN"
--         version="0.0.0"/>
--
--   <includes
-          id="org.openjdk.jmc.feature.flightrecorder"
-          version="0.0.0"/>
- 
-@@ -103,24 +95,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.openjdk.jmc.rcp.application.ja"
--         nl="ja_JP,ja"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
--         id="org.openjdk.jmc.rcp.application.zh_CN"
--         nl="zh_CN"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         fragment="true"
--         unpack="false"/>
--
--   <plugin
-          id="org.openjdk.jmc.rcp.intro"
-          download-size="0"
-          install-size="0"
diff --git a/jmc/5_remove_jfx.patch b/jmc/5_remove_jfx.patch
deleted file mode 100644
index fd880b6..0000000
--- a/jmc/5_remove_jfx.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-# HG changeset patch
-# Parent  4e9c9a478de6b87b18d01e9eed070a251a9bb2c7
-
-diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
---- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
-+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
-@@ -94,13 +94,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.openjdk.jmc.javafx.osgi"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.openjdk.jmc.flightrecorder.rules.extensionprovider"
-          download-size="0"
-          install-size="0"
-diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
---- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
-@@ -9,7 +9,6 @@
- Require-Bundle: org.openjdk.jmc.rjmx,
-  org.openjdk.jmc.flightrecorder;visibility:=reexport,
-  org.openjdk.jmc.ui;visibility:=reexport,
-- org.openjdk.jmc.javafx.osgi,
-  org.openjdk.jmc.flightrecorder.rules,
-  org.openjdk.jmc.flightrecorder.rules.jdk,
-  org.openjdk.jmc.flightrecorder.configuration,
-diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
---- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-@@ -11,7 +11,6 @@
- Export-Package: org.openjdk.jmc.rjmx,
-  org.openjdk.jmc.rjmx.actionprovider;
-   x-friends:="org.openjdk.jmc.console.ui,
--   org.openjdk.jmc.joverflow.ui,
-    org.openjdk.jmc.console.persistence,
-    org.openjdk.jmc.flightrecorder.controlpanel.ui,
-    org.openjdk.jmc.browser",
-diff --git a/application/pom.xml b/application/pom.xml
---- a/application/pom.xml
-+++ b/application/pom.xml
-@@ -61,12 +61,10 @@
- 		<module>org.openjdk.jmc.feature.core</module>
- 		<module>org.openjdk.jmc.feature.flightrecorder</module>
- 		<module>org.openjdk.jmc.feature.flightrecorder.ext.g1</module>
--		<module>org.openjdk.jmc.feature.flightrecorder.ext.jfx</module>
- 		<module>org.openjdk.jmc.feature.flightrecorder.metadata</module>
- 		<module>org.openjdk.jmc.feature.ide</module>
- 		<module>org.openjdk.jmc.feature.ide.launch</module>
- 		<module>org.openjdk.jmc.feature.jconsole</module>
--		<module>org.openjdk.jmc.feature.joverflow</module>
- 		<module>org.openjdk.jmc.feature.license</module>
- 		<module>org.openjdk.jmc.feature.pde</module>
- 		<module>org.openjdk.jmc.feature.rcp</module>
-@@ -75,7 +73,6 @@
- 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
- 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
- 		<module>org.openjdk.jmc.flightrecorder.ext.g1</module>
--		<module>org.openjdk.jmc.flightrecorder.ext.jfx</module>
- 		<module>org.openjdk.jmc.flightrecorder.metadata</module>
- 		<module>org.openjdk.jmc.flightrecorder.pde</module>
- 		<module>org.openjdk.jmc.flightrecorder.rules.extensionprovider</module>
-@@ -85,10 +82,7 @@
- 		<module>org.openjdk.jmc.ide.jdt</module>
- 		<module>org.openjdk.jmc.ide.launch</module>
- 		<module>org.openjdk.jmc.ide.ui</module>
--		<module>org.openjdk.jmc.javafx.osgi</module>
- 		<module>org.openjdk.jmc.jdp</module>
--		<module>org.openjdk.jmc.joverflow</module>
--		<module>org.openjdk.jmc.joverflow.ui</module>
- 		<module>org.openjdk.jmc.osgi.extension</module>
- 		<module>org.openjdk.jmc.pde</module>
- 		<module>org.openjdk.jmc.rcp.application</module>
-diff --git a/application/tests/pom.xml b/application/tests/pom.xml
---- a/application/tests/pom.xml
-+++ b/application/tests/pom.xml
-@@ -48,7 +48,6 @@
- 		<module>org.openjdk.jmc.greychart.test</module>
- 		<module>org.openjdk.jmc.ide.launch.test</module>
- 		<module>org.openjdk.jmc.jdp.test</module>
--		<module>org.openjdk.jmc.joverflow.test</module>
- 		<module>org.openjdk.jmc.rjmx.services.jfr.test</module>
- 		<module>org.openjdk.jmc.rjmx.test</module>
- 		<module>org.openjdk.jmc.ui.common.test</module>
diff --git a/jmc/6_remove_ide_jdt.patch b/jmc/6_remove_ide_jdt.patch
deleted file mode 100644
index 3b2cae9..0000000
--- a/jmc/6_remove_ide_jdt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# Parent  361c91e54fb1074e7483ec160a4dac6c1675d649
-
-diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml
---- a/application/org.openjdk.jmc.feature.ide/feature.xml
-+++ b/application/org.openjdk.jmc.feature.ide/feature.xml
-@@ -65,11 +65,4 @@
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--
--   <plugin
--         id="org.openjdk.jmc.ide.jdt"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
- </feature>
-\ No newline at end of file
-diff --git a/application/pom.xml b/application/pom.xml
---- a/application/pom.xml
-+++ b/application/pom.xml
-@@ -79,7 +79,6 @@
- 		<module>org.openjdk.jmc.flightrecorder.ui</module>
- 		<module>org.openjdk.jmc.greychart</module>
- 		<module>org.openjdk.jmc.greychart.ui</module>
--		<module>org.openjdk.jmc.ide.jdt</module>
- 		<module>org.openjdk.jmc.ide.launch</module>
- 		<module>org.openjdk.jmc.ide.ui</module>
- 		<module>org.openjdk.jmc.jdp</module>
diff --git a/jmc/7_remove_buchen_repo.patch b/jmc/7_remove_buchen_repo.patch
deleted file mode 100644
index 3ad6bf3..0000000
--- a/jmc/7_remove_buchen_repo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# HG changeset patch
-# Parent  e578b12592dbe1e92201ab61ccdb32a1205f9b37
-
-diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
---- a/application/org.openjdk.jmc.rcp.product/pom.xml
-+++ b/application/org.openjdk.jmc.rcp.product/pom.xml
-@@ -141,11 +141,4 @@
- 		</plugins>
- 		<directory>../../target/</directory>
- 	</build>
--	<pluginRepositories>
--		<pluginRepository>
--			<id>buchen-maven-repo</id>
--			<url>http://buchen.github.io/maven-repo</url>
--			<layout>default</layout>
--		</pluginRepository>
--	</pluginRepositories>
- </project>
diff --git a/jmc/8_add_hamcrest.patch b/jmc/8_add_hamcrest.patch
deleted file mode 100644
index 5d4bc88..0000000
--- a/jmc/8_add_hamcrest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
---- 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
-@@ -12,7 +12,8 @@
-  org.openjdk.jmc.rjmx.services.jfr,
-  org.openjdk.jmc.rjmx,
-  org.openjdk.jmc.common,
-- org.openjdk.jmc.flightrecorder.configuration
-+ org.openjdk.jmc.flightrecorder.configuration,
-+ org.hamcrest.core
- Export-Package: org.openjdk.jmc.rjmx.services.jfr.test
- Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test
--Import-Package: org.openjdk.jmc.flightrecorder.jdk
-+Import-Package: org.openjdk.jmc.flightrecorder.jdk, org.hamcrest.core
diff --git a/jmc/generate_jmc_tarball.sh b/jmc/generate_jmc_tarball.sh
old mode 100755
new mode 100644
index dfe912c..237ba12
--- a/jmc/generate_jmc_tarball.sh
+++ b/jmc/generate_jmc_tarball.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-wget http://hg.openjdk.java.net/jmc/jmc/archive/ecb68ef82eb7.tar.gz
-tar xzf ecb68ef82eb7.tar.gz
-rm ecb68ef82eb7.tar.gz
-mv jmc-ecb68ef82eb7/ jmc-7.0.0/
+RELEASE=9aa7085f938b
+
+wget http://hg.openjdk.java.net/jmc/jmc/archive/${RELEASE}.tar.gz
+tar xzf ${RELEASE}.tar.gz
+rm ${RELEASE}.tar.gz
+mv jmc-${RELEASE}/ jmc-7.0.0/
 rm -r jmc-7.0.0/core/
 tar czf jmc-7.0.0.tar.gz jmc-7.0.0/
 rm -r jmc-7.0.0
diff --git a/jmc/jmc-add-hamcrest.patch b/jmc/jmc-add-hamcrest.patch
new file mode 100644
index 0000000..5d4bc88
--- /dev/null
+++ b/jmc/jmc-add-hamcrest.patch
@@ -0,0 +1,14 @@
+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
+--- 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
+@@ -12,7 +12,8 @@
+  org.openjdk.jmc.rjmx.services.jfr,
+  org.openjdk.jmc.rjmx,
+  org.openjdk.jmc.common,
+- org.openjdk.jmc.flightrecorder.configuration
++ org.openjdk.jmc.flightrecorder.configuration,
++ org.hamcrest.core
+ Export-Package: org.openjdk.jmc.rjmx.services.jfr.test
+ Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test
+-Import-Package: org.openjdk.jmc.flightrecorder.jdk
++Import-Package: org.openjdk.jmc.flightrecorder.jdk, org.hamcrest.core
diff --git a/jmc/jmc-remove-buchen-repo.patch b/jmc/jmc-remove-buchen-repo.patch
new file mode 100644
index 0000000..3ad6bf3
--- /dev/null
+++ b/jmc/jmc-remove-buchen-repo.patch
@@ -0,0 +1,18 @@
+# HG changeset patch
+# Parent  e578b12592dbe1e92201ab61ccdb32a1205f9b37
+
+diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml
+--- a/application/org.openjdk.jmc.rcp.product/pom.xml
++++ b/application/org.openjdk.jmc.rcp.product/pom.xml
+@@ -141,11 +141,4 @@
+ 		</plugins>
+ 		<directory>../../target/</directory>
+ 	</build>
+-	<pluginRepositories>
+-		<pluginRepository>
+-			<id>buchen-maven-repo</id>
+-			<url>http://buchen.github.io/maven-repo</url>
+-			<layout>default</layout>
+-		</pluginRepository>
+-	</pluginRepositories>
+ </project>
diff --git a/jmc/jmc-remove-ide-jdt.patch b/jmc/jmc-remove-ide-jdt.patch
new file mode 100644
index 0000000..3b2cae9
--- /dev/null
+++ b/jmc/jmc-remove-ide-jdt.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# Parent  361c91e54fb1074e7483ec160a4dac6c1675d649
+
+diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml
+--- a/application/org.openjdk.jmc.feature.ide/feature.xml
++++ b/application/org.openjdk.jmc.feature.ide/feature.xml
+@@ -65,11 +65,4 @@
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-
+-   <plugin
+-         id="org.openjdk.jmc.ide.jdt"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+ </feature>
+\ No newline at end of file
+diff --git a/application/pom.xml b/application/pom.xml
+--- a/application/pom.xml
++++ b/application/pom.xml
+@@ -79,7 +79,6 @@
+ 		<module>org.openjdk.jmc.flightrecorder.ui</module>
+ 		<module>org.openjdk.jmc.greychart</module>
+ 		<module>org.openjdk.jmc.greychart.ui</module>
+-		<module>org.openjdk.jmc.ide.jdt</module>
+ 		<module>org.openjdk.jmc.ide.launch</module>
+ 		<module>org.openjdk.jmc.ide.ui</module>
+ 		<module>org.openjdk.jmc.jdp</module>
diff --git a/jmc/jmc-remove-localization.patch b/jmc/jmc-remove-localization.patch
new file mode 100644
index 0000000..63b2cce
--- /dev/null
+++ b/jmc/jmc-remove-localization.patch
@@ -0,0 +1,47 @@
+diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
+--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
++++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
+@@ -52,18 +52,10 @@
+          version="0.0.0"/>
+ 
+    <includes
+-         id="org.openjdk.jmc.feature.rcp.ja"
+-         version="0.0.0"/>
+-
+-   <includes
+          id="org.openjdk.jmc.feature.core"
+          version="0.0.0"/>
+ 
+    <includes
+-         id="org.openjdk.jmc.feature.rcp.zh_CN"
+-         version="0.0.0"/>
+-
+-   <includes
+          id="org.openjdk.jmc.feature.flightrecorder"
+          version="0.0.0"/>
+ 
+@@ -105,24 +97,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.openjdk.jmc.rcp.application.ja"
+-         nl="ja_JP,ja"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.openjdk.jmc.rcp.application.zh_CN"
+-         nl="zh_CN"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.openjdk.jmc.rcp.intro"
+          download-size="0"
+          install-size="0"
diff --git a/jmc/jmc-remove-openjfx.patch b/jmc/jmc-remove-openjfx.patch
new file mode 100644
index 0000000..fd880b6
--- /dev/null
+++ b/jmc/jmc-remove-openjfx.patch
@@ -0,0 +1,88 @@
+# HG changeset patch
+# Parent  4e9c9a478de6b87b18d01e9eed070a251a9bb2c7
+
+diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
+--- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
++++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
+@@ -94,13 +94,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.openjdk.jmc.javafx.osgi"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.openjdk.jmc.flightrecorder.rules.extensionprovider"
+          download-size="0"
+          install-size="0"
+diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
+--- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
++++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
+@@ -9,7 +9,6 @@
+ Require-Bundle: org.openjdk.jmc.rjmx,
+  org.openjdk.jmc.flightrecorder;visibility:=reexport,
+  org.openjdk.jmc.ui;visibility:=reexport,
+- org.openjdk.jmc.javafx.osgi,
+  org.openjdk.jmc.flightrecorder.rules,
+  org.openjdk.jmc.flightrecorder.rules.jdk,
+  org.openjdk.jmc.flightrecorder.configuration,
+diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
++++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+@@ -11,7 +11,6 @@
+ Export-Package: org.openjdk.jmc.rjmx,
+  org.openjdk.jmc.rjmx.actionprovider;
+   x-friends:="org.openjdk.jmc.console.ui,
+-   org.openjdk.jmc.joverflow.ui,
+    org.openjdk.jmc.console.persistence,
+    org.openjdk.jmc.flightrecorder.controlpanel.ui,
+    org.openjdk.jmc.browser",
+diff --git a/application/pom.xml b/application/pom.xml
+--- a/application/pom.xml
++++ b/application/pom.xml
+@@ -61,12 +61,10 @@
+ 		<module>org.openjdk.jmc.feature.core</module>
+ 		<module>org.openjdk.jmc.feature.flightrecorder</module>
+ 		<module>org.openjdk.jmc.feature.flightrecorder.ext.g1</module>
+-		<module>org.openjdk.jmc.feature.flightrecorder.ext.jfx</module>
+ 		<module>org.openjdk.jmc.feature.flightrecorder.metadata</module>
+ 		<module>org.openjdk.jmc.feature.ide</module>
+ 		<module>org.openjdk.jmc.feature.ide.launch</module>
+ 		<module>org.openjdk.jmc.feature.jconsole</module>
+-		<module>org.openjdk.jmc.feature.joverflow</module>
+ 		<module>org.openjdk.jmc.feature.license</module>
+ 		<module>org.openjdk.jmc.feature.pde</module>
+ 		<module>org.openjdk.jmc.feature.rcp</module>
+@@ -75,7 +73,6 @@
+ 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
+ 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
+ 		<module>org.openjdk.jmc.flightrecorder.ext.g1</module>
+-		<module>org.openjdk.jmc.flightrecorder.ext.jfx</module>
+ 		<module>org.openjdk.jmc.flightrecorder.metadata</module>
+ 		<module>org.openjdk.jmc.flightrecorder.pde</module>
+ 		<module>org.openjdk.jmc.flightrecorder.rules.extensionprovider</module>
+@@ -85,10 +82,7 @@
+ 		<module>org.openjdk.jmc.ide.jdt</module>
+ 		<module>org.openjdk.jmc.ide.launch</module>
+ 		<module>org.openjdk.jmc.ide.ui</module>
+-		<module>org.openjdk.jmc.javafx.osgi</module>
+ 		<module>org.openjdk.jmc.jdp</module>
+-		<module>org.openjdk.jmc.joverflow</module>
+-		<module>org.openjdk.jmc.joverflow.ui</module>
+ 		<module>org.openjdk.jmc.osgi.extension</module>
+ 		<module>org.openjdk.jmc.pde</module>
+ 		<module>org.openjdk.jmc.rcp.application</module>
+diff --git a/application/tests/pom.xml b/application/tests/pom.xml
+--- a/application/tests/pom.xml
++++ b/application/tests/pom.xml
+@@ -48,7 +48,6 @@
+ 		<module>org.openjdk.jmc.greychart.test</module>
+ 		<module>org.openjdk.jmc.ide.launch.test</module>
+ 		<module>org.openjdk.jmc.jdp.test</module>
+-		<module>org.openjdk.jmc.joverflow.test</module>
+ 		<module>org.openjdk.jmc.rjmx.services.jfr.test</module>
+ 		<module>org.openjdk.jmc.rjmx.test</module>
+ 		<module>org.openjdk.jmc.ui.common.test</module>
diff --git a/jmc/jmc-remove-profiles.patch b/jmc/jmc-remove-profiles.patch
new file mode 100644
index 0000000..9aac2ff
--- /dev/null
+++ b/jmc/jmc-remove-profiles.patch
@@ -0,0 +1,91 @@
+diff --git a/pom.xml b/pom.xml
+--- a/pom.xml
++++ b/pom.xml
+@@ -95,53 +95,6 @@
+ 			<url>${snapshot.repo}</url>
+ 		</snapshotRepository>
+ 	</distributionManagement>
+-	<profiles>
+-		<profile>
+-			<id>photon</id>
+-			<activation>
+-				<activeByDefault>true</activeByDefault>
+-			</activation>
+-			<build>
+-				<plugins>
+-					<plugin>
+-						<groupId>org.eclipse.tycho</groupId>
+-						<artifactId>target-platform-configuration</artifactId>
+-						<version>${tycho.version}</version>
+-						<configuration>
+-							<target>
+-								<artifact>
+-									<groupId>org.openjdk.jmc</groupId>
+-									<artifactId>platform-definition-photon</artifactId>
+-									<version>7.0.0-SNAPSHOT</version>
+-								</artifact>
+-							</target>
+-						</configuration>
+-					</plugin>
+-				</plugins>
+-			</build>
+-		</profile>
+-		<profile>
+-			<id>oxygen</id>
+-			<build>
+-				<plugins>
+-					<plugin>
+-						<groupId>org.eclipse.tycho</groupId>
+-						<artifactId>target-platform-configuration</artifactId>
+-						<version>${tycho.version}</version>
+-						<configuration>
+-							<target>
+-								<artifact>
+-									<groupId>org.openjdk.jmc</groupId>
+-									<artifactId>platform-definition-oxygen</artifactId>
+-									<version>7.0.0-SNAPSHOT</version>
+-								</artifact>
+-							</target>
+-						</configuration>
+-					</plugin>
+-				</plugins>
+-			</build>
+-		</profile>
+-	</profiles>
+ 	<build>
+ 		<plugins>
+ 			<plugin>
+diff --git a/releng/platform-definitions/platform-definition-oxygen/.project b/releng/platform-definitions/platform-definition-oxygen/.project
+--- a/releng/platform-definitions/platform-definition-oxygen/.project
++++ b/releng/platform-definitions/platform-definition-oxygen/.project
+@@ -5,7 +5,13 @@
+ 	<projects>
+ 	</projects>
+ 	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.m2e.core.maven2Builder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
+ 	</buildSpec>
+ 	<natures>
++		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ 	</natures>
+ </projectDescription>
+diff --git a/releng/platform-definitions/platform-definition-photon/.project b/releng/platform-definitions/platform-definition-photon/.project
+--- a/releng/platform-definitions/platform-definition-photon/.project
++++ b/releng/platform-definitions/platform-definition-photon/.project
+@@ -5,7 +5,13 @@
+ 	<projects>
+ 	</projects>
+ 	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.m2e.core.maven2Builder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
+ 	</buildSpec>
+ 	<natures>
++		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ 	</natures>
+ </projectDescription>
diff --git a/jmc/jmc-remove-twitter.patch b/jmc/jmc-remove-twitter.patch
new file mode 100644
index 0000000..545e843
--- /dev/null
+++ b/jmc/jmc-remove-twitter.patch
@@ -0,0 +1,277 @@
+diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
++++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+@@ -54,7 +54,6 @@
+  org.openjdk.jmc.rjmx.triggers;
+   x-friends:="org.openjdk.jmc.console.ui.notification,
+    org.openjdk.jmc.alert,
+-   org.openjdk.jmc.console.twitter,
+    org.openjdk.jmc.rjmx.test",
+  org.openjdk.jmc.rjmx.triggers.actions.internal;x-friends:="org.openjdk.jmc.console.ui.notification",
+  org.openjdk.jmc.rjmx.triggers.condition.internal;x-friends:="org.openjdk.jmc.console.ui.notification,org.openjdk.jmc.test.jemmy",
+diff --git a/application/org.openjdk.jmc.updatesite.ide/category.xml b/application/org.openjdk.jmc.updatesite.ide/category.xml
+--- a/application/org.openjdk.jmc.updatesite.ide/category.xml
++++ b/application/org.openjdk.jmc.updatesite.ide/category.xml
+@@ -55,10 +55,6 @@
+ 		id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0">
+ 		<category name="Console (Experimental)" />
+ 	</feature>
+-	<feature url="features/org.openjdk.jmc.feature.twitter_0.0.0.jar"
+-		id="org.openjdk.jmc.feature.twitter" version="0.0.0">
+-		<category name="Console (Experimental)" />
+-	</feature>
+ 	<feature
+ 		url="features/org.openjdk.jmc.feature.flightrecorder.ext.g1_0.0.0.jar"
+ 		id="org.openjdk.jmc.feature.flightrecorder.ext.g1" version="0.0.0">
+diff --git a/application/org.openjdk.jmc.updatesite.ide/feature.xml b/application/org.openjdk.jmc.updatesite.ide/feature.xml
+--- a/application/org.openjdk.jmc.updatesite.ide/feature.xml
++++ b/application/org.openjdk.jmc.updatesite.ide/feature.xml
+@@ -67,10 +67,6 @@
+          version="0.0.0"/>
+ 
+    <includes
+-         id="org.openjdk.jmc.feature.twitter"
+-         version="0.0.0"/>
+-
+-   <includes
+          id="org.openjdk.jmc.feature.joverflow"
+          version="0.0.0"/>
+ 
+diff --git a/application/org.openjdk.jmc.updatesite.rcp/category.xml b/application/org.openjdk.jmc.updatesite.rcp/category.xml
+--- a/application/org.openjdk.jmc.updatesite.rcp/category.xml
++++ b/application/org.openjdk.jmc.updatesite.rcp/category.xml
+@@ -55,10 +55,6 @@
+ 		id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0">
+ 		<category name="Console (Experimental)" />
+ 	</feature>
+-	<feature url="features/org.openjdk.jmc.feature.twitter_0.0.0.jar"
+-		id="org.openjdk.jmc.feature.twitter" version="0.0.0">
+-		<category name="Console (Experimental)" />
+-	</feature>
+ 	<feature
+ 		url="features/org.openjdk.jmc.feature.joverflow_0.0.0.jar"
+ 		id="org.openjdk.jmc.feature.joverflow" version="0.0.0">
+diff --git a/application/org.openjdk.jmc.updatesite.rcp/feature.xml b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
+--- a/application/org.openjdk.jmc.updatesite.rcp/feature.xml
++++ b/application/org.openjdk.jmc.updatesite.rcp/feature.xml
+@@ -67,10 +67,6 @@
+          version="0.0.0"/>
+ 
+    <includes
+-         id="org.openjdk.jmc.feature.twitter"
+-         version="0.0.0"/>
+-
+-   <includes
+          id="org.openjdk.jmc.feature.joverflow"
+          version="0.0.0"/>
+ 
+diff --git a/application/pom.xml b/application/pom.xml
+--- a/application/pom.xml
++++ b/application/pom.xml
+@@ -50,7 +50,6 @@
+ 		<module>org.openjdk.jmc.console.jconsole</module>
+ 		<module>org.openjdk.jmc.console.pde</module>
+ 		<module>org.openjdk.jmc.console.persistence</module>
+-		<module>org.openjdk.jmc.console.twitter</module>
+ 		<module>org.openjdk.jmc.console.ui</module>
+ 		<module>org.openjdk.jmc.console.ui.diagnostic</module>
+ 		<module>org.openjdk.jmc.console.ui.mbeanbrowser</module>
+@@ -72,7 +71,6 @@
+ 		<module>org.openjdk.jmc.feature.pde</module>
+ 		<module>org.openjdk.jmc.feature.rcp</module>
+ 		<module>org.openjdk.jmc.feature.rcp.update</module>
+-		<module>org.openjdk.jmc.feature.twitter</module>
+ 		<module>org.openjdk.jmc.flightrecorder.configuration</module>
+ 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
+ 		<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
+diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt
+--- a/license/THIRDPARTYREADME.txt
++++ b/license/THIRDPARTYREADME.txt
+@@ -367,187 +367,3 @@
+ 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.
+-
+-
+-%% The following notice is provided with respect to Twitter4J 4.0.6,
+-which may be included with this product.
+-
+-
+-                                 Apache License
+-                           Version 2.0, January 2004
+-                        http://www.apache.org/licenses/
+-
+-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+-
+-   1. Definitions.
+-
+-      "License" shall mean the terms and conditions for use, reproduction,
+-      and distribution as defined by Sections 1 through 9 of this document.
+-
+-      "Licensor" shall mean the copyright owner or entity authorized by
+-      the copyright owner that is granting the License.
+-
+-      "Legal Entity" shall mean the union of the acting entity and all
+-      other entities that control, are controlled by, or are under common
+-      control with that entity. For the purposes of this definition,
+-      "control" means (i) the power, direct or indirect, to cause the
+-      direction or management of such entity, whether by contract or
+-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+-      outstanding shares, or (iii) beneficial ownership of such entity.
+-
+-      "You" (or "Your") shall mean an individual or Legal Entity
+-      exercising permissions granted by this License.
+-
+-      "Source" form shall mean the preferred form for making modifications,
+-      including but not limited to software source code, documentation
+-      source, and configuration files.
+-
+-      "Object" form shall mean any form resulting from mechanical
+-      transformation or translation of a Source form, including but
+-      not limited to compiled object code, generated documentation,
+-      and conversions to other media types.
+-
+-      "Work" shall mean the work of authorship, whether in Source or
+-      Object form, made available under the License, as indicated by a
+-      copyright notice that is included in or attached to the work
+-      (an example is provided in the Appendix below).
+-
+-      "Derivative Works" shall mean any work, whether in Source or Object
+-      form, that is based on (or derived from) the Work and for which the
+-      editorial revisions, annotations, elaborations, or other modifications
+-      represent, as a whole, an original work of authorship. For the purposes
+-      of this License, Derivative Works shall not include works that remain
+-      separable from, or merely link (or bind by name) to the interfaces of,
+-      the Work and Derivative Works thereof.
+-
+-      "Contribution" shall mean any work of authorship, including
+-      the original version of the Work and any modifications or additions
+-      to that Work or Derivative Works thereof, that is intentionally
+-      submitted to Licensor for inclusion in the Work by the copyright owner
+-      or by an individual or Legal Entity authorized to submit on behalf of
+-      the copyright owner. For the purposes of this definition, "submitted"
+-      means any form of electronic, verbal, or written communication sent
+-      to the Licensor or its representatives, including but not limited to
+-      communication on electronic mailing lists, source code control systems,
+-      and issue tracking systems that are managed by, or on behalf of, the
+-      Licensor for the purpose of discussing and improving the Work, but
+-      excluding communication that is conspicuously marked or otherwise
+-      designated in writing by the copyright owner as "Not a Contribution."
+-
+-      "Contributor" shall mean Licensor and any individual or Legal Entity
+-      on behalf of whom a Contribution has been received by Licensor and
+-      subsequently incorporated within the Work.
+-
+-   2. Grant of Copyright License. Subject to the terms and conditions of
+-      this License, each Contributor hereby grants to You a perpetual,
+-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+-      copyright license to reproduce, prepare Derivative Works of,
+-      publicly display, publicly perform, sublicense, and distribute the
+-      Work and such Derivative Works in Source or Object form.
+-
+-   3. Grant of Patent License. Subject to the terms and conditions of
+-      this License, each Contributor hereby grants to You a perpetual,
+-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+-      (except as stated in this section) patent license to make, have made,
+-      use, offer to sell, sell, import, and otherwise transfer the Work,
+-      where such license applies only to those patent claims licensable
+-      by such Contributor that are necessarily infringed by their
+-      Contribution(s) alone or by combination of their Contribution(s)
+-      with the Work to which such Contribution(s) was submitted. If You
+-      institute patent litigation against any entity (including a
+-      cross-claim or counterclaim in a lawsuit) alleging that the Work
+-      or a Contribution incorporated within the Work constitutes direct
+-      or contributory patent infringement, then any patent licenses
+-      granted to You under this License for that Work shall terminate
+-      as of the date such litigation is filed.
+-
+-   4. Redistribution. You may reproduce and distribute copies of the
+-      Work or Derivative Works thereof in any medium, with or without
+-      modifications, and in Source or Object form, provided that You
+-      meet the following conditions:
+-
+-      (a) You must give any other recipients of the Work or
+-          Derivative Works a copy of this License; and
+-
+-      (b) You must cause any modified files to carry prominent notices
+-          stating that You changed the files; and
+-
+-      (c) You must retain, in the Source form of any Derivative Works
+-          that You distribute, all copyright, patent, trademark, and
+-          attribution notices from the Source form of the Work,
+-          excluding those notices that do not pertain to any part of
+-          the Derivative Works; and
+-
+-      (d) If the Work includes a "NOTICE" text file as part of its
+-          distribution, then any Derivative Works that You distribute must
+-          include a readable copy of the attribution notices contained
+-          within such NOTICE file, excluding those notices that do not
+-          pertain to any part of the Derivative Works, in at least one
+-          of the following places: within a NOTICE text file distributed
+-          as part of the Derivative Works; within the Source form or
+-          documentation, if provided along with the Derivative Works; or,
+-          within a display generated by the Derivative Works, if and
+-          wherever such third-party notices normally appear. The contents
+-          of the NOTICE file are for informational purposes only and
+-          do not modify the License. You may add Your own attribution
+-          notices within Derivative Works that You distribute, alongside
+-          or as an addendum to the NOTICE text from the Work, provided
+-          that such additional attribution notices cannot be construed
+-          as modifying the License.
+-
+-      You may add Your own copyright statement to Your modifications and
+-      may provide additional or different license terms and conditions
+-      for use, reproduction, or distribution of Your modifications, or
+-      for any such Derivative Works as a whole, provided Your use,
+-      reproduction, and distribution of the Work otherwise complies with
+-      the conditions stated in this License.
+-
+-   5. Submission of Contributions. Unless You explicitly state otherwise,
+-      any Contribution intentionally submitted for inclusion in the Work
+-      by You to the Licensor shall be under the terms and conditions of
+-      this License, without any additional terms or conditions.
+-      Notwithstanding the above, nothing herein shall supersede or modify
+-      the terms of any separate license agreement you may have executed
+-      with Licensor regarding such Contributions.
+-
+-   6. Trademarks. This License does not grant permission to use the trade
+-      names, trademarks, service marks, or product names of the Licensor,
+-      except as required for reasonable and customary use in describing the
+-      origin of the Work and reproducing the content of the NOTICE file.
+-
+-   7. Disclaimer of Warranty. Unless required by applicable law or
+-      agreed to in writing, Licensor provides the Work (and each
+-      Contributor provides its Contributions) on an "AS IS" BASIS,
+-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+-      implied, including, without limitation, any warranties or conditions
+-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+-      PARTICULAR PURPOSE. You are solely responsible for determining the
+-      appropriateness of using or redistributing the Work and assume any
+-      risks associated with Your exercise of permissions under this License.
+-
+-   8. Limitation of Liability. In no event and under no legal theory,
+-      whether in tort (including negligence), contract, or otherwise,
+-      unless required by applicable law (such as deliberate and grossly
+-      negligent acts) or agreed to in writing, shall any Contributor be
+-      liable to You for damages, including any direct, indirect, special,
+-      incidental, or consequential damages of any character arising as a
+-      result of this License or out of the use or inability to use the
+-      Work (including but not limited to damages for loss of goodwill,
+-      work stoppage, computer failure or malfunction, or any and all
+-      other commercial damages or losses), even if such Contributor
+-      has been advised of the possibility of such damages.
+-
+-   9. Accepting Warranty or Additional Liability. While redistributing
+-      the Work or Derivative Works thereof, You may choose to offer,
+-      and charge a fee for, acceptance of support, warranty, indemnity,
+-      or other liability obligations and/or rights consistent with this
+-      License. However, in accepting such obligations, You may act only
+-      on Your own behalf and on Your sole responsibility, not on behalf
+-      of any other Contributor, and only if You agree to indemnify,
+-      defend, and hold each Contributor harmless for any liability
+-      incurred by, or claims asserted against, such Contributor by reason
+-      of your accepting any such warranty or additional liability.
+-
+-Twitter4J SUBCOMPONENTS:
+-
+-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
diff --git a/jmc/jmc-update-ee.patch b/jmc/jmc-update-ee.patch
new file mode 100644
index 0000000..97c63b0
--- /dev/null
+++ b/jmc/jmc-update-ee.patch
@@ -0,0 +1,32 @@
+diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
+--- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
++++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
+@@ -10,7 +10,6 @@
+ Require-Bundle: org.openjdk.jmc.rjmx.ui;visibility:=reexport,
+  org.eclipse.e4.core.contexts;bundle-version="1.3.0",
+  org.eclipse.e4.core.di;bundle-version="1.3.0";visibility:=reexport,
+- javax.annotation;bundle-version="1.0.0";visibility:=reexport,
+  javax.inject;bundle-version="1.0.0";visibility:=reexport,
+  org.openjdk.jmc.commands
+ Bundle-ActivationPolicy: lazy
+@@ -22,7 +21,6 @@
+  org.openjdk.jmc.console.ui.editor,
+  org.openjdk.jmc.console.ui.editor.internal;x-friends:="org.openjdk.jmc.console.ui.mbeanbrowser,org.openjdk.jmc.rcp.intro"
+ Bundle-ClassPath: .
+-Import-Package: javax.annotation;version="1.0.0",
+- javax.inject;version="1.0.0"
++Import-Package: javax.inject;version="1.0.0"
+ Automatic-Module-Name: org.openjdk.jmc.console.ui
+ 
+diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
+--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
++++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
+@@ -84,7 +84,7 @@
+       <import plugin="org.eclipse.ui.intro"/>
+       <import plugin="org.eclipse.ui.net"/>
+       <import plugin="org.eclipse.equinox.event"/>
+-      <import plugin="javax.el"/>
++      <import plugin="com.sun.el.javax.el"/>
+       <import plugin="org.eclipse.equinox.p2.director.app"/>
+    </requires>
+ 
diff --git a/jmc/jmc-update-javamail.patch b/jmc/jmc-update-javamail.patch
new file mode 100644
index 0000000..3078bd3
--- /dev/null
+++ b/jmc/jmc-update-javamail.patch
@@ -0,0 +1,40 @@
+diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
+--- a/application/org.openjdk.jmc.feature.core/feature.xml
++++ b/application/org.openjdk.jmc.feature.core/feature.xml
+@@ -161,35 +161,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="javax.mail.api"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.mail.dsn"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.mail.imap"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.mail.pop3"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.mail.smtp"
++         id="com.sun.mail.jakarta.mail"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
diff --git a/jmc/jmc.spec b/jmc/jmc.spec
index a44fb4a..6c6885e 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -1,6 +1,32 @@
+# Version
+%global major 7
+%global minor 0
+%global patchlevel 0
+ 
+# Revision
+%global revnum 5
+# set to 1 for hg snapshots, 0 for release
+%global usesnapshot 1
+ 
+# SNAPSHOT version
+%global hgrevhash 9aa7085f938b
+%global hgrevdate 20181122
+ 
+%if %{usesnapshot}
+  %global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash}
+%else
+  %global releasestr %{revnum}
+%endif
+
+%global debug_package %{nil}
+
+# /usr/lib64/jmc
+%global _jmcdir             %{_libdir}/%{name}
+%global _eclipsepluginsdir  %{_libexecdir}eclipse/plugins
+
 Name:       jmc
-Version:    7.0.0
-Release:    2%{?dist}
+Version:    %{major}.%{minor}.%{patchlevel}
+Release:    %{releasestr}%{?dist}
 Summary:    Java Mission Control is a profiling and diagnostics tool
 
 License:    UPL
@@ -8,37 +34,41 @@ URL:        http://openjdk.java.net/projects/jmc/
 
 # original source: http://hg.openjdk.java.net/jmc/jmc/archive/tip.tar.gz
 # Execute this script to download and generate source tarball:
-#   ./generate_jmc_tarball.sh 
+#   bash ./generate_jmc_tarball.sh 
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.desktop
 Source2:    %{name}.1
+Source3:    generate_jmc_tarball.sh
+Source4:    symlink_eclipse_libs.sh
 
 # Remove optional twitter related functionality
-Patch0:     0_remove_twitter.patch
+Patch0:     jmc-remove-twitter.patch
 # Update javamail dependency names to match what is found in Fedora
-Patch1:     1_javamail.patch
+Patch1:     jmc-update-javamail.patch
 # Update javax dependency names to match what is found in Fedora
-Patch2:     2_javax.patch
+Patch2:     jmc-update-ee.patch
 # Remove maven build profiles that won't be used in local build
-Patch3:     3_remove_profiles.patch
+Patch3:     jmc-remove-profiles.patch
 # Remove localization files that currently cannot be supported
 # due to a packaging issue for Eclipse language packs
 # eclipse-nls-ja and eclipse-nls-zh
 # They currently provide multiple archs within the same package
 # and the local build system cannot fulfill dependencies from them
-Patch4:     4_remove_localization.patch
+Patch4:     jmc-remove-localization.patch
 # Remove optional openjfx related functionality
-Patch5:     5_remove_jfx.patch
+Patch5:     jmc-remove-openjfx.patch
 # Remove unused module org.openjdk.jmc.ide.jdt
-Patch6:     6_remove_ide_jdt.patch
+Patch6:     jmc-remove-ide-jdt.patch
 # Remove unused remote repository definition
-Patch7:     7_remove_buchen_repo.patch
-# Add dependency on org. hamcrest-core to provide class used in unit tests
-Patch8:     8_add_hamcrest.patch
+Patch7:     jmc-remove-buchen-repo.patch
+# Add dependency on org.hamcrest-core to provide class used in unit tests
+Patch8:     jmc-add-hamcrest.patch
 
+BuildRequires:  atinject
 BuildRequires:  buildnumber-maven-plugin
 BuildRequires:  desktop-file-utils
 BuildRequires:  directory-maven-plugin
+BuildRequires:  eclipse-platform
 BuildRequires:  eclipse-tests
 BuildRequires:  fix-info-plist-maven-plugin
 BuildRequires:  glassfish-annotation-api
@@ -47,10 +77,26 @@ BuildRequires:  javamail
 BuildRequires:  jmc-core
 BuildRequires:  maven-deploy-plugin
 BuildRequires:  maven-enforcer-plugin
+BuildRequires:  maven-install-plugin
 BuildRequires:  maven-local
+BuildRequires:  maven-site-plugin
 BuildRequires:  tycho
 
-Requires:       java-11-openjdk
+
+Requires:       osgi(com.ibm.icu)
+Requires:       osgi(com.sun.el.javax.el)
+Requires:       osgi(com.sun.mail.jakarta.mail)
+Requires:       osgi(javax.servlet.jsp)
+Requires:       osgi(org.apache.felix.gogo.command)
+Requires:       osgi(org.eclipse.equinox.http.servlet)
+Requires:       osgi(org.eclipse.jetty.continuation)
+Requires:       osgi(org.eclipse.jetty.http)
+Requires:       osgi(org.eclipse.jetty.io)
+Requires:       osgi(org.eclipse.jetty.security)
+Requires:       osgi(org.eclipse.jetty.server)
+Requires:       osgi(org.eclipse.jetty.servlet)
+Requires:       osgi(org.eclipse.jetty.util)
+Requires:       osgi(org.glassfish.web.javax.servlet.jsp)
 
 %description
 Java Mission Control is a powerful profiler for HotSpot JVMs and has an 
@@ -59,10 +105,6 @@ extensive data collected by Java Flight Recorder. The tool chain enables
 developers and administrators to collect and analyze data from Java 
 applications running locally or deployed in production environments.
 
-%global debug_package %{nil}
-
-%global _jmcdir %{_libdir}/%{name}
-
 %prep
 %setup -q
 
@@ -92,12 +134,15 @@ applications running locally or deployed in production environments.
 sed -i '/^-vm$/d' %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
 sed -i '/^..\/..\/bin\/$/d' %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
 
+# add IgnoreUnrecognizedVMOptions flag to allow running on OpenJDK 8 without 'Unrecognized VM option' error
+sed -i '/^-vmargs$/a -XX:+IgnoreUnrecognizedVMOptions' %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
+
 # delete unnecessary files
 rm -r %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/p2/
 
 # move contents of target/products/org.openjdk.jmc/linux/gtk/x86_64/ to /usr/lib/jmc/
 install -d -m 755 %{buildroot}%{_jmcdir}/
-cp -p -r %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/* %{buildroot}%{_jmcdir}/
+cp -pr %{_builddir}/%{name}-%{version}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/* %{buildroot}%{_jmcdir}/
 
 # create symlink to jmc in /usr/bin/
 install -d -m 755 %{buildroot}%{_bindir}
@@ -118,6 +163,13 @@ install -p -m 644 %{_builddir}/%{name}-%{version}/pom.xml \
 install -d -m 755 %{buildroot}%{_mandir}/man1
 install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1
 
+# replace jars with symlinks to installed libs
+pushd %{buildroot}%{_jmcdir}/plugins
+  xmvn-subst -L true -R %{buildroot} .
+popd
+
+bash %{SOURCE4} %{buildroot}%{_jmcdir}/plugins
+
 %files
 %license license/LICENSE.txt
 %license license/THIRDPARTYREADME.txt
@@ -130,8 +182,5 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Mon Nov 05 2018 Salman Siddiqui <sasiddiq@redhat.com> - 7.0.0-2
-- Changed installation directory from /usr/share/java/jmc to /usr/share/jmc
-
-* Fri Sep 14 2018 Salman Siddiqui <sasiddiq@redhat.com> - 7.0.0-1
+* Fri Sep 14 2018 Salman Siddiqui <sasiddiq@redhat.com> - 7.0.0-9.20181122hg9aa7085f938b
 - Initial packaging
diff --git a/jmc/symlink_eclipse_libs.sh b/jmc/symlink_eclipse_libs.sh
new file mode 100644
index 0000000..7460bfe
--- /dev/null
+++ b/jmc/symlink_eclipse_libs.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# This script replaces plugins with symlinks
+# $1 : folder of jars to replace with symlinks
+# $2 : folder of jars to be symlinked to
+set -e
+
+ECLIPSE_DIR=/usr/lib/eclipse/plugins
+
+JARS="
+org.eclipse.core*.jar
+org.eclipse.e4*.jar
+org.eclipse.ecf*.jar
+org.eclipse.equinox.app*.jar
+org.eclipse.equinox.bidi*.jar
+org.eclipse.equinox.common*.jar
+org.eclipse.equinox.concurrent*.jar
+org.eclipse.equinox.ds*.jar
+org.eclipse.equinox.event*.jar
+org.eclipse.equinox.frameworkadmin*.jar
+org.eclipse.equinox.http*.jar
+org.eclipse.equinox.jsp*.jar
+org.eclipse.equinox.p2*.jar
+org.eclipse.equinox.preferences*.jar
+org.eclipse.equinox.registry*.jar
+org.eclipse.equinox.security*.jar
+org.eclipse.equinox.simpleconfigurator*.jar
+org.eclipse.equinox.util*.jar
+org.eclipse.help*.jar
+org.eclipse.jdt*.jar
+org.eclipse.jface*.jar
+org.eclipse.rcp*.jar
+org.eclipse.swt*.jar
+org.eclipse.text*.jar
+org.eclipse.ui*.jar
+org.eclipse.update*.jar
+"
+
+# org.eclipse.equinox.launcher determines what launches
+
+function _sym {
+	if [ -f $1 ]
+	then
+		echo "linking $1 to $2"
+		rm -rf $1
+		ln -s $2 $1
+	else
+		echo "failed to link $1 to $2"
+		exit 1
+	fi
+}
+
+for name in ${JARS}; do
+	echo ${name}
+done
+
+pushd $1
+	for name in ${JARS}; do
+		for i in ${name}; do 
+			_sym $i ${ECLIPSE_DIR}/$i
+		done
+	done
+popd
+

