diff --git a/.gitignore b/.gitignore index e569d0b..a26e0ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz +SOURCES/63ec7d0ee8d9.tar.gz diff --git a/.jmc-core.metadata b/.jmc-core.metadata index caf14a2..1efca58 100644 --- a/.jmc-core.metadata +++ b/.jmc-core.metadata @@ -1 +1 @@ -d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz +338d16384227ae5583f467e5981780da303bd425 SOURCES/63ec7d0ee8d9.tar.gz diff --git a/SOURCES/0-amend-lz4-java-reference.patch b/SOURCES/0-amend-lz4-java-reference.patch deleted file mode 100644 index 4393936..0000000 --- a/SOURCES/0-amend-lz4-java-reference.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/SPECS/jmc-core.spec b/SPECS/jmc-core.spec index df6af20..e84641f 100644 --- a/SPECS/jmc-core.spec +++ b/SPECS/jmc-core.spec @@ -1,51 +1,43 @@ # Version -%global major 8 -%global minor 0 +%global major 7 +%global minor 1 %global patchlevel 1 # Revision -%global revnum 2 -# set to 1 for snapshots, 0 for release +%global revnum 5 +# set to 1 for hg snapshots, 0 for release %global usesnapshot 0 # SNAPSHOT version -%global revhash 699a121bd449fe8a9350221282bd3f809691a766 -%global revdate 20210623 +%global hgrevhash 63ec7d0ee8d9 +%global hgrevdate 20200608 -%global tarball_name jmc-%{revhash} +%global tarball_name jmc7-%{hgrevhash} %if %{usesnapshot} - %global releasestr %{revnum}.%{revdate} + %global releasestr %{revnum}.%{hgrevdate}hg%{hgrevhash} %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} +Release: %{releasestr}%{?dist}.2.alma Summary: Core API for JDK Mission Control - -License: UPL +# jmc source README.md states: The Mission Control source code is made +# available under the Universal Permissive License (UPL), Version 1.0 or a +# 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://github.com/openjdk/jmc/archive/%{revhash}.tar.gz +Source0: https://hg.openjdk.java.net/jmc/jmc7/archive/%{hgrevhash}.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 +BuildRequires: junit # maven requires generator will add Require for runtime dependency # on mvn(org.owasp.encoder:encoder) @@ -67,18 +59,16 @@ 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 -%pom_disable_module org.openjdk.jmc.flightrecorder.writer -# don't install test packages (aside from flightrecorder.test) +# don't install test packages %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 @@ -101,32 +91,30 @@ cp ../README.md ./ %doc README.md %changelog -* Tue Oct 05 2021 Alex Macdonald - 8.0.1-2 -- Rebuild with updated dependencies +* Tue Mar 01 2021 Eduard Abdullin - 7.1.1-5.2.alma +- Add junit to BR -* Tue Aug 17 2021 Alex Macdonald - 8.0.1-1 -- Revert jmc packages to 8.0.1 release +* Fri Apr 16 2021 Mohan Boddu - 7.1.1-5.2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -* Tue Aug 10 2021 Alex Macdonald - 8.1.0-1 -- Update to jmc-ga tagged commit d0f89f0 +* Tue Jan 26 2021 Fedora Release Engineering - 7.1.1-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Feb 12 2021 Alex Macdonald - 8.0.0-1 -- Update to jmc8 branch commit 8ab40bf - -* Thu Apr 23 2020 Alex Macdonald - 7.1.1-3 -- Update to latest commit e67446b5fc9d - -* Fri Apr 17 2020 Alex Macdonald - 7.1.1-2 -- remove plugins from pom (maven-source-plugin, jacoco) - -* Thu Apr 16 2020 Alex Macdonald - 7.1.1-1 -- Updated to version 7.1.1 - -* Thu Nov 14 2019 Jie Kang - 7.0.0-3 -- Don't require junit - -* Wed Nov 13 2019 Jie Kang - 7.0.0-2 +* Mon Sep 21 2020 Jie Kang - 7.1.1-5 +- Update license +* Fri Aug 28 2020 Jie Kang - 7.1.1-4 +- Update to latest upstream 63ec7d0ee8d9 +* Mon Apr 27 2020 Jie Kang - 7.1.1-3 +- Update to upstream 7.1.1 ga commit +* Wed Mar 11 2020 Alex Macdonald - 7.1.1-2 +- Update to latest upstream to include JMC-6728 +* Fri Feb 28 2020 Alex Macdonald - 7.1.1-1 +- Update to latest upstream +* Fri Dec 20 2019 Alex Macdonald - 7.1.0-1 +- Update to latest upstream (7.1.0-ga) and disable jacoco & coverage +* Tue Sep 24 2019 Jie Kang - 7.0.0-2 +- Update to latest upstream with minor bug fixes +* Thu Aug 15 2019 Jie Kang - 7.0.0-1 - Exclude test packages - -* Tue Mar 12 2019 Jie Kang - 7.0.0-1 +* Fri May 31 2019 Jie Kang - 7.0.0-0 - Initial package