From 188771ab63df839b6131b99e469cba17d0f37501 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Wed, 2 Oct 2024 16:49:25 +0000 Subject: [PATCH] jmc package is retired on branch c10s for CS-2551 --- .gitignore | 4 - 0-inline-javascript-into-templates.patch | 389 ----------------------- 0-remove-twitter.patch | 225 ------------- 1-remove-non-linux-environments.patch | 21 -- 10-revert-flameview.patch | 358 --------------------- 11-update-flags.patch | 15 - 12-tycho.patch | 20 -- 2-javax.patch | 34 -- 2-skip-writer-tests.patch | 13 - 3-remove-profiles.patch | 141 -------- 4-remove-localization.patch | 48 --- 5-remove-ide-jdt.patch | 29 -- 6-remove-buchen-repo.patch | 16 - 7-add-hamcrest.patch | 16 - 8-remove-arch.patch | 26 -- 9-remove-jacoco-dep.patch | 15 - README.md | 6 +- dead.package | 1 + gating.yaml | 6 - jmc.1 | 24 -- jmc.appdata.xml | 20 -- 21 files changed, 4 insertions(+), 1423 deletions(-) delete mode 100644 .gitignore delete mode 100644 0-inline-javascript-into-templates.patch delete mode 100644 0-remove-twitter.patch delete mode 100644 1-remove-non-linux-environments.patch delete mode 100644 10-revert-flameview.patch delete mode 100644 11-update-flags.patch delete mode 100644 12-tycho.patch delete mode 100644 2-javax.patch delete mode 100644 2-skip-writer-tests.patch delete mode 100644 3-remove-profiles.patch delete mode 100644 4-remove-localization.patch delete mode 100644 5-remove-ide-jdt.patch delete mode 100644 6-remove-buchen-repo.patch delete mode 100644 7-add-hamcrest.patch delete mode 100644 8-remove-arch.patch delete mode 100644 9-remove-jacoco-dep.patch create mode 100644 dead.package delete mode 100644 gating.yaml delete mode 100644 jmc.1 delete mode 100644 jmc.appdata.xml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b2950ee..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/1ddf3baa4e26.tar.gz -/63ec7d0ee8d9.tar.gz -/8.2.0-ga.tar.gz -/repository-8.2.0-20220203.tar.gz diff --git a/0-inline-javascript-into-templates.patch b/0-inline-javascript-into-templates.patch deleted file mode 100644 index c044853..0000000 --- a/0-inline-javascript-into-templates.patch +++ /dev/null @@ -1,389 +0,0 @@ -diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml -index d363cba..5bc7c45 100644 ---- a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml -+++ b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml -@@ -42,94 +42,4 @@ - - org.openjdk.jmc.flightrecorder.flameview - eclipse-plugin -- -- -- 1.6.7 -- process-resources -- ${project.basedir}/src/main/resources/jslibs -- ${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml -- ${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml -- -- -- -- -- -- com.googlecode.maven-download-plugin -- download-maven-plugin -- ${download.maven.plugin.version} -- -- -- d3-flamegraph-css -- ${download-maven-plugin.phase} -- -- wget -- -- -- https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.css -- false -- ${download-maven-plugin.output} -- -- -- -- d3-v6-js -- ${download-maven-plugin.phase} -- -- wget -- -- -- https://d3js.org/d3.v6.min.js -- false -- ${download-maven-plugin.output} -- -- -- -- d3-flamegraph-tooltip-js -- ${download-maven-plugin.phase} -- -- wget -- -- -- https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph-tooltip.js -- false -- ${download-maven-plugin.output} -- -- -- -- d3-flamegraph-js -- ${download-maven-plugin.phase} -- -- wget -- -- -- https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.js -- false -- ${download-maven-plugin.output} -- -- -- -- -- -- -- - -diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java -index 93cc9a9..0e94a05 100644 ---- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java -+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java -@@ -61,7 +61,6 @@ import java.util.concurrent.Executors; - import java.util.concurrent.ThreadFactory; - import java.util.concurrent.atomic.AtomicInteger; - import java.util.logging.Level; --import java.util.stream.Collectors; - import java.util.stream.Stream; - - import org.eclipse.jface.action.Action; -@@ -120,27 +119,17 @@ public class FlameGraphView extends ViewPart implements ISelectionListener { - private static final String TOOLTIP_DESCRIPTION = getFlameviewMessage(FLAMEVIEW_SELECT_HTML_TOOLTIP_DESCRIPTION); - private static final String HTML_PAGE; - static { -- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.css -- String cssD3Flamegraph = "jslibs/d3-flamegraph.css"; -- // from: https://d3js.org/d3.v6.min.js -- String jsD3V6 = "jslibs/d3.v6.min.js"; -- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph-tooltip.js -- String jsD3Tip = "jslibs/d3-flamegraph-tooltip.js"; -- // from: https://cdn.jsdelivr.net/npm/d3-flame-graph@4.0.6/dist/d3-flamegraph.js -- String jsD3FlameGraph = "jslibs/d3-flamegraph.js"; -- // jmc flameview coloring, tooltip and other functions - String jsFlameviewName = "flameview.js"; - String cssFlameview = "flameview.css"; - -- String jsD3 = loadLibraries(jsD3V6, jsD3FlameGraph, jsD3Tip); -- String styleheets = loadLibraries(cssD3Flamegraph, cssFlameview); -+ String styleheets = fileContent(cssFlameview); - String jsFlameviewColoring = fileContent(jsFlameviewName); - - String magnifierIcon = getIconBase64(ImageConstants.ICON_MAGNIFIER); - - // formatter arguments for the template: %1 - CSSs stylesheets, -- // %2 - Search Icon Base64, %3 - 3rd party scripts, %4 - Flameview Coloring, -- HTML_PAGE = String.format(fileContent("page.template"), styleheets, magnifierIcon, jsD3, jsFlameviewColoring); -+ // %2 - Search Icon Base64, %3 - Flameview Coloring, -+ HTML_PAGE = String.format(fileContent("page.template"), styleheets, magnifierIcon, jsFlameviewColoring); - } - - private static final int MODEL_EXECUTOR_THREADS_NUMBER = 3; -@@ -490,14 +479,6 @@ public class FlameGraphView extends ViewPart implements ISelectionListener { - } - } - -- private static String loadLibraries(String ... libs) { -- if (libs == null || libs.length == 0) { -- return ""; -- } else { -- return Stream.of(libs).map(FlameGraphView::fileContent).collect(Collectors.joining("\n")); -- } -- } -- - private static String fileContent(String fileName) { - try { - return StringToolkit.readString(FlameGraphView.class.getClassLoader().getResourceAsStream(fileName)); -diff --git a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template -index 67bc3c7..4f0b21c 100644 ---- a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template -+++ b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template -@@ -3,6 +3,7 @@ - - - -+ - - -- -- -- -- -- --
-- -- -- -- -\ No newline at end of file diff --git a/11-update-flags.patch b/11-update-flags.patch deleted file mode 100644 index ad4202c..0000000 --- a/11-update-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ -# HG changeset patch -# Parent 58eadb7c7ac8a81f6df4a70ecd5ecd69a8b42b0a - -diff -r 58eadb7c7ac8 -r 8992119f0f37 application/org.openjdk.jmc.rcp.product/jmc.product ---- a/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:04:24 2020 -0400 -+++ b/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:05:21 2020 -0400 -@@ -56,7 +56,7 @@ - - - -- -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED -+ -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED - - --add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED - diff --git a/12-tycho.patch b/12-tycho.patch deleted file mode 100644 index a1e75d4..0000000 --- a/12-tycho.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -r 63ec7d0ee8d9 pom.xml ---- a/pom.xml Mon Jun 08 12:37:07 2020 -0400 -+++ b/pom.xml Fri Jan 22 14:13:15 2021 -0500 -@@ -75,7 +75,7 @@ - - UTF-8 - UTF-8 -- 1.4.0 -+ 2.1.0 - 1.4 - 2.8.2 - 0.2 -@@ -282,6 +282,7 @@ - ${tycho.version} - - false -+ false - - - diff --git a/2-javax.patch b/2-javax.patch deleted file mode 100644 index edbc5b4..0000000 --- a/2-javax.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# Parent f4accaf7605c6e7ed1ea968740e8c1cac0c9e8e4 - -diff -r f4accaf7605c application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF ---- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF Fri Aug 28 12:19:55 2020 -0400 -+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF Fri Aug 28 12:27:37 2020 -0400 -@@ -10,7 +10,6 @@ - Require-Bundle: org.openjdk.jmc.rjmx.ui;visibility:=reexport, - org.eclipse.e4.core.contexts;bundle-version="1.3.0", - org.eclipse.e4.core.di;bundle-version="1.3.0";visibility:=reexport, -- javax.annotation;bundle-version="1.0.0";visibility:=reexport, - javax.inject;bundle-version="1.0.0";visibility:=reexport, - org.openjdk.jmc.commands - Bundle-ActivationPolicy: lazy -@@ -24,7 +23,6 @@ - org.openjdk.jmc.console.ui.messages.internal;x-friends:="org.openjdk.jmc.console.uitest", - org.openjdk.jmc.console.ui.preferences;x-friends:="org.openjdk.jmc.console.uitest" - Bundle-ClassPath: . --Import-Package: javax.annotation;version="1.0.0", -- javax.inject;version="1.0.0" -+Import-Package: javax.inject;version="1.0.0" - Automatic-Module-Name: org.openjdk.jmc.console.ui - -diff -r f4accaf7605c application/org.openjdk.jmc.feature.rcp/feature.xml ---- a/application/org.openjdk.jmc.feature.rcp/feature.xml Fri Aug 28 12:19:55 2020 -0400 -+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml Fri Aug 28 12:27:37 2020 -0400 -@@ -88,7 +88,6 @@ - - - -- - - - diff --git a/2-skip-writer-tests.patch b/2-skip-writer-tests.patch deleted file mode 100644 index db6e716..0000000 --- a/2-skip-writer-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/core/tests/pom.xml b/core/tests/pom.xml -index f19a8ed..1f4db29 100644 ---- a/core/tests/pom.xml -+++ b/core/tests/pom.xml -@@ -46,7 +46,7 @@ - org.openjdk.jmc.flightrecorder.test - org.openjdk.jmc.flightrecorder.rules.test - org.openjdk.jmc.flightrecorder.rules.jdk.test -- org.openjdk.jmc.flightrecorder.writer.test -+ - org.openjdk.jmc.flightrecorder.serializers.test - org.openjdk.jmc.jdp.test - diff --git a/3-remove-profiles.patch b/3-remove-profiles.patch deleted file mode 100644 index a49f8fa..0000000 --- a/3-remove-profiles.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -r b0ad84913481 pom.xml ---- a/pom.xml Mon Apr 27 14:18:01 2020 -0400 -+++ b/pom.xml Mon Apr 27 14:19:15 2020 -0400 -@@ -105,137 +105,6 @@ - ${snapshot.repo} - - -- -- -- 2019-09 -- -- true -- -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-2019-09 -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- -- 2019-06 -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-2019-06 -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- -- 2019-03 -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-2019-03 -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- -- 2018-12 -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-2018-12 -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- -- 2018-09 -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-2018-09 -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- -- photon -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-photon -- 7.1.1-SNAPSHOT -- -- -- -- -- -- -- -- - - - diff --git a/4-remove-localization.patch b/4-remove-localization.patch deleted file mode 100644 index 271e118..0000000 --- a/4-remove-localization.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml -index 1e295ca..9687dd4 100644 ---- a/application/org.openjdk.jmc.feature.rcp/feature.xml -+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml -@@ -51,18 +51,10 @@ - id="org.openjdk.jmc.feature.console" - version="0.0.0"/> - -- -- - - -- -- - -@@ -104,24 +96,6 @@ - version="0.0.0" - unpack="false"/> - -- -- -- -- - -- -- - -\ No newline at end of file -diff --git a/application/pom.xml b/application/pom.xml -index d185d9d..89fd033 100644 ---- a/application/pom.xml -+++ b/application/pom.xml -@@ -77,7 +77,6 @@ - org.openjdk.jmc.flightrecorder.ui - org.openjdk.jmc.greychart - org.openjdk.jmc.greychart.ui -- org.openjdk.jmc.ide.jdt - org.openjdk.jmc.ide.launch - org.openjdk.jmc.ide.ui - org.openjdk.jmc.jdp diff --git a/6-remove-buchen-repo.patch b/6-remove-buchen-repo.patch deleted file mode 100644 index 6e60bee..0000000 --- a/6-remove-buchen-repo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml -index 8e6b303..8060da9 100644 ---- a/application/org.openjdk.jmc.rcp.product/pom.xml -+++ b/application/org.openjdk.jmc.rcp.product/pom.xml -@@ -141,11 +141,4 @@ - - ../../target/ - -- -- -- buchen-maven-repo -- http://buchen.github.io/maven-repo -- default -- -- - diff --git a/7-add-hamcrest.patch b/7-add-hamcrest.patch deleted file mode 100644 index 6940f7d..0000000 --- a/7-add-hamcrest.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF -index bf02b43..a4d5a67 100644 ---- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF -+++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF -@@ -12,7 +12,9 @@ Require-Bundle: org.junit, - org.openjdk.jmc.rjmx.services.jfr, - org.openjdk.jmc.rjmx, - org.openjdk.jmc.common, -- org.openjdk.jmc.flightrecorder.configuration -+ org.openjdk.jmc.flightrecorder.configuration, -+ org.hamcrest.core - Export-Package: org.openjdk.jmc.rjmx.services.jfr.test - Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test --Import-Package: org.openjdk.jmc.flightrecorder.jdk -+Import-Package: org.openjdk.jmc.flightrecorder.jdk, -+ org.hamcrest.core diff --git a/8-remove-arch.patch b/8-remove-arch.patch deleted file mode 100644 index dae259d..0000000 --- a/8-remove-arch.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 59f292a..2985869 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -117,21 +117,11 @@ - ${tycho.version} - - -- -- win32 -- win32 -- x86_64 -- - - linux - gtk - x86_64 - -- -- macosx -- cocoa -- x86_64 -- - - - diff --git a/9-remove-jacoco-dep.patch b/9-remove-jacoco-dep.patch deleted file mode 100644 index 0dd9968..0000000 --- a/9-remove-jacoco-dep.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r 823b959b0e26 application/pom.xml ---- a/application/pom.xml Mon Apr 27 14:22:34 2020 -0400 -+++ b/application/pom.xml Mon Apr 27 14:23:07 2020 -0400 -@@ -160,11 +160,6 @@ - flightrecorder.rules.jdk - 7.1.1 - -- -- org.jacoco -- jacoco-maven-plugin -- 0.8.3 -- - - - diff --git a/README.md b/README.md index d470c3e..24b9ea2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# jmc - -The jmc package \ No newline at end of file +# Package Not Available +This package is not available on CentOS Stream 10. +It may be available on another branch. \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..813e7ad --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +jmc package is retired on branch c10s for CS-2551 \ No newline at end of file diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 648918d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/jmc.1 b/jmc.1 deleted file mode 100644 index 671a7ca..0000000 --- a/jmc.1 +++ /dev/null @@ -1,24 +0,0 @@ -.TH JMC 1 -.SH NAME -jmc \- Java profiling and diagnostics tool -.SH SYNOPSIS -.B jmc -[\fB\-vm\fR \fIJVM\fR] -.SH DESCRIPTION -JDK Mission Control is a powerful profiler for HotSpot JVMs and has 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 -from Java applications running locally or deployed in production environments. -.SH OPTIONS -.TP -.BR \-vm \fIJVM\fR -Specify path to the JVM you wish to use for running JDK Mission Control. -Defaults to system Java. -.SH FILES -.RS -Startup options are specified here. -The -vm option can be set here as well to avoid specifying at startup. -Options specified at startup will override values in this file. -.SH BUGS -Report bugs to JMC mailing list: \ No newline at end of file diff --git a/jmc.appdata.xml b/jmc.appdata.xml deleted file mode 100644 index 3ebf60b..0000000 --- a/jmc.appdata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - jmc.desktop - FSAP - UPL or BSD - JDK Mission Control - A Profiling and Diagnostics Tool for the Hotspot JVM - -

- JDK Mission Control is a powerful profiler for HotSpot JVMs and has 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 from Java - applications running locally or deployed in production environments. -

- - http://openjdk.java.net/projects/jmc/ - jmc.desktop - The OpenJDK Community - \ No newline at end of file