From 0d6aeb5d02427f6ae9395c276a385face136b288 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 30 2021 18:39:12 +0000 Subject: import jmc-core-8.0.0-1.module+el8.4.0+10094+02d29114 --- diff --git a/.gitignore b/.gitignore index 32aaa13..5d1009f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/9871e02a9e40.tar.gz +SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz diff --git a/.jmc-core.metadata b/.jmc-core.metadata index d280f6a..6f8a31c 100644 --- a/.jmc-core.metadata +++ b/.jmc-core.metadata @@ -1 +1 @@ -f204e02359b91f8158edb5dc2934e6506567bce1 SOURCES/9871e02a9e40.tar.gz +84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz diff --git a/SOURCES/0-amend-lz4-java-reference.patch b/SOURCES/0-amend-lz4-java-reference.patch new file mode 100644 index 0000000..b2f58e8 --- /dev/null +++ b/SOURCES/0-amend-lz4-java-reference.patch @@ -0,0 +1,10 @@ +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 +--- 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 ed3fe7e..917d659 100644 --- a/SPECS/jmc-core.spec +++ b/SPECS/jmc-core.spec @@ -1,21 +1,21 @@ # Version -%global major 7 +%global major 8 %global minor 0 %global patchlevel 0 # Revision -%global revnum 3 -# set to 1 for hg snapshots, 0 for release +%global revnum 1 +# set to 1 for snapshots, 0 for release %global usesnapshot 0 # SNAPSHOT version -%global hgrevhash 9871e02a9e40 -%global hgrevdate 20190528 +%global revhash 8ab40bfb565c1002e84bb238a620ab81bb64eceb +%global revdate 20210212 -%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 @@ -32,20 +32,27 @@ Summary: Core API for JDK Mission Control License: UPL URL: http://openjdk.java.net/projects/jmc/ -Source0: https://hg.openjdk.java.net/jmc/jmc7/archive/9871e02a9e40.tar.gz +Source0: https://github.com/openjdk/jmc/archive/%{revhash}.tar.gz BuildArch: noarch +# 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) +# on mvn(org.owasp.encoder:encoder) %description -JDK Mission Control is an advanced set of tools that enables efficient and -detailed analysis of the extensive data collected by JDK Flight Recorder. -The tool chain enables developers and administrators to collect and analyze data +JDK Mission Control is an advanced set of tools that enables efficient and +detailed analysis of the extensive data collected by Flight Recorder. The +tool chain enables developers and administrators to collect and analyze data from Java applications running locally or deployed in production environments. %package javadoc @@ -59,12 +66,18 @@ Summary: Javadoc for %{name} cp ../license/* ./ cp ../README.md ./ +%patch0 -p1 + %pom_remove_plugin :nexus-staging-maven-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin +%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-javadoc-plugin +%pom_disable_module org.openjdk.jmc.flightrecorder.writer -# don't install test packages +%pom_remove_plugin :jacoco-maven-plugin tests +%pom_disable_module coverage + +# 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 @@ -87,9 +100,23 @@ cp ../README.md ./ %doc README.md %changelog +* 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 - Exclude test packages + * Tue Mar 12 2019 Jie Kang - 7.0.0-1 - Initial package