From c107ea5fcba6d7cf20b820dec5ef3b7e2a0a4538 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 6 Oct 2021 06:01:36 -0400 Subject: [PATCH] import jmc-core-8.0.1-1.module+el8.5.0+12257+b6e7bdfa --- .gitignore | 2 +- .jmc-core.metadata | 2 +- SOURCES/0-amend-lz4-java-reference.patch | 4 ++-- SPECS/jmc-core.spec | 17 ++++++++++++----- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5d1009f..e569d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz +SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz diff --git a/.jmc-core.metadata b/.jmc-core.metadata index 6f8a31c..caf14a2 100644 --- a/.jmc-core.metadata +++ b/.jmc-core.metadata @@ -1 +1 @@ -84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz +d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz diff --git a/SOURCES/0-amend-lz4-java-reference.patch b/SOURCES/0-amend-lz4-java-reference.patch index b2f58e8..4393936 100644 --- a/SOURCES/0-amend-lz4-java-reference.patch +++ b/SOURCES/0-amend-lz4-java-reference.patch @@ -1,5 +1,5 @@ -diff --git a/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF b/core/org.openjdk.jmc.common/META-INF/MANIFEST.MF -index af4ea12..acd7831 100644 +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, diff --git a/SPECS/jmc-core.spec b/SPECS/jmc-core.spec index 917d659..f6a7445 100644 --- a/SPECS/jmc-core.spec +++ b/SPECS/jmc-core.spec @@ -1,7 +1,7 @@ # Version %global major 8 %global minor 0 -%global patchlevel 0 +%global patchlevel 1 # Revision %global revnum 1 @@ -9,8 +9,8 @@ %global usesnapshot 0 # SNAPSHOT version -%global revhash 8ab40bfb565c1002e84bb238a620ab81bb64eceb -%global revdate 20210212 +%global revhash 699a121bd449fe8a9350221282bd3f809691a766 +%global revdate 20210623 %global tarball_name jmc-%{revhash} @@ -35,6 +35,7 @@ URL: http://openjdk.java.net/projects/jmc/ 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 @@ -71,10 +72,10 @@ cp ../README.md ./ %pom_remove_plugin :nexus-staging-maven-plugin %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin -%pom_disable_module org.openjdk.jmc.flightrecorder.writer - %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) %mvn_package org.openjdk.jmc:missioncontrol.core.tests __noinstall @@ -100,6 +101,12 @@ cp ../README.md ./ %doc README.md %changelog +* Tue Aug 17 2021 Alex Macdonald - 8.0.1-1 +- Revert jmc packages to 8.0.1 release + +* Tue Aug 10 2021 Alex Macdonald - 8.1.0-1 +- Update to jmc-ga tagged commit d0f89f0 + * Fri Feb 12 2021 Alex Macdonald - 8.0.0-1 - Update to jmc8 branch commit 8ab40bf