.gitignore

@@ -1 +1 @@
-SOURCES/63ec7d0ee8d9.tar.gz
+SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz

.jmc-core.metadata

@@ -1 +1 @@
-338d16384227ae5583f467e5981780da303bd425 SOURCES/63ec7d0ee8d9.tar.gz
+d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz

SOURCES/0-amend-lz4-java-reference.patch

@@ -0,0 +1,10 @@
+diff --git a/org.openjdk.jmc.common/META-INF/MANIFEST.MF b/org.openjdk.jmc.common/META-INF/MANIFEST.MF
+index 7918595..5ed0b0a 100644
+--- a/org.openjdk.jmc.common/META-INF/MANIFEST.MF
++++ b/org.openjdk.jmc.common/META-INF/MANIFEST.MF
+@@ -13,4 +13,4 @@ Export-Package: org.openjdk.jmc.common,
+  org.openjdk.jmc.common.util,
+  org.openjdk.jmc.common.version
+ Automatic-Module-Name: org.openjdk.jmc.common
+-Require-Bundle: org.owasp.encoder, org.lz4.lz4-java
++Require-Bundle: org.owasp.encoder, lz4-java

SPECS/jmc-core.spec

@@ -1,43 +1,52 @@
 # Version
-%global major 7
+%global major 8
-%global minor 1
+%global minor 0
 %global patchlevel 1
 
 # Revision
-%global revnum 5
+%global revnum 2
-# set to 1 for hg snapshots, 0 for release
+# set to 1 for snapshots, 0 for release
 %global usesnapshot 0
 
 # SNAPSHOT version
-%global hgrevhash 63ec7d0ee8d9
+%global revhash 699a121bd449fe8a9350221282bd3f809691a766
-%global hgrevdate 20200608
+%global revdate 20210623
 
-%global tarball_name jmc7-%{hgrevhash}
+%global tarball_name jmc-%{revhash}
 
 %if %{usesnapshot}
-  %global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash}
+  %global releasestr %{revnum}.%{revdate}
 %else
   %global releasestr %{revnum}
 %endif
 
+
+# Don't require junit
+%global __requires_exclude ^osgi\\(org.junit.*$
+
 Name:     jmc-core
 Version:  %{major}.%{minor}.%{patchlevel}
-Release:  %{releasestr}%{?dist}.2
+Release:  %{releasestr}%{?dist}
 Summary:  Core API for JDK Mission Control
-# jmc source README.md states: The Mission Control source code is made
+
-# available under the Universal Permissive License (UPL), Version 1.0 or a
+License:  UPL
-# BSD-style license, alternatively. The full open source license text is
-# available at license/LICENSE.txt in the JMC project.
-License:  UPL or BSD
 URL:      http://openjdk.java.net/projects/jmc/
 
-Source0:    https://hg.openjdk.java.net/jmc/jmc7/archive/%{hgrevhash}.tar.gz
+Source0:    https://github.com/openjdk/jmc/archive/%{revhash}.tar.gz
 
 BuildArch:  noarch
+ExclusiveArch: x86_64
+
+# Change common manifest to reference lz4-java
+Patch0:    0-amend-lz4-java-reference.patch
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.commonjava.maven.plugins:directory-maven-plugin)
 BuildRequires:  mvn(org.owasp.encoder:encoder)
 
+BuildRequires: lz4-java
+
 # maven requires generator will add Require for runtime dependency
 #   on mvn(org.owasp.encoder:encoder)
 
@@ -58,16 +67,18 @@ Summary:  Javadoc for %{name}
 cp ../license/* ./
 cp ../README.md ./
 
+%patch0 -p1
+
 %pom_remove_plugin :nexus-staging-maven-plugin
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :maven-javadoc-plugin
-
 %pom_remove_plugin :jacoco-maven-plugin tests
-%pom_disable_module coverage
 
-# don't install test packages
+%pom_disable_module coverage
+%pom_disable_module org.openjdk.jmc.flightrecorder.writer
+
+# don't install test packages (aside from flightrecorder.test)
 %mvn_package org.openjdk.jmc:missioncontrol.core.tests __noinstall
-%mvn_package org.openjdk.jmc:flightrecorder.test __noinstall
 %mvn_package org.openjdk.jmc:flightrecorder.rules.test __noinstall
 %mvn_package org.openjdk.jmc:flightrecorder.rules.jdk.test __noinstall
 
@@ -90,27 +101,32 @@ cp ../README.md ./
 %doc README.md
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.1.1-5.2
+* Tue Oct 05 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuild with updated dependencies
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-5.1
+* Tue Aug 17 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Revert jmc packages to 8.0.1 release
 
-* Mon Sep 21 2020 Jie Kang <jkang@redhat.com> - 7.1.1-5
+* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.1.0-1
-- Update license
+- Update to jmc-ga tagged commit d0f89f0
-* Fri Aug 28 2020 Jie Kang <jkang@redhat.com> - 7.1.1-4
+
-- Update to latest upstream 63ec7d0ee8d9
+* Fri Feb 12 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
-* Mon Apr 27 2020 Jie Kang <jkang@redhat.com> - 7.1.1-3
+- Update to jmc8 branch commit 8ab40bf
-- Update to upstream 7.1.1 ga commit
+
-* Wed Mar 11 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-2
+* Thu Apr 23 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-3
-- Update to latest upstream to include JMC-6728
+- Update to latest commit e67446b5fc9d
-* Fri Feb 28 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-1
+
-- Update to latest upstream
+* Fri Apr 17 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-2
-* Fri Dec 20 2019 Alex Macdonald <almacdon@redhat.com> - 7.1.0-1
+- remove plugins from pom (maven-source-plugin, jacoco)
-- Update to latest upstream (7.1.0-ga) and disable jacoco & coverage
+
-* Tue Sep 24 2019 Jie Kang <jkang@redhat.com> - 7.0.0-2
+* Thu Apr 16 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-1
-- Update to latest upstream with minor bug fixes
+- Updated to version 7.1.1
-* Thu Aug 15 2019 Jie Kang <jkang@redhat.com> - 7.0.0-1
+
+* Thu Nov 14 2019 Jie Kang <jkang@redhat.com> - 7.0.0-3
+- Don't require junit
+
+* Wed Nov 13 2019 Jie Kang <jkang@redhat.com> - 7.0.0-2
 - Exclude test packages
-* Fri May 31 2019 Jie Kang <jkang@redhat.com> - 7.0.0-0
+
+* Tue Mar 12 2019 Jie Kang <jkang@redhat.com> - 7.0.0-1
 - Initial package