From defb701d99119152556e0d48485d2ba6229cd358 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Oct 30 2018 13:14:46 +0000
Subject: [PATCH 1/4] Update jmc packaging files for jdk 11 compatibility


---

diff --git a/jmc/2_javax.patch b/jmc/2_javax.patch
index 3715ef1..f72582a 100644
--- a/jmc/2_javax.patch
+++ b/jmc/2_javax.patch
@@ -1,34 +1,33 @@
-# HG changeset patch
-# Parent  9811e26788e979f5275fefd7e09222fcf30e91be
-
 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,8 +10,6 @@
+@@ -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.inject;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
- Export-Package: org.openjdk.jmc.console.ui.actions;
-@@ -22,7 +20,5 @@
+@@ -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",
-- javax.inject;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,6 @@
+@@ -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="javax.el-api"/>
        <import plugin="org.eclipse.equinox.p2.director.app"/>
     </requires>
  
diff --git a/jmc/8_switch_target.patch b/jmc/8_switch_target.patch
new file mode 100644
index 0000000..c7d35e0
--- /dev/null
+++ b/jmc/8_switch_target.patch
@@ -0,0 +1,14 @@
+# HG changeset patch
+# Parent  17da3a1a6bcea8c40b443f9917ccd6b3aab44210
+
+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
+@@ -139,6 +139,6 @@
+ 				</configuration>
+ 			</plugin>
+ 		</plugins>
+-		<directory>../../target/</directory>
++		<directory>./target/</directory>
+ 	</build>
+ </project>
diff --git a/jmc/jmc.spec b/jmc/jmc.spec
index 2e770b3..e14d211 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -26,9 +26,9 @@ Patch7:     7_remove_buchen_repo.patch
 BuildRequires:  java-11-openjdk ant maven-local javapackages-tools tycho tycho-extras icu
 BuildRequires:  maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plugin maven-install-plugin maven-site-plugin directory-maven-plugin fix-info-plist-maven-plugin
 BuildRequires:   eclipse-platform eclipse-equinox-osgi eclipse-tests
-BuildRequires:  javamail owasp-java-encoder jmc-core
+BuildRequires:  javamail owasp-java-encoder glassfish-annotation-api glassfish-el-api jmc-core
 
-Requires:       java-11-openjdk jaf
+Requires:       java-11-openjdk jaf glassfish-annotation-api glassfish-el-api
 
 %description
 Java Mission Control is an advanced set of tools that enables efficient and 

From 5f133fd11828ff6501b4b1a9161d8a8c26251793 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Oct 30 2018 13:18:55 +0000
Subject: [PATCH 2/4] Remove unused patch


---

diff --git a/jmc/8_switch_target.patch b/jmc/8_switch_target.patch
deleted file mode 100644
index c7d35e0..0000000
--- a/jmc/8_switch_target.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# HG changeset patch
-# Parent  17da3a1a6bcea8c40b443f9917ccd6b3aab44210
-
-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
-@@ -139,6 +139,6 @@
- 				</configuration>
- 			</plugin>
- 		</plugins>
--		<directory>../../target/</directory>
-+		<directory>./target/</directory>
- 	</build>
- </project>

From d0460b8837393514424203ce55e487df47c0aed1 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Oct 30 2018 14:29:54 +0000
Subject: [PATCH 3/4] Update jmc packaging requires


---

diff --git a/jmc/jmc.spec b/jmc/jmc.spec
index e14d211..946f5ef 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -28,7 +28,7 @@ BuildRequires:  maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plug
 BuildRequires:   eclipse-platform eclipse-equinox-osgi eclipse-tests
 BuildRequires:  javamail owasp-java-encoder glassfish-annotation-api glassfish-el-api jmc-core
 
-Requires:       java-11-openjdk jaf glassfish-annotation-api glassfish-el-api
+Requires:       java-11-openjdk
 
 %description
 Java Mission Control is an advanced set of tools that enables efficient and 

From 066db1a5d7ed30ca7bce18bdd2bdbc10bd6955c3 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Oct 30 2018 17:45:38 +0000
Subject: [PATCH 4/4] Update jmc packaging files


---

diff --git a/jmc/2_javax.patch b/jmc/2_javax.patch
index f72582a..e9456f6 100644
--- a/jmc/2_javax.patch
+++ b/jmc/2_javax.patch
@@ -22,12 +22,13 @@ diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/appli
 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 @@
+@@ -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/jmc.spec b/jmc/jmc.spec
index 946f5ef..64b8a8a 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -26,7 +26,7 @@ Patch7:     7_remove_buchen_repo.patch
 BuildRequires:  java-11-openjdk ant maven-local javapackages-tools tycho tycho-extras icu
 BuildRequires:  maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plugin maven-install-plugin maven-site-plugin directory-maven-plugin fix-info-plist-maven-plugin
 BuildRequires:   eclipse-platform eclipse-equinox-osgi eclipse-tests
-BuildRequires:  javamail owasp-java-encoder glassfish-annotation-api glassfish-el-api jmc-core
+BuildRequires:  javamail owasp-java-encoder glassfish-annotation-api glassfish-el-api jmc-core jaf
 
 Requires:       java-11-openjdk
 

