Compare commits

..

No commits in common. "c8-stream-rhel8" and "c9s" have entirely different histories.

7 changed files with 131 additions and 144 deletions

5
.gitignore vendored
View File

@ -1 +1,4 @@
SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz
/jmc-core-7.0.0.tar.gz
/63ec7d0ee8d9.tar.gz
/jmc-8.2.0.tar.gz
/repository-8.2.0.tar.gz

View File

@ -1 +0,0 @@
d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# jmc-core
The jmc-core package

View File

@ -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

View File

@ -1,132 +0,0 @@
# Version
%global major 8
%global minor 0
%global patchlevel 1
# Revision
%global revnum 2
# set to 1 for snapshots, 0 for release
%global usesnapshot 0
# SNAPSHOT version
%global revhash 699a121bd449fe8a9350221282bd3f809691a766
%global revdate 20210623
%global tarball_name jmc-%{revhash}
%if %{usesnapshot}
%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}
Summary: Core API for JDK Mission Control
License: UPL
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
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)
%description
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
Summary: Javadoc for %{name}
%description javadoc
%{summary}.
%prep
%setup -q -n %{tarball_name}/core
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)
%mvn_package org.openjdk.jmc:missioncontrol.core.tests __noinstall
%mvn_package org.openjdk.jmc:flightrecorder.rules.test __noinstall
%mvn_package org.openjdk.jmc:flightrecorder.rules.jdk.test __noinstall
%build
# some tests require large heap and fail with OOM
# depending on the builder resources
%mvn_build -- -Dmaven.test.failure.ignore=true
%install
%mvn_install
%files -f .mfiles
%license LICENSE.txt
%license THIRDPARTYREADME.txt
%doc README.md
%files javadoc -f .mfiles-javadoc
%license LICENSE.txt
%license THIRDPARTYREADME.txt
%doc README.md
%changelog
* Tue Oct 05 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-2
- Rebuild with updated dependencies
* Tue Aug 17 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-1
- Revert jmc packages to 8.0.1 release
* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.1.0-1
- Update to jmc-ga tagged commit d0f89f0
* Fri Feb 12 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
- Update to jmc8 branch commit 8ab40bf
* Thu Apr 23 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-3
- Update to latest commit e67446b5fc9d
* Fri Apr 17 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-2
- remove plugins from pom (maven-source-plugin, jacoco)
* Thu Apr 16 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-1
- Updated to version 7.1.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
* Tue Mar 12 2019 Jie Kang <jkang@redhat.com> - 7.0.0-1
- Initial package

122
jmc-core.spec Normal file
View File

@ -0,0 +1,122 @@
# Version
%global major 8
%global minor 2
%global patchlevel 0
# Revision
%global revnum 6
# set to 1 for hg snapshots, 0 for release
%global usesnapshot 0
# SNAPSHOT version
%global revhash 7f42e4a10291d7e9316711edd81a183951cdae57
%global revdate 20220203
%global tarball_name jmc-%{major}.%{minor}.%{patchlevel}.tar.gz
%global jmc_dir_name core
%if %{usesnapshot}
%global releasestr %{revnum}.%{revdate}.%{revhash}
%global repositorystr repository-%{major}.%{minor}.%{patchlevel}-%{revdate}.tar.gz
%else
%global releasestr %{revnum}
%global repositorystr repository-%{major}.%{minor}.%{patchlevel}.tar.gz
%endif
Name: jmc-core
Version: %{major}.%{minor}.%{patchlevel}
Release: %{releasestr}%{?dist}.3
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
# 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: %{tarball_name}
Source1: %{repositorystr}
BuildArch: noarch
BuildRequires: maven-local
# maven requires generator will add Require for runtime dependency
# 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 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
Summary: Javadoc for %{name}
%description javadoc
%{summary}.
%prep
%setup -q -n %{jmc_dir_name}
%setup -q -T -D -a 1 -n %{jmc_dir_name}
cp ./license/* ./
%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
%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
%build
# some tests require large heap and fail with OOM
# depending on the builder resources
mvn -Dmaven.repo.local=repository-%{version}-%{revdate} -o clean install -f pom.xml -DskipJDPMulticastTests=true
%files
%license LICENSE.txt
%license THIRD_PARTY_LICENSES.txt
%doc README.md
%files javadoc
%license LICENSE.txt
%license THIRD_PARTY_LICENSES.txt
%doc README.md
%changelog
* Mon Feb 27 2023 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-1
- Rebuilt with bundled dependencies for move to CRB. Related: rhbz#1980981
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.1.1-5.3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.1.1-5.2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-5.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Sep 21 2020 Jie Kang <jkang@redhat.com> - 7.1.1-5
- Update license
* Fri Aug 28 2020 Jie Kang <jkang@redhat.com> - 7.1.1-4
- Update to latest upstream 63ec7d0ee8d9
* Mon Apr 27 2020 Jie Kang <jkang@redhat.com> - 7.1.1-3
- Update to upstream 7.1.1 ga commit
* Wed Mar 11 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-2
- Update to latest upstream to include JMC-6728
* Fri Feb 28 2020 Alex Macdonald <almacdon@redhat.com> - 7.1.1-1
- Update to latest upstream
* Fri Dec 20 2019 Alex Macdonald <almacdon@redhat.com> - 7.1.0-1
- 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
- Update to latest upstream with minor bug fixes
* Thu Aug 15 2019 Jie Kang <jkang@redhat.com> - 7.0.0-1
- Exclude test packages
* Fri May 31 2019 Jie Kang <jkang@redhat.com> - 7.0.0-0
- Initial package

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (repository-8.2.0.tar.gz) = 6c7af8d6a09e4e82e231e350f31422498d297f89a6486c3ce8270743cc8f0b6e67cf1c82430a42c90f017907ebf54db18e5d3e1d0a79b10ff6eec8be985c7c93
SHA512 (jmc-8.2.0.tar.gz) = 1a7534c2deb271495c854766ae1ddc4959267615f0a3495bab3ba4026aaea05d589d207e5331804167535b062f3015cb649744b0b8c34003a23391f419c16bae