From f9462783624297f67c861e61115ba8b3db4cd288 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Nov 02 2018 12:28:03 +0000
Subject: Update jmc package to run unit tests during build


---

diff --git a/jmc/8_add_hamcrest.patch b/jmc/8_add_hamcrest.patch
new file mode 100644
index 0000000..5d4bc88
--- /dev/null
+++ b/jmc/8_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.spec b/jmc/jmc.spec
index cb0bad3..79cc917 100644
--- a/jmc/jmc.spec
+++ b/jmc/jmc.spec
@@ -17,8 +17,9 @@ Patch4:     4_remove_localization.patch
 Patch5:     5_remove_jfx.patch
 Patch6:     6_remove_ide_jdt.patch
 Patch7:     7_remove_buchen_repo.patch
+Patch8:     8_add_hamcrest.patch
 
-BuildRequires:  java-11-openjdk ant maven-local javapackages-tools tycho tycho-extras icu
+BuildRequires:  java-11-openjdk ant maven-local javapackages-tools tycho tycho-extras icu hamcrest-core
 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:  glassfish-annotation-api glassfish-el-api
@@ -45,6 +46,7 @@ from Java applications running locally or deployed in production environments.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %pom_disable_module releng
 %pom_disable_module l10n application
@@ -53,8 +55,6 @@ from Java applications running locally or deployed in production environments.
 
 %pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin
 
-%pom_disable_module tests application
-
 %build
 %mvn_build -j -- -Dspotbugs.skip=true