rpms/jmc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import jmc-8.0.1-3.module+el8.5.0+12403+27174701

Browse Source
This commit is contained in:
CentOS Sources 2021-10-06 06:31:37 -04:00 committed by Stepan Oksanichenko
parent 83ffb82ff3
commit 6130310a48
10 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz

2
.jmc.metadata
View File

@ -1 +1 @@
84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz

10
SOURCES/1-remove-profiles.patch
View File

@ -1,5 +1,5 @@
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 587d175..1c7c1f1 100644 index 3c27d3b..22ce8b7 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -109,95 +109,6 @@ @@ -109,95 +109,6 @@
@ -20,7 +20,7 @@ index 587d175..1c7c1f1 100644
- <artifact> - <artifact>
- <groupId>org.openjdk.jmc</groupId> - <groupId>org.openjdk.jmc</groupId>
- <artifactId>platform-definition-2020-12</artifactId> - <artifactId>platform-definition-2020-12</artifactId>
- <version>8.0.0-SNAPSHOT</version> - <version>8.0.1-SNAPSHOT</version>
- </artifact> - </artifact>
- </target> - </target>
- </configuration> - </configuration>
@ -44,7 +44,7 @@ index 587d175..1c7c1f1 100644
- <artifact> - <artifact>
- <groupId>org.openjdk.jmc</groupId> - <groupId>org.openjdk.jmc</groupId>
- <artifactId>platform-definition-2020-09</artifactId> - <artifactId>platform-definition-2020-09</artifactId>
- <version>8.0.0-SNAPSHOT</version> - <version>8.0.1-SNAPSHOT</version>
- </artifact> - </artifact>
- </target> - </target>
- </configuration> - </configuration>
@ -65,7 +65,7 @@ index 587d175..1c7c1f1 100644
- <artifact> - <artifact>
- <groupId>org.openjdk.jmc</groupId> - <groupId>org.openjdk.jmc</groupId>
- <artifactId>platform-definition-2020-06</artifactId> - <artifactId>platform-definition-2020-06</artifactId>
- <version>8.0.0-SNAPSHOT</version> - <version>8.0.1-SNAPSHOT</version>
- </artifact> - </artifact>
- </target> - </target>
- </configuration> - </configuration>
@ -86,7 +86,7 @@ index 587d175..1c7c1f1 100644
- <artifact> - <artifact>
- <groupId>org.openjdk.jmc</groupId> - <groupId>org.openjdk.jmc</groupId>
- <artifactId>platform-definition-2020-03</artifactId> - <artifactId>platform-definition-2020-03</artifactId>
- <version>8.0.0-SNAPSHOT</version> - <version>8.0.1-SNAPSHOT</version>
- </artifact> - </artifact>
- </target> - </target>
- </configuration> - </configuration>

0
SOURCES/13-revert-graphview.patch → SOURCES/12-revert-graphview.patch
View File

0
SOURCES/14-revert-6852.patch → SOURCES/13-revert-6852.patch
View File

0
SOURCES/15-fix-javamail.patch → SOURCES/14-fix-javamail.patch
View File

0
SOURCES/16-revert-resourcelocator.patch → SOURCES/15-revert-resourcelocator.patch
View File

0
SOURCES/12-remove-chromium.patch → SOURCES/16-remove-chromium.patch
View File

6
SOURCES/7-remove-jacoco-dep.patch
View File

@ -1,10 +1,10 @@
diff --git a/application/pom.xml b/application/pom.xml diff --git a/application/pom.xml b/application/pom.xml
index 3f179d4..5a4add3 100644 index 6b92b98..34b9077 100644
--- a/application/pom.xml --- a/application/pom.xml
+++ b/application/pom.xml +++ b/application/pom.xml
@@ -175,11 +175,6 @@ @@ -173,11 +173,6 @@
<artifactId>flightrecorder.test</artifactId> <artifactId>flightrecorder.test</artifactId>
<version>8.0.0-SNAPSHOT</version> <version>8.0.1-SNAPSHOT</version>
</dependency> </dependency>
- <dependency> - <dependency>
- <groupId>org.jacoco</groupId> - <groupId>org.jacoco</groupId>

38
SPECS/jmc.spec
View File

@ -1,16 +1,16 @@
# Version # Version
%global major 8 %global major 8
%global minor 0 %global minor 0
%global patchlevel 0 %global patchlevel 1
# Revision # Revision
%global revnum 7 %global revnum 3
# set to 1 for snapshots, 0 for release # set to 1 for snapshots, 0 for release
%global usesnapshot 0 %global usesnapshot 0
# SNAPSHOT version # SNAPSHOT version
%global revhash 8ab40bfb565c1002e84bb238a620ab81bb64eceb %global revhash 699a121bd449fe8a9350221282bd3f809691a766
%global revdate 20210212 %global revdate 20210623
%global tarball_name jmc-%{revhash} %global tarball_name jmc-%{revhash}
@ -83,16 +83,16 @@ Patch9: 9-update-flags.patch
Patch10: 10-revert-lz4-java-name-override.patch Patch10: 10-revert-lz4-java-name-override.patch
# Patch pom.xml Use to tycho version 2.1 # Patch pom.xml Use to tycho version 2.1
Patch11: 11-tycho.patch Patch11: 11-tycho.patch
# Remove Chromium (currently Windows-only) from the plugin list
Patch12: 12-remove-chromium.patch
# Revert downloading of graphview assets from the web # Revert downloading of graphview assets from the web
Patch13: 13-revert-graphview.patch Patch12: 12-revert-graphview.patch
# Simplify the path to the jmc product # Simplify the path to the jmc product
Patch14: 14-revert-6852.patch Patch13: 13-revert-6852.patch
# Update javamail dependency names # Update javamail dependency names
Patch15: 15-fix-javamail.patch Patch14: 14-fix-javamail.patch
# Revert usage of ResourceLocator as it isn't available in Eclipse 4.12 # Revert usage of ResourceLocator as it isn't available in Eclipse 4.12
Patch16: 16-revert-resourcelocator.patch Patch15: 15-revert-resourcelocator.patch
# Remove Chromium (currently Windows-only) from the plugin list
Patch16: 16-remove-chromium.patch
# Revert usage of List.of in GraphView # Revert usage of List.of in GraphView
Patch17: 17-revert-list-of.patch Patch17: 17-revert-list-of.patch
@ -115,6 +115,7 @@ BuildRequires: osgi(org.openjdk.jmc.flightrecorder.test)
BuildRequires: osgi(javax.annotation-api) BuildRequires: osgi(javax.annotation-api)
Requires: java-openjdk >= 1:1.8 Requires: java-openjdk >= 1:1.8
Requires: lz4-java
Requires: osgi(com.sun.activation.jakarta.activation) Requires: osgi(com.sun.activation.jakarta.activation)
Requires: osgi(org.openjdk.jmc.common) Requires: osgi(org.openjdk.jmc.common)
@ -186,7 +187,7 @@ TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></
# some tests require large heap and fail with OOM # some tests require large heap and fail with OOM
# depending on the builder resources # depending on the builder resources
%mvn_build -j -- -Dmaven.test.failure.ignore=true %mvn_build -j -- -Dmaven.test.failure.ignore=true -DbuildId=rhel -DbuildNumber=%{revhash} -Dbuild.date=%{revdate}
%install %install
@ -244,6 +245,21 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%changelog %changelog
* Thu Aug 26 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-3
- Bump version to build with updated tycho
* Wed Aug 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.1-2
- Re-set the buildId, buildNumber, and build.date during maven build
* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-1
- Update to jmc 8.0.1-ga
* Tue Aug 10 2021 Alex Macdonald <almacdon@redhat.com> - 8.1.0-1
- Update to jmc-ga tagged commit d0f89f0
* Wed Feb 24 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-8
- Set the buildId, buildNumber, and build.date during maven build
* Fri Feb 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-7 * Fri Feb 19 2021 Alex Macdonald <almacdon@redhat.com> - 8.0.0-7
- Fix incorrect macro for name - Fix incorrect macro for name