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.metadata b/.jmc.metadata index 6f8a31c..caf14a2 100644 --- a/.jmc.metadata +++ b/.jmc.metadata @@ -1 +1 @@ -84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz +d9f36ea4af8af8ecb0328e1188455c64d7f8da5d SOURCES/699a121bd449fe8a9350221282bd3f809691a766.tar.gz diff --git a/SOURCES/1-remove-profiles.patch b/SOURCES/1-remove-profiles.patch index 6e51aef..1ac59c6 100644 --- a/SOURCES/1-remove-profiles.patch +++ b/SOURCES/1-remove-profiles.patch @@ -1,5 +1,5 @@ diff --git a/pom.xml b/pom.xml -index 587d175..1c7c1f1 100644 +index 3c27d3b..22ce8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -109,95 +109,6 @@ @@ -20,7 +20,7 @@ index 587d175..1c7c1f1 100644 - - org.openjdk.jmc - platform-definition-2020-12 -- 8.0.0-SNAPSHOT +- 8.0.1-SNAPSHOT - - - @@ -44,7 +44,7 @@ index 587d175..1c7c1f1 100644 - - org.openjdk.jmc - platform-definition-2020-09 -- 8.0.0-SNAPSHOT +- 8.0.1-SNAPSHOT - - - @@ -65,7 +65,7 @@ index 587d175..1c7c1f1 100644 - - org.openjdk.jmc - platform-definition-2020-06 -- 8.0.0-SNAPSHOT +- 8.0.1-SNAPSHOT - - - @@ -86,7 +86,7 @@ index 587d175..1c7c1f1 100644 - - org.openjdk.jmc - platform-definition-2020-03 -- 8.0.0-SNAPSHOT +- 8.0.1-SNAPSHOT - - - diff --git a/SOURCES/13-revert-graphview.patch b/SOURCES/12-revert-graphview.patch similarity index 100% rename from SOURCES/13-revert-graphview.patch rename to SOURCES/12-revert-graphview.patch diff --git a/SOURCES/14-revert-6852.patch b/SOURCES/13-revert-6852.patch similarity index 100% rename from SOURCES/14-revert-6852.patch rename to SOURCES/13-revert-6852.patch diff --git a/SOURCES/15-fix-javamail.patch b/SOURCES/14-fix-javamail.patch similarity index 100% rename from SOURCES/15-fix-javamail.patch rename to SOURCES/14-fix-javamail.patch diff --git a/SOURCES/16-revert-resourcelocator.patch b/SOURCES/15-revert-resourcelocator.patch similarity index 100% rename from SOURCES/16-revert-resourcelocator.patch rename to SOURCES/15-revert-resourcelocator.patch diff --git a/SOURCES/12-remove-chromium.patch b/SOURCES/16-remove-chromium.patch similarity index 100% rename from SOURCES/12-remove-chromium.patch rename to SOURCES/16-remove-chromium.patch diff --git a/SOURCES/7-remove-jacoco-dep.patch b/SOURCES/7-remove-jacoco-dep.patch index a2625bb..a5a4bfc 100644 --- a/SOURCES/7-remove-jacoco-dep.patch +++ b/SOURCES/7-remove-jacoco-dep.patch @@ -1,10 +1,10 @@ diff --git a/application/pom.xml b/application/pom.xml -index 3f179d4..5a4add3 100644 +index 6b92b98..34b9077 100644 --- a/application/pom.xml +++ b/application/pom.xml -@@ -175,11 +175,6 @@ +@@ -173,11 +173,6 @@ flightrecorder.test - 8.0.0-SNAPSHOT + 8.0.1-SNAPSHOT - - org.jacoco diff --git a/SPECS/jmc.spec b/SPECS/jmc.spec index 81e51e2..c6fb024 100644 --- a/SPECS/jmc.spec +++ b/SPECS/jmc.spec @@ -1,16 +1,16 @@ # Version %global major 8 %global minor 0 -%global patchlevel 0 +%global patchlevel 1 # Revision -%global revnum 8 +%global revnum 4 # set to 1 for snapshots, 0 for release %global usesnapshot 0 # SNAPSHOT version -%global revhash 8ab40bfb565c1002e84bb238a620ab81bb64eceb -%global revdate 20210212 +%global revhash 699a121bd449fe8a9350221282bd3f809691a766 +%global revdate 20210623 %global tarball_name jmc-%{revhash} @@ -83,16 +83,16 @@ Patch9: 9-update-flags.patch Patch10: 10-revert-lz4-java-name-override.patch # Patch pom.xml Use to tycho version 2.1 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 -Patch13: 13-revert-graphview.patch +Patch12: 12-revert-graphview.patch # Simplify the path to the jmc product -Patch14: 14-revert-6852.patch +Patch13: 13-revert-6852.patch # 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 -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 Patch17: 17-revert-list-of.patch @@ -115,6 +115,7 @@ BuildRequires: osgi(org.openjdk.jmc.flightrecorder.test) BuildRequires: osgi(javax.annotation-api) Requires: java-openjdk >= 1:1.8 +Requires: lz4-java Requires: osgi(com.sun.activation.jakarta.activation) Requires: osgi(org.openjdk.jmc.common) @@ -244,6 +245,21 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/ %{_datadir}/applications/%{name}.desktop %changelog +* Tue Oct 05 2021 Alex Macdonald - 8.0.1-4 +- Rebuild with updated dependencies + +* Thu Aug 26 2021 Alex Macdonald - 8.0.1-3 +- Bump version to build with updated tycho + +* Wed Aug 19 2021 Alex Macdonald - 8.0.1-2 +- Re-set the buildId, buildNumber, and build.date during maven build + +* Tue Aug 10 2021 Alex Macdonald - 8.0.0-1 +- Update to jmc 8.0.1-ga + +* Tue Aug 10 2021 Alex Macdonald - 8.1.0-1 +- Update to jmc-ga tagged commit d0f89f0 + * Wed Feb 24 2021 Alex Macdonald - 8.0.0-8 - Set the buildId, buildNumber, and build.date during maven build