The package rpms/jmc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/jmc.git/commit/?id=0bf6c3c6df5124....
Change:
+ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change:
============
commit 0bf6c3c6df5124b12a34730e5a1089ac3ebf0a27
Author: Jie Kang <jkang(a)redhat.com>
Date: Wed Nov 18 10:42:40 2020 -0500
Update ursine rpm to match 7 stream
diff --git a/.gitignore b/.gitignore
index 89d1801..398c8c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/1ddf3baa4e26.tar.gz
+/63ec7d0ee8d9.tar.gz
diff --git a/0_remove_twitter.patch b/0-remove-twitter.patch
similarity index 97%
rename from 0_remove_twitter.patch
rename to 0-remove-twitter.patch
index 1904edb..f7c6839 100644
--- a/0_remove_twitter.patch
+++ b/0-remove-twitter.patch
@@ -1,8 +1,7 @@
diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-index 6c32b74..02e0724 100644
--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF
-@@ -54,7 +54,6 @@ Export-Package: org.openjdk.jmc.rjmx,
+@@ -54,7 +54,6 @@
org.openjdk.jmc.rjmx.triggers;
x-friends:="org.openjdk.jmc.console.ui.notification,
org.openjdk.jmc.alert,
@@ -11,7 +10,6 @@ index 6c32b74..02e0724 100644
org.openjdk.jmc.rjmx.triggers.actions.internal;x-friends:="org.openjdk.jmc.console.ui.notification",
org.openjdk.jmc.rjmx.triggers.condition.internal;x-friends:="org.openjdk.jmc.console.ui.notification,org.openjdk.jmc.test.jemmy",
diff --git a/application/pom.xml b/application/pom.xml
-index 73d3bf5..35e2765 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -50,7 +50,6 @@
@@ -31,16 +29,14 @@ index 73d3bf5..35e2765 100644
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt
-index 9feab81..edb98dc 100644
--- a/license/THIRDPARTYREADME.txt
+++ b/license/THIRDPARTYREADME.txt
-@@ -367,187 +367,3 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+@@ -296,191 +296,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
+
-
--
--%% The following notice is provided with respect to Twitter4J 4.0.6,
+-%% The following notice is provided with respect to Twitter4J 4.0.7,
-which may be included with this product.
-
-
@@ -222,3 +218,8 @@ index 9feab81..edb98dc 100644
-Twitter4J SUBCOMPONENTS:
-
-Twitter4J includes software from
JSON.org to parse JSON response from the Twitter API.
You can see the license term at
http://www.JSON.org/license.html
+-
+-
+ %% The following notice is provided with respect to JavaBeans Activation
+ Framework (JAF) 1.2.1, which may be included with this product.
+
diff --git a/10-revert-flameview.patch b/10-revert-flameview.patch
new file mode 100644
index 0000000..a2d9c77
--- /dev/null
+++ b/10-revert-flameview.patch
@@ -0,0 +1,358 @@
+# HG changeset patch
+# Parent 37a493c3f60b2015c37630807015b217b98106cf
+
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/.classpath
+--- a/application/org.openjdk.jmc.flightrecorder.flameview/.classpath Tue Nov 12 16:25:24
2019 +0100
++++ b/application/org.openjdk.jmc.flightrecorder.flameview/.classpath Mon Nov 25 17:57:23
2019 -0500
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+- <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/build.properties
+--- a/application/org.openjdk.jmc.flightrecorder.flameview/build.properties Tue Nov 12
16:25:24 2019 +0100
++++ b/application/org.openjdk.jmc.flightrecorder.flameview/build.properties Mon Nov 25
17:57:23 2019 -0500
+@@ -1,5 +1,4 @@
+-source.. = src/main/java/,\
+- src/main/resources/
++source.. = src/main/java/
+ output.. = target/classes/
+ bin.includes = META-INF/,\
+ .,\
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/pom.xml
+--- a/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml Tue Nov 12 16:25:24
2019 +0100
++++ b/application/org.openjdk.jmc.flightrecorder.flameview/pom.xml Mon Nov 25 17:57:23
2019 -0500
+@@ -41,94 +41,4 @@
+ </parent>
+ <artifactId>org.openjdk.jmc.flightrecorder.flameview</artifactId>
+ <packaging>eclipse-plugin</packaging>
+-
+- <properties>
+- <download.maven.plugin.version>1.4.2</download.maven.plugin.version>
+- <download-maven-plugin.phase>process-resources</download-maven-plugin.phase>
+- <download-maven-plugin.output>${project.basedir}/src/main/resources/jslibs</download-maven-plugin.output>
+- </properties>
+-
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>com.googlecode.maven-download-plugin</groupId>
+- <artifactId>download-maven-plugin</artifactId>
+- <version>${download.maven.plugin.version}</version>
+- <executions>
+- <execution>
+- <id>d3-flamegraph-css</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-...
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+- <id>ie-html5shiv-js</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js</url>
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+- <id>ie-respond-js</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://oss.maxcdn.com/respond/1.4.2/respond.min.js</url>
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+- <id>d3-v4-js</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://d3js.org/d3.v4.min.js</url>
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+- <id>d3-tip-js</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min.js&...
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- <execution>
+- <id>d3-flamegraph-js</id>
+- <phase>${download-maven-plugin.phase}</phase>
+- <goals>
+- <goal>wget</goal>
+- </goals>
+- <configuration>
+- <
url>https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-...
+- <unpack>false</unpack>
+- <outputDirectory>${download-maven-plugin.output}</outputDirectory>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
+- </build>
+ </project>
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
+---
a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java Tue
Nov 12 16:25:24 2019 +0100
++++
b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java Mon
Nov 25 17:57:23 2019 -0500
+@@ -34,14 +34,11 @@
+ package org.openjdk.jmc.flightrecorder.flameview.views;
+
+ import java.io.IOException;
+-
+-import java.text.MessageFormat;
+ import java.util.concurrent.CancellationException;
+ import java.util.concurrent.CompletableFuture;
+ import java.util.concurrent.ExecutorService;
+ import java.util.concurrent.Executors;
+ import java.util.logging.Level;
+-import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+
+ import org.eclipse.jface.action.Action;
+@@ -77,32 +74,7 @@
+ import org.openjdk.jmc.ui.misc.DisplayToolkit;
+
+ public class FlameGraphView extends ViewPart implements ISelectionListener {
+- private static final String HTML_PAGE;
+- static {
+- // from:
https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegr...
+- String cssD3Flamegraph = "jslibs/d3-flamegraph.css";
+- // from:
https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js
+- String jsHtml5shiv = "jslibs/html5shiv.min.js";
+- // from:
https://oss.maxcdn.com/respond/1.4.2/respond.min.js
+- String jsRespond = "jslibs/respond.min.js";
+- // from:
https://d3js.org/d3.v4.min.js
+- String jsD3V4 = "jslibs/d3.v4.min.js";
+- // from:
https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min.js
+- String jsD3Tip = "jslibs/d3-tip.min.js";
+- // from:
https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/d3-flamegr...
+- String jsD3FlameGraph = "jslibs/d3-flamegraph.min.js";
+-
+- String jsIeLibraries = loadLibraries(jsHtml5shiv, jsRespond);
+- String jsD3Libraries = loadLibraries(jsD3V4, jsD3Tip, jsD3FlameGraph);
+-
+- // formatter arguments for the template: %1 - CSSs, %2 - IE9 specific scripts, %3 -
3rd party scripts
+- HTML_PAGE = String.format(fileContent("page.template"),
+- fileContent(cssD3Flamegraph),
+- jsIeLibraries,
+- jsD3Libraries);
+- }
+-
+- private static final ExecutorService MODEL_EXECUTOR = Executors.newFixedThreadPool(1);
++ private static ExecutorService MODEL_EXECUTOR = Executors.newFixedThreadPool(1);
+ private FrameSeparator frameSeparator;
+
+ private Browser browser;
+@@ -207,6 +179,13 @@
+ }, MODEL_EXECUTOR);
+ }
+
++ private static Void handleModelBuildException(Throwable ex) {
++ if (!(ex.getCause() instanceof CancellationException)) {
++ FlightRecorderUI.getDefault().getLogger().log(Level.SEVERE, "Failed to build
stacktrace view model", ex); //$NON-NLS-1$
++ }
++ return null;
++ }
++
+ private void setModel(TraceNode root) {
+ if (!browser.isDisposed() && !root.equals(currentRoot)) {
+ currentRoot = root;
+@@ -215,21 +194,19 @@
+ }
+
+ private void setViewerInput(TraceNode root) {
+- browser.setText(HTML_PAGE);
+- browser.addProgressListener(new ProgressAdapter() {
+- @Override
+- public void completed(ProgressEvent event) {
+- browser.removeProgressListener(this);
+- browser.execute(String.format("processGraph(%s);", toJSon(root)));
+- }
+- });
+- }
+-
+- private static Void handleModelBuildException(Throwable ex) {
+- if (!(ex.getCause() instanceof CancellationException)) {
+- FlightRecorderUI.getDefault().getLogger().log(Level.SEVERE, "Failed to build
stacktrace view model", ex); //$NON-NLS-1$
++ try {
++ browser.setText(StringToolkit.readString(FlameGraphView.class.getResourceAsStream("page.html")));
++ browser.addProgressListener(new ProgressAdapter() {
++ @Override
++ public void completed(ProgressEvent event) {
++ browser.removeProgressListener(this);
++ browser.execute(String.format("processGraph(%s);", toJSon(root)));
++ }
++ });
++ } catch (IOException e) {
++ browser.setText(e.getMessage());
++ e.printStackTrace();
+ }
+- return null;
+ }
+
+ private static String toJSon(TraceNode root) {
+@@ -261,23 +238,4 @@
+ private static String toJSonKeyValue(String key, String value) {
+ return "\"" + key + "\": " + "\"" + value
+ "\"";
+ }
+-
+- 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));
+- } catch (IOException e) {
+- FlightRecorderUI.getDefault().getLogger()
+- .log(Level.WARNING, MessageFormat
+- .format("Could not load script \"{0}\",\"{1}\"",
fileName, e.getMessage())); //$NON-NLS-1$
+- return "";
+- }
+- }
+ }
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/page.html
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++
b/application/org.openjdk.jmc.flightrecorder.flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/page.html Mon
Nov 25 17:57:23 2019 -0500
+@@ -0,0 +1,54 @@
++<!DOCTYPE html "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
++<html
xmlns="http://www.w3.org/1999/xhtml">
++
++<head>
++ <meta http-equiv="content-type" content="text/html;
charset=utf-8" />
++ <link rel="stylesheet" type="text/css"
href="https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist...
++ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries
-->
++ <!--[if lt IE 9]>
++ <script
src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"&g...
++ <script
src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js">&l...
++ <![endif]-->
++</head>
++
++<body onresize="resizeFlameGraph()">
++ <div id="chart"></div>
++
++ <script type="text/javascript"
src="https://d3js.org/d3.v4.min.js"></script>
++ <script type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/d3-tip/0.9.1/d3-tip.min....
++ <script type="text/javascript"
src="https://cdn.jsdelivr.net/gh/spiermar/d3-flame-graph@2.0.3/dist/...
++ <script type="text/javascript">
++
++ var flameGraph;
++ var currentJson;
++
++ function processGraph(jsonObj) {
++ flameGraph = d3.flamegraph()
++ .width(windowSize() * 0.9)
++ .transitionDuration(500)
++ .transitionEase(d3.easeCubic)
++ .sort(true)
++ .title("");
++ currentJson = jsonObj;
++ d3.select("#chart")
++ .datum(currentJson)
++ .call(flameGraph);
++ }
++
++ function windowSize() {
++ return Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
++ }
++
++ function resizeFlameGraph() {
++ if (flameGraph) {
++ flameGraph.width(windowSize() * 0.9);
++ d3.select("#chart")
++ .datum(currentJson)
++ .call(flameGraph);
++ }
++ }
++
++ </script>
++</body>
++
++</html>
+diff -r 37a493c3f60b -r bbf0648beb5c
application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template
+---
a/application/org.openjdk.jmc.flightrecorder.flameview/src/main/resources/page.template Tue
Nov 12 16:25:24 2019 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,49 +0,0 @@
+-<!DOCTYPE html "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+-<html
xmlns="http://www.w3.org/1999/xhtml">
+-
+-<head>
+- <meta http-equiv="content-type" content="text/html;
charset=utf-8" />
+- <style type="text/css">%1$s</style>
+- <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries
-->
+- <!--[if lt IE 9]>
+- <script>%2$s</script>
+- <![endif]-->
+-</head>
+-
+-<body onresize="resizeFlameGraph()">
+- <div id="chart"></div>
+- <script type="text/javascript">%3$s</script>
+- <script type="text/javascript">
+-
+- var flameGraph;
+- var currentJson;
+-
+- function processGraph(jsonObj) {
+- flameGraph = d3.flamegraph()
+- .width(windowSize() * 0.9)
+- .transitionDuration(500)
+- .transitionEase(d3.easeCubic)
+- .sort(true)
+- .title("");
+- currentJson = jsonObj;
+- d3.select("#chart")
+- .datum(currentJson)
+- .call(flameGraph);
+- }
+-
+- function windowSize() {
+- return Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+- }
+-
+- function resizeFlameGraph() {
+- if (flameGraph) {
+- flameGraph.width(windowSize() * 0.9);
+- d3.select("#chart")
+- .datum(currentJson)
+- .call(flameGraph);
+- }
+- }
+-
+- </script>
+-</body>
+-</html>
+\ No newline at end of file
diff --git a/11-update-flags.patch b/11-update-flags.patch
new file mode 100644
index 0000000..ad4202c
--- /dev/null
+++ b/11-update-flags.patch
@@ -0,0 +1,15 @@
+# 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 @@
+ </programArgsMac>
+ <programArgsWin>
+ </programArgsWin>
+- <vmArgs>-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
++ <vmArgs>-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
+ </vmArgs>
+ <vmArgsLin>--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED
+ </vmArgsLin>
diff --git a/12-javamail.patch b/12-javamail.patch
new file mode 100644
index 0000000..1b6a8f0
--- /dev/null
+++ b/12-javamail.patch
@@ -0,0 +1,15 @@
+# HG changeset patch
+# Parent 2c034f2ce517d757304226cf8e4d5a5a17b6ee74
+
+diff -r 2c034f2ce517 -r 301005df51a5
application/org.openjdk.jmc.feature.core/feature.xml
+--- a/application/org.openjdk.jmc.feature.core/feature.xml Thu Sep 24 14:49:48 2020
-0400
++++ b/application/org.openjdk.jmc.feature.core/feature.xml Thu Sep 24 15:05:40 2020
-0400
+@@ -161,7 +161,7 @@
+ unpack="false"/>
+
+ <plugin
+- id="com.sun.mail.jakarta.mail"
++ id="com.sun.mail.javax.mail"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
diff --git a/1_javamail.patch b/1_javamail.patch
deleted file mode 100644
index 207a685..0000000
--- a/1_javamail.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/application/org.openjdk.jmc.feature.core/feature.xml
b/application/org.openjdk.jmc.feature.core/feature.xml
-index 6abbea0..d21a907 100644
---- a/application/org.openjdk.jmc.feature.core/feature.xml
-+++ b/application/org.openjdk.jmc.feature.core/feature.xml
-@@ -174,11 +174,4 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="javax.mail.dsn"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- </feature>
-\ No newline at end of file
diff --git a/2-javax.patch b/2-javax.patch
new file mode 100644
index 0000000..edbc5b4
--- /dev/null
+++ b/2-javax.patch
@@ -0,0 +1,34 @@
+# 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 @@
+ <import plugin="org.eclipse.ui.intro"/>
+ <import plugin="org.eclipse.ui.net"/>
+ <import plugin="org.eclipse.equinox.event"/>
+- <import plugin="javax.el"/>
+ <import plugin="org.eclipse.equinox.p2.director.app"/>
+ </requires>
+
diff --git a/2_javax.patch b/2_javax.patch
deleted file mode 100644
index 4ae9650..0000000
--- a/2_javax.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
-index 3fa571d..c24c1c1 100644
---- a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF
-@@ -10,7 +10,7 @@ Bundle-Localization: plugin
- 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.annotation-api;bundle-version="1.2.0";visibility:=reexport,
- javax.inject;bundle-version="1.0.0";visibility:=reexport,
- org.openjdk.jmc.commands
- Bundle-ActivationPolicy: lazy
-@@ -22,7 +22,7 @@ Export-Package: org.openjdk.jmc.console.ui.actions;
- org.openjdk.jmc.console.ui.editor,
-
org.openjdk.jmc.console.ui.editor.internal;x-friends:="org.openjdk.jmc.console.ui.mbeanbrowser,org.openjdk.jmc.rcp.intro"
- Bundle-ClassPath: .
--Import-Package: javax.annotation;version="1.0.0",
-+Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0"
- Automatic-Module-Name: org.openjdk.jmc.console.ui
-
-diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml
b/application/org.openjdk.jmc.feature.rcp/feature.xml
-index 268b595..1e295ca 100644
---- a/application/org.openjdk.jmc.feature.rcp/feature.xml
-+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
-@@ -84,7 +84,8 @@
- <import plugin="org.eclipse.ui.intro"/>
- <import plugin="org.eclipse.ui.net"/>
- <import plugin="org.eclipse.equinox.event"/>
-- <import plugin="javax.el"/>
-+ <import plugin="javax.el-api"/>
-+ <import plugin="jakarta.activation-api"/>
- <import plugin="org.eclipse.equinox.p2.director.app"/>
- </requires>
-
diff --git a/3-remove-profiles.patch b/3-remove-profiles.patch
new file mode 100644
index 0000000..a49f8fa
--- /dev/null
+++ b/3-remove-profiles.patch
@@ -0,0 +1,141 @@
+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 @@
+ <url>${snapshot.repo}</url>
+ </snapshotRepository>
+ </distributionManagement>
+- <profiles>
+- <profile>
+- <id>2019-09</id>
+- <activation>
+- <activeByDefault>true</activeByDefault>
+- </activation>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-2019-09</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- <profile>
+- <id>2019-06</id>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-2019-06</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- <profile>
+- <id>2019-03</id>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-2019-03</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- <profile>
+- <id>2018-12</id>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-2018-12</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- <profile>
+- <id>2018-09</id>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-2018-09</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- <profile>
+- <id>photon</id>
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.eclipse.tycho</groupId>
+- <artifactId>target-platform-configuration</artifactId>
+- <version>${tycho.version}</version>
+- <configuration>
+- <target>
+- <artifact>
+- <groupId>org.openjdk.jmc</groupId>
+- <artifactId>platform-definition-photon</artifactId>
+- <version>7.1.1-SNAPSHOT</version>
+- </artifact>
+- </target>
+- </configuration>
+- </plugin>
+- </plugins>
+- </build>
+- </profile>
+- </profiles>
+ <build>
+ <plugins>
+ <plugin>
diff --git a/3_remove_profiles.patch b/3_remove_profiles.patch
deleted file mode 100644
index 91cc790..0000000
--- a/3_remove_profiles.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index fb12f05..0538111 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -95,53 +95,6 @@
- <url>${snapshot.repo}</url>
- </snapshotRepository>
- </distributionManagement>
-- <profiles>
-- <profile>
-- <id>photon</id>
-- <activation>
-- <activeByDefault>true</activeByDefault>
-- </activation>
-- <build>
-- <plugins>
-- <plugin>
-- <groupId>org.eclipse.tycho</groupId>
-- <artifactId>target-platform-configuration</artifactId>
-- <version>${tycho.version}</version>
-- <configuration>
-- <target>
-- <artifact>
-- <groupId>org.openjdk.jmc</groupId>
-- <artifactId>platform-definition-photon</artifactId>
-- <version>7.0.0-SNAPSHOT</version>
-- </artifact>
-- </target>
-- </configuration>
-- </plugin>
-- </plugins>
-- </build>
-- </profile>
-- <profile>
-- <id>oxygen</id>
-- <build>
-- <plugins>
-- <plugin>
-- <groupId>org.eclipse.tycho</groupId>
-- <artifactId>target-platform-configuration</artifactId>
-- <version>${tycho.version}</version>
-- <configuration>
-- <target>
-- <artifact>
-- <groupId>org.openjdk.jmc</groupId>
-- <artifactId>platform-definition-oxygen</artifactId>
-- <version>7.0.0-SNAPSHOT</version>
-- </artifact>
-- </target>
-- </configuration>
-- </plugin>
-- </plugins>
-- </build>
-- </profile>
-- </profiles>
- <build>
- <plugins>
- <plugin>
diff --git a/4_remove_localization.patch b/4-remove-localization.patch
similarity index 100%
rename from 4_remove_localization.patch
rename to 4-remove-localization.patch
diff --git a/6_remove_ide_jdt.patch b/5-remove-ide-jdt.patch
similarity index 92%
rename from 6_remove_ide_jdt.patch
rename to 5-remove-ide-jdt.patch
index 4618a36..7b080c0 100644
--- a/6_remove_ide_jdt.patch
+++ b/5-remove-ide-jdt.patch
@@ -1,5 +1,5 @@
diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml
b/application/org.openjdk.jmc.feature.ide/feature.xml
-index d6db9f1..439c52a 100644
+index cd3dc7e..128cd0b 100644
--- a/application/org.openjdk.jmc.feature.ide/feature.xml
+++ b/application/org.openjdk.jmc.feature.ide/feature.xml
@@ -65,11 +65,4 @@
@@ -16,10 +16,10 @@ index d6db9f1..439c52a 100644
</feature>
\ No newline at end of file
diff --git a/application/pom.xml b/application/pom.xml
-index d4616f7..ca4a7ff 100644
+index d185d9d..89fd033 100644
--- a/application/pom.xml
+++ b/application/pom.xml
-@@ -79,7 +79,6 @@
+@@ -77,7 +77,6 @@
<module>org.openjdk.jmc.flightrecorder.ui</module>
<module>org.openjdk.jmc.greychart</module>
<module>org.openjdk.jmc.greychart.ui</module>
diff --git a/5_remove_jfx.patch b/5_remove_jfx.patch
deleted file mode 100644
index 31179cb..0000000
--- a/5_remove_jfx.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
-index fcd7c89..3b7d641 100644
---- a/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
-+++ b/application/org.openjdk.jmc.feature.flightrecorder/feature.xml
-@@ -93,13 +93,6 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.openjdk.jmc.javafx.osgi"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- <plugin
- id="org.openjdk.jmc.flightrecorder.rules.extensionprovider"
- download-size="0"
-diff --git a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
-index aa69473..5375d8a 100644
---- a/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
-+++ b/application/org.openjdk.jmc.flightrecorder.ui/META-INF/MANIFEST.MF
-@@ -9,7 +9,6 @@ Bundle-Localization: plugin
- Require-Bundle: org.openjdk.jmc.rjmx,
- org.openjdk.jmc.flightrecorder;visibility:=reexport,
- org.openjdk.jmc.ui;visibility:=reexport,
-- org.openjdk.jmc.javafx.osgi,
- org.openjdk.jmc.flightrecorder.rules,
- org.openjdk.jmc.flightrecorder.rules.jdk,
- org.openjdk.jmc.flightrecorder.configuration,
-diff --git a/application/pom.xml b/application/pom.xml
-index 35e2765..d4616f7 100644
---- a/application/pom.xml
-+++ b/application/pom.xml
-@@ -61,12 +61,10 @@
- <module>org.openjdk.jmc.feature.core</module>
- <module>org.openjdk.jmc.feature.flightrecorder</module>
- <module>org.openjdk.jmc.feature.flightrecorder.ext.g1</module>
-- <module>org.openjdk.jmc.feature.flightrecorder.ext.jfx</module>
- <module>org.openjdk.jmc.feature.flightrecorder.metadata</module>
- <module>org.openjdk.jmc.feature.ide</module>
- <module>org.openjdk.jmc.feature.ide.launch</module>
- <module>org.openjdk.jmc.feature.jconsole</module>
-- <module>org.openjdk.jmc.feature.joverflow</module>
- <module>org.openjdk.jmc.feature.license</module>
- <module>org.openjdk.jmc.feature.pde</module>
- <module>org.openjdk.jmc.feature.rcp</module>
-@@ -75,7 +73,6 @@
- <module>org.openjdk.jmc.flightrecorder.controlpanel.ui</module>
-
<module>org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration</module>
- <module>org.openjdk.jmc.flightrecorder.ext.g1</module>
-- <module>org.openjdk.jmc.flightrecorder.ext.jfx</module>
- <module>org.openjdk.jmc.flightrecorder.metadata</module>
- <module>org.openjdk.jmc.flightrecorder.pde</module>
- <module>org.openjdk.jmc.flightrecorder.rules.extensionprovider</module>
-@@ -85,10 +82,7 @@
- <module>org.openjdk.jmc.ide.jdt</module>
- <module>org.openjdk.jmc.ide.launch</module>
- <module>org.openjdk.jmc.ide.ui</module>
-- <module>org.openjdk.jmc.javafx.osgi</module>
- <module>org.openjdk.jmc.jdp</module>
-- <module>org.openjdk.jmc.joverflow</module>
-- <module>org.openjdk.jmc.joverflow.ui</module>
- <module>org.openjdk.jmc.osgi.extension</module>
- <module>org.openjdk.jmc.pde</module>
- <module>org.openjdk.jmc.rcp.application</module>
-diff --git a/application/tests/pom.xml b/application/tests/pom.xml
-index cc660ff..b7a85c7 100644
---- a/application/tests/pom.xml
-+++ b/application/tests/pom.xml
-@@ -48,7 +48,6 @@
- <module>org.openjdk.jmc.greychart.test</module>
- <module>org.openjdk.jmc.ide.launch.test</module>
- <module>org.openjdk.jmc.jdp.test</module>
-- <module>org.openjdk.jmc.joverflow.test</module>
- <module>org.openjdk.jmc.rjmx.services.jfr.test</module>
- <module>org.openjdk.jmc.rjmx.test</module>
- <module>org.openjdk.jmc.ui.common.test</module>
diff --git a/7_remove_buchen_repo.patch b/6-remove-buchen-repo.patch
similarity index 100%
rename from 7_remove_buchen_repo.patch
rename to 6-remove-buchen-repo.patch
diff --git a/8_add_hamcrest.patch b/7-add-hamcrest.patch
similarity index 100%
rename from 8_add_hamcrest.patch
rename to 7-add-hamcrest.patch
diff --git a/9_remove_arch.patch b/8-remove-arch.patch
similarity index 84%
rename from 9_remove_arch.patch
rename to 8-remove-arch.patch
index e882c2a..dae259d 100644
--- a/9_remove_arch.patch
+++ b/8-remove-arch.patch
@@ -1,15 +1,17 @@
diff --git a/pom.xml b/pom.xml
+index 59f292a..2985869 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -159,20 +159,10 @@
+@@ -117,21 +117,11 @@
+ <version>${tycho.version}</version>
<configuration>
<environments>
- <environment>
+- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
-- <environment>
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
diff --git a/9-remove-jacoco-dep.patch b/9-remove-jacoco-dep.patch
new file mode 100644
index 0000000..0dd9968
--- /dev/null
+++ b/9-remove-jacoco-dep.patch
@@ -0,0 +1,15 @@
+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 @@
+ <artifactId>flightrecorder.rules.jdk</artifactId>
+ <version>7.1.1</version>
+ </dependency>
+- <dependency>
+- <groupId>org.jacoco</groupId>
+- <artifactId>jacoco-maven-plugin</artifactId>
+- <version>0.8.3</version>
+- </dependency>
+ </dependencies>
+ <build>
+ <plugins>
diff --git a/jmc.1 b/jmc.1
index 8f92ff1..671a7ca 100644
--- a/jmc.1
+++ b/jmc.1
@@ -5,15 +5,15 @@ jmc \- Java profiling and diagnostics tool
.B jmc
[\fB\-vm\fR \fIJVM\fR]
.SH DESCRIPTION
-Java Mission Control is a powerful profiler for HotSpot JVMs and has an
+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 Java Flight Recorder.
+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 Java Mission Control.
+Specify path to the JVM you wish to use for running JDK Mission Control.
Defaults to system Java.
.SH FILES
.RS
@@ -21,6 +21,4 @@ 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: <jmc-dev at openjdk dot java dot net>
-.SH AUTHOR
-Salman Siddiqui <sasiddiq at redhat dot com>
\ No newline at end of file
+Report bugs to JMC mailing list: <jmc-dev at openjdk dot java dot net>
\ No newline at end of file
diff --git a/jmc.appdata.xml b/jmc.appdata.xml
new file mode 100644
index 0000000..3ebf60b
--- /dev/null
+++ b/jmc.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>jmc.desktop</id>
+ <metadata_license>FSAP</metadata_license>
+ <project_license>UPL or BSD</project_license>
+ <name>JDK Mission Control</name>
+ <summary>A Profiling and Diagnostics Tool for the Hotspot JVM</summary>
+ <description>
+ <p>
+ 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.
+ </p>
+ </description>
+ <url
type="homepage">http://openjdk.java.net/projects/jmc/</ur...
+ <launchable type="desktop-id">jmc.desktop</launchable>
+ <developer_name>The OpenJDK Community</developer_name>
+</component>
\ No newline at end of file
diff --git a/jmc.desktop b/jmc.desktop
index 3049f79..23e3f6e 100644
--- a/jmc.desktop
+++ b/jmc.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Java Mission Control
+Name=JDK Mission Control
Comment=Analyze performance of Java applications
Exec=jmc
Icon=jmc
diff --git a/jmc.spec b/jmc.spec
index 482f332..5e62cac 100644
--- a/jmc.spec
+++ b/jmc.spec
@@ -1,21 +1,22 @@
# Version
%global major 7
-%global minor 0
-%global patchlevel 0
+%global minor 1
+%global patchlevel 1
# Revision
-%global revnum 0
+%global revnum 8
# set to 1 for hg snapshots, 0 for release
-%global usesnapshot 1
+%global usesnapshot 0
# SNAPSHOT version
-%global hgrevhash 1ddf3baa4e26
-%global hgrevdate 20181130
+%global hgrevhash 63ec7d0ee8d9
+%global hgrevdate 20200608
-%global tarball_name jmc-%{hgrevhash}
+%global tarball_name jmc7-%{hgrevhash}
# Install jmc in /usr/lib/jmc (arch-specific and multilib exempt)
%global _jmcdir %{_prefix}/lib/%{name}
+%global _eclipsepluginsdir %{_prefix}/lib/eclipse/plugins
%global debug_package %{nil}
@@ -37,82 +38,97 @@
# Don't export Eclipse libraries
%global __provides_exclude_from ^%{_jmcdir}/plugins/org.eclipse.*$
+%global __requires_exclude_from ^%{_jmcdir}/plugins/org.eclipse.*$
+
+%global __requires_exclude ^osgi\\((javax|org\\.apache|org\\.eclipse|org\\.sat4j).*$
+%global __provides_exclude
^osgi\\((com|javax|org\\.apache|org\\.glassfish|org\\.kxml2|org\\.sat4j|org\\.tukaani|org\\.w3c|org\\.xmlpull).*$
Name: jmc
Version: %{major}.%{minor}.%{patchlevel}
-Release: %{releasestr}%{?dist}.1
-Summary: Java Mission Control is a profiling and diagnostics tool
-
-License: UPL
+Release: %{releasestr}%{?dist}
+Summary: JDK Mission Control is a profiling and diagnostics tool
+
+# 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:
https://hg.openjdk.java.net/jmc/jmc/archive/%{hgrevhash}.tar.gz
+Source0:
https://hg.openjdk.java.net/jmc/jmc7/archive/%{hgrevhash}.tar.gz
Source1: %{name}.desktop
Source2: %{name}.1
Source3: symlink_libs.sh
+Source4: %{name}.appdata.xml
# Remove optional twitter related functionality
-Patch0: 0_remove_twitter.patch
-# Update javamail dependency names to match what is found in Fedora
-Patch1: 1_javamail.patch
+Patch0: 0-remove-twitter.patch
# Update javax dependency names to match what is found in Fedora
-Patch2: 2_javax.patch
+Patch2: 2-javax.patch
# Remove maven build profiles that won't be used in local build
-Patch3: 3_remove_profiles.patch
+Patch3: 3-remove-profiles.patch
# Remove localization files that currently cannot be supported
# due to a packaging issue for Eclipse language packs
# eclipse-nls-ja and eclipse-nls-zh
# They currently provide multiple archs within the same package
# and the local build system cannot fulfill dependencies from them
-Patch4: 4_remove_localization.patch
-# Remove optional openjfx related functionality
-Patch5: 5_remove_jfx.patch
+Patch4: 4-remove-localization.patch
# Remove unused module org.openjdk.jmc.ide.jdt
-Patch6: 6_remove_ide_jdt.patch
+Patch5: 5-remove-ide-jdt.patch
# Remove unused remote repository definition
-Patch7: 7_remove_buchen_repo.patch
+Patch6: 6-remove-buchen-repo.patch
# Add dependency on org. hamcrest-core to provide class used in unit tests
-Patch8: 8_add_hamcrest.patch
+Patch7: 7-add-hamcrest.patch
# Remove windows and mac arches
-Patch9: 9_remove_arch.patch
+Patch8: 8-remove-arch.patch
+# Remove unnecessary dependency
+Patch9: 9-remove-jacoco-dep.patch
+# Revert downloading of flameview assets from the web
+Patch10: 10-revert-flameview.patch
+# Drop JFR flags (temporary)
+Patch11: 11-update-flags.patch
+
+# JMC depends on Eclipse which no longer supports non-64bit arches
+ExcludeArch: s390 %{arm} %{ix86}
BuildRequires: desktop-file-utils
BuildRequires: maven-local
-BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin:pom:)
-BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin:pom:)
-BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin:pom:)
-BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin:pom:)
-BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin)
+
+BuildRequires: eclipse-pde
+BuildRequires: tycho
+
+BuildRequires: jakarta-mail
BuildRequires: mvn(org.commonjava.maven.plugins:directory-maven-plugin)
-BuildRequires: mvn(name.abuchen:fix-info-plist-maven-plugin)
-BuildRequires: osgi(com.sun.activation.jakarta.activation)
-BuildRequires: osgi(jakarta.mail.api)
-BuildRequires: osgi(javax.annotation-api)
-BuildRequires: osgi(org.eclipse.ecf)
-BuildRequires: osgi(org.eclipse.emf.base)
-BuildRequires: osgi(org.eclipse.equinox.p2.core)
-BuildRequires: osgi(org.eclipse.pde.ui)
-BuildRequires: osgi(org.eclipse.swt)
-BuildRequires: osgi(org.fedoraproject.p2)
-BuildRequires: osgi(org.openjdk.jmc.common)
-
-# most requires are auto-generated
-Requires: osgi(com.sun.activation.jakarta.activation)
-Requires: osgi(jakarta.mail.api)
+BuildRequires: mvn(org.openjdk.jmc:common)
+BuildRequires: HdrHistogram >= 2.1.11
+
+BuildRequires: libappstream-glib
+
+Requires: java-openjdk >= 1:1.8
+
+Requires: osgi(com.sun.mail.jakarta.mail)
Requires: osgi(org.openjdk.jmc.common)
+Requires: osgi(org.openjdk.jmc.flightrecorder)
+Requires: osgi(org.openjdk.jmc.flightrecorder.rules)
+Requires: osgi(org.openjdk.jmc.flightrecorder.rules.jdk)
+Requires: osgi(org.owasp.encoder)
+Requires: osgi(org.hdrhistogram.HdrHistogram) >= 2.1.11
+
+Requires: gtk3
+Requires: webkitgtk4
+Requires: libGLU.so.1()(64bit)
%description
-Java 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 Java Flight Recorder. The tool chain enables
-developers and administrators to collect and analyze data from Java
+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.
%prep
%setup -q -n %{tarball_name}
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -121,13 +137,30 @@ applications running locally or deployed in production
environments.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
+%patch11 -p1
%pom_disable_module releng
%pom_disable_module l10n application
%pom_disable_module org.openjdk.jmc.updatesite.ide application
%pom_disable_module org.openjdk.jmc.updatesite.rcp application
+# disable tests that require the use of jfr v1
+%pom_disable_module org.openjdk.jmc.rjmx.services.jfr.test application/tests
+%pom_disable_module org.openjdk.jmc.flightrecorder.controlpanel.ui.test
application/tests
+
%pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+
+%pom_remove_plugin :jacoco-maven-plugin application/tests
+%pom_remove_plugin :jacoco-maven-plugin application/uitests
+%pom_disable_module coverage application
+
+# Info.plist are mac files and we only build for Linux
+%pom_remove_plugin name.abuchen:fix-info-plist-maven-plugin
application/org.openjdk.jmc.rcp.product
+
+%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-deploy-plugin
TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV"
@@ -135,7 +168,7 @@
TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></
%build
# some tests require large heap and fail with OOM
# depending on the builder resources
-%mvn_build -j -- -Dmaven.test.failure.ignore=true
+%mvn_build -j -- -Dmaven.test.failure.ignore=true -DbuildId=fedora
-DbuildNumber=%{hgrevhash} -Dbuild.date=%{hgrevdate}
%install
@@ -143,18 +176,15 @@
TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></
# we want to install JMC as an RCP application
# change jmc.ini to use system java (remove -vm option line)
-sed -i '/^-vm$/d'
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
-sed -i '/^..\/..\/bin\/$/d'
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
-
-# add IgnoreUnrecognizedVMOptions flag to allow running on OpenJDK 8 without
'Unrecognized VM option' error
-sed -i '/^-vmargs$/a -XX:+IgnoreUnrecognizedVMOptions'
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/%{name}.ini
+sed -i '/^-vm$/d'
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{eclipse_arch}/%{name}.ini
+sed -i '/^..\/..\/bin\/$/d'
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{eclipse_arch}/%{name}.ini
# delete unnecessary files
-rm -r
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/p2/
+rm -r
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{eclipse_arch}/p2/
-# move contents of target/products/org.openjdk.jmc/linux/gtk/x86_64/ to /usr/lib/jmc/
+# move contents of target/products/org.openjdk.jmc/%{_os}/gtk/%{eclipse_arch}/ to
/usr/lib/jmc/
install -d -m 755 %{buildroot}%{_jmcdir}
-cp -p -r
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{_arch}/*
%{buildroot}%{_jmcdir}/
+cp -p -r
%{_builddir}/%{tarball_name}/target/products/org.openjdk.jmc/%{_os}/gtk/%{eclipse_arch}/*
%{buildroot}%{_jmcdir}/
# move jmc.ini to /etc/jmc.ini
install -d -m 755 %{buildroot}%{_sysconfdir}
@@ -166,15 +196,7 @@ install -d -m 755 %{buildroot}%{_bindir}
ln -s %{_jmcdir}/%{name} %{buildroot}%{_bindir}/%{name}
# replace jars with symlinks to installed libraries
-pushd %{buildroot}%{_jmcdir}/plugins
- xmvn-subst .
- # org.eclipse.swt*.jar is symlinked incorrectly by xmvn-subst
- for i in "org.eclipse.swt*.jar"; do
- rm -f $i
- touch $i
- done
-popd
-bash %{SOURCE3} %{buildroot}%{_jmcdir}/plugins
+bash %{SOURCE3} %{buildroot}%{_jmcdir}/plugins %{_javadir}/jmc-core
# create application launcher in desktop menu
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
@@ -191,25 +213,10 @@ install -d -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1
sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini"
%{buildroot}%{_mandir}/man1/%{name}.1
-# install symlink script
-install -d -m 755 %{buildroot}%{_jmcdir}/tools
-install -p -m 755 %{SOURCE3} %{buildroot}%{_jmcdir}/tools/symlink_libs.sh
-
-# set triggers to update symlinks when Eclipse JARs are updated
-%triggerin -- eclipse-ecf-core
-bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
-
-%triggerin -- eclipse-emf-core
-bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
-
-%triggerin -- eclipse-equinox-osgi
-bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
-
-%triggerin -- eclipse-platform
-bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
-
-%triggerin -- eclipse-swt
-bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
+# install appdata and validate it
+install -d -m 755 %{buildroot}%{_metainfodir}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%files
%license license/LICENSE.txt
@@ -222,13 +229,47 @@ bash %{_jmcdir}/tools/symlink_libs.sh %{_jmcdir}/plugins
%{_datadir}/maven-poms/%{name}
%{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/applications/%{name}.desktop
+%{_metainfodir}/%{name}.appdata.xml
%changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.0-0.20181130hg1ddf3baa4e26.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Fri Nov 06 2020 Jie Kang <jkang(a)redhat.com> - 7.1.1-8
+- Use jakarta-mail
+
+* Mon Sep 21 2020 Jie Kang <jkang(a)redhat.com> - 7.1.1-7
+- Update license. Use javamail until jakarta-mail is included
+- Add appdata and validate it
+
+* Fri Aug 28 2020 Jie Kang <jkang(a)redhat.com> - 7.1.1-6
+- Update to latest upstream
+- Drop javax dependencies
+- Clean spec
+
+* Fri Aug 07 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.1-5
+- Update symlink to match javamail version in rpms/javamail
+- Version 1.6.5 is compatible with 1.6.3 according to the upstream compatibility notes
+
+* Wed Jul 29 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.1-4
+- Update symlink script with path to jakarta-activation
+
+* Mon Apr 27 2020 Jie Kang <jkang(a)redhat.com> - 7.1.1-3
+- Update to upstream 7.1.1 ga commit
+
+* Wed Mar 11 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.1-2
+- Update to latest upstream (to include JMC-6728)
+
+* Tue Feb 25 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.1-1
+- Update to latest upstream
+
+* Tue Feb 18 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.0-2
+- Add backports of JMC-6554 & JMC-6692 on top of JMC 7 for improved handling of
OpenJDK8+JFR
+
+* Thu Jan 09 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.0-1
+- Update to latest upstream (7.1.0-ga)
+- Update the jmc7 branch to more closely resemble files of the main jmc branch
+- Addition of Patch9 and Patch10, updated symlink_libs.sh
-* Fri Nov 30 2018 Salman Siddiqui <sasiddiq(a)redhat.com> -
7.0.0-0.20181130hg1ddf3baa4e26
-- Update to latest snapshot version
+* Tue Sep 24 2019 Jie Kang <jkang(a)redhat.com> - 7.0.0-1
+- Update to latest upstream with minor bug fixes
-* Fri Sep 14 2018 Salman Siddiqui <sasiddiq(a)redhat.com> - 7.0.0-0
-- Initial packaging
+* Mon Jun 03 2019 Jie Kang <jkang(a)redhat.com> - 7.0.0-0
+- Initial package
diff --git a/sources b/sources
index f1a8f79..02d96dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (1ddf3baa4e26.tar.gz) =
d447d6eb7e390ee99fb11f846ad3137cedfc45b869cb6bb10368a97b2a991e1f220093bada90103480e497b20d8764a7c1034a787548d208f39f690f8b109804
+SHA512 (63ec7d0ee8d9.tar.gz) =
b928746234af8c6b084501cb9fd65ddd34fd995083d2ae383bccb492862f923c36b829795cd0d5160fa12bda915148e516d820698e3e479636408eea904139bf
diff --git a/symlink_libs.sh b/symlink_libs.sh
index b798a39..778dc03 100644
--- a/symlink_libs.sh
+++ b/symlink_libs.sh
@@ -1,273 +1,60 @@
#!/bin/bash
# This script replaces plugins with symlinks
-# $1 : folder of jars to replace with symlinks
+# $1 : folder to replace with symlinks
set -e
-ECLIPSE_DIR=/usr/lib/eclipse/plugins
+SCL_JAVA_DIRS=${@:2}
-function _sym {
- echo "linking $1 to $2"
- rm -rf $1
- ln -s $2 $1
+pushd () {
+ command pushd "$@" > /dev/null
}
-pushd $1
- JARS="
- org.eclipse.core.commands_*.jar
- org.eclipse.core.contenttype_*.jar
- org.eclipse.core.databinding_*.jar
- org.eclipse.core.databinding.beans_*.jar
- org.eclipse.core.databinding.observable_*.jar
- org.eclipse.core.databinding.property_*.jar
- org.eclipse.core.expressions_*.jar
- org.eclipse.core.filesystem_*.jar
- org.eclipse.core.jobs_*.jar
- org.eclipse.core.net_*.jar
- org.eclipse.core.resources_*.jar
- org.eclipse.core.runtime_*.jar
- org.eclipse.e4.core.commands_*.jar
- org.eclipse.e4.core.contexts_*.jar
- org.eclipse.e4.core.di_*.jar
- org.eclipse.e4.core.di.annotations_*.jar
- org.eclipse.e4.core.di.extensions_*.jar
- org.eclipse.e4.core.di.extensions.supplier_*.jar
- org.eclipse.e4.core.services_*.jar
- org.eclipse.e4.emf.xpath_*.jar
- org.eclipse.e4.ui.bindings_*.jar
- org.eclipse.e4.ui.css.core_*.jar
- org.eclipse.e4.ui.css.swt_*.jar
- org.eclipse.e4.ui.css.swt.theme_*.jar
- org.eclipse.e4.ui.di_*.jar
- org.eclipse.e4.ui.dialogs_*.jar
- org.eclipse.e4.ui.model.workbench_*.jar
- org.eclipse.e4.ui.services_*.jar
- org.eclipse.e4.ui.swt.gtk_*.jar
- org.eclipse.e4.ui.widgets_*.jar
- org.eclipse.e4.ui.workbench_*.jar
- org.eclipse.e4.ui.workbench3_*.jar
- org.eclipse.e4.ui.workbench.addons.swt_*.jar
- org.eclipse.e4.ui.workbench.renderers.swt_*.jar
- org.eclipse.e4.ui.workbench.swt_*.jar
- org.eclipse.ecf_*.jar
- org.eclipse.ecf.filetransfer_*.jar
- org.eclipse.ecf.identity_*.jar
- org.eclipse.ecf.provider.filetransfer_*.jar
- org.eclipse.ecf.provider.filetransfer.httpclient4_*.jar
- org.eclipse.ecf.provider.filetransfer.httpclient4.ssl_*.jar
- org.eclipse.ecf.provider.filetransfer.ssl_*.jar
- org.eclipse.ecf.ssl_*.jar
- org.eclipse.emf.common_*.jar
- org.eclipse.emf.ecore_*.jar
- org.eclipse.emf.ecore.change_*.jar
- org.eclipse.emf.ecore.xmi_*.jar
- org.eclipse.equinox.app_*.jar
- org.eclipse.equinox.bidi_*.jar
- org.eclipse.equinox.common_*.jar
- org.eclipse.equinox.concurrent_*.jar
- org.eclipse.equinox.console_*.jar
- org.eclipse.equinox.ds_*.jar
- org.eclipse.equinox.event_*.jar
- org.eclipse.equinox.frameworkadmin_*.jar
- org.eclipse.equinox.frameworkadmin.equinox_*.jar
- org.eclipse.equinox.http.jetty_*.jar
- org.eclipse.equinox.http.registry_*.jar
- org.eclipse.equinox.jsp.jasper_*.jar
- org.eclipse.equinox.jsp.jasper.registry_*.jar
- org.eclipse.equinox.launcher_*.jar
- org.eclipse.equinox.p2.artifact.repository_*.jar
- org.eclipse.equinox.p2.console_*.jar
- org.eclipse.equinox.p2.core_*.jar
- org.eclipse.equinox.p2.director_*.jar
- org.eclipse.equinox.p2.director.app_*.jar
- org.eclipse.equinox.p2.directorywatcher_*.jar
- org.eclipse.equinox.p2.engine_*.jar
- org.eclipse.equinox.p2.extensionlocation_*.jar
- org.eclipse.equinox.p2.garbagecollector_*.jar
- org.eclipse.equinox.p2.jarprocessor_*.jar
- org.eclipse.equinox.p2.metadata_*.jar
- org.eclipse.equinox.p2.metadata.repository_*.jar
- org.eclipse.equinox.p2.operations_*.jar
- org.eclipse.equinox.p2.publisher_*.jar
- org.eclipse.equinox.p2.publisher.eclipse_*.jar
- org.eclipse.equinox.p2.reconciler.dropins_*.jar
- org.eclipse.equinox.p2.repository_*.jar
- org.eclipse.equinox.p2.touchpoint.eclipse_*.jar
- org.eclipse.equinox.p2.touchpoint.natives_*.jar
- org.eclipse.equinox.p2.transport.ecf_*.jar
- org.eclipse.equinox.p2.ui_*.jar
- org.eclipse.equinox.p2.ui.sdk_*.jar
- org.eclipse.equinox.p2.ui.sdk.scheduler_*.jar
- org.eclipse.equinox.p2.updatechecker_*.jar
- org.eclipse.equinox.preferences_*.jar
- org.eclipse.equinox.registry_*.jar
- org.eclipse.equinox.security_*.jar
- org.eclipse.equinox.security.ui_*.jar
- org.eclipse.equinox.simpleconfigurator_*.jar
- org.eclipse.equinox.simpleconfigurator.manipulator_*.jar
- org.eclipse.equinox.util_*.jar
- org.eclipse.help_*.jar
- org.eclipse.help.base_*.jar
- org.eclipse.help.ui_*.jar
- org.eclipse.help.webapp_*.jar
- org.eclipse.jdt.core.compiler.batch_*.jar
- org.eclipse.jface_*.jar
- org.eclipse.jface.databinding_*.jar
- org.eclipse.jface.text_*.jar
- org.eclipse.rcp_*.jar
- org.eclipse.text_*.jar
- org.eclipse.ui_*.jar
- org.eclipse.ui.forms_*.jar
- org.eclipse.ui.intro_*.jar
- org.eclipse.ui.net_*.jar
- org.eclipse.ui.views_*.jar
- org.eclipse.ui.workbench_*.jar
- org.eclipse.update.configurator_*.jar
- "
- # org.eclipse.equinox.launcher determines what launches (don't symlink this jar)
-
- FOLDERS="
- org.eclipse.equinox.launcher.gtk.linux.*
- org.eclipse.equinox.security.linux.*
- org.eclipse.swt.gtk.linux.*
- "
-
- for name in ${JARS}; do
- rm -f $name
- done
- for name in ${FOLDERS}; do
- rm -rf $name
- done
-
-popd
-
-pushd $ECLIPSE_DIR
-
- JARS="
- org.eclipse.core.commands_*.jar
- org.eclipse.core.contenttype_*.jar
- org.eclipse.core.databinding_*.jar
- org.eclipse.core.databinding.beans_*.jar
- org.eclipse.core.databinding.observable_*.jar
- org.eclipse.core.databinding.property_*.jar
- org.eclipse.core.expressions_*.jar
- org.eclipse.core.filesystem_*.jar
- org.eclipse.core.jobs_*.jar
- org.eclipse.core.net_*.jar
- org.eclipse.core.resources_*.jar
- org.eclipse.core.runtime_*.jar
- org.eclipse.e4.core.commands_*.jar
- org.eclipse.e4.core.contexts_*.jar
- org.eclipse.e4.core.di_*.jar
- org.eclipse.e4.core.di.annotations_*.jar
- org.eclipse.e4.core.di.extensions_*.jar
- org.eclipse.e4.core.di.extensions.supplier_*.jar
- org.eclipse.e4.core.services_*.jar
- org.eclipse.e4.emf.xpath_*.jar
- org.eclipse.e4.ui.bindings_*.jar
- org.eclipse.e4.ui.css.core_*.jar
- org.eclipse.e4.ui.css.swt_*.jar
- org.eclipse.e4.ui.css.swt.theme_*.jar
- org.eclipse.e4.ui.di_*.jar
- org.eclipse.e4.ui.dialogs_*.jar
- org.eclipse.e4.ui.model.workbench_*.jar
- org.eclipse.e4.ui.services_*.jar
- org.eclipse.e4.ui.swt.gtk_*.jar
- org.eclipse.e4.ui.widgets_*.jar
- org.eclipse.e4.ui.workbench_*.jar
- org.eclipse.e4.ui.workbench3_*.jar
- org.eclipse.e4.ui.workbench.addons.swt_*.jar
- org.eclipse.e4.ui.workbench.renderers.swt_*.jar
- org.eclipse.e4.ui.workbench.swt_*.jar
- org.eclipse.ecf_*.jar
- org.eclipse.ecf.filetransfer_*.jar
- org.eclipse.ecf.identity_*.jar
- org.eclipse.ecf.provider.filetransfer_*.jar
- org.eclipse.ecf.provider.filetransfer.httpclient4_*.jar
- org.eclipse.ecf.provider.filetransfer.httpclient4.ssl_*.jar
- org.eclipse.ecf.provider.filetransfer.ssl_*.jar
- org.eclipse.ecf.ssl_*.jar
- org.eclipse.emf.common_*.jar
- org.eclipse.emf.ecore_*.jar
- org.eclipse.emf.ecore.change_*.jar
- org.eclipse.emf.ecore.xmi_*.jar
- org.eclipse.equinox.app_*.jar
- org.eclipse.equinox.bidi_*.jar
- org.eclipse.equinox.common_*.jar
- org.eclipse.equinox.concurrent_*.jar
- org.eclipse.equinox.console_*.jar
- org.eclipse.equinox.ds_*.jar
- org.eclipse.equinox.event_*.jar
- org.eclipse.equinox.frameworkadmin_*.jar
- org.eclipse.equinox.frameworkadmin.equinox_*.jar
- org.eclipse.equinox.http.jetty_*.jar
- org.eclipse.equinox.http.registry_*.jar
- org.eclipse.equinox.jsp.jasper_*.jar
- org.eclipse.equinox.jsp.jasper.registry_*.jar
- org.eclipse.equinox.launcher_*.jar
- org.eclipse.equinox.p2.artifact.repository_*.jar
- org.eclipse.equinox.p2.console_*.jar
- org.eclipse.equinox.p2.core_*.jar
- org.eclipse.equinox.p2.director_*.jar
- org.eclipse.equinox.p2.director.app_*.jar
- org.eclipse.equinox.p2.directorywatcher_*.jar
- org.eclipse.equinox.p2.engine_*.jar
- org.eclipse.equinox.p2.extensionlocation_*.jar
- org.eclipse.equinox.p2.garbagecollector_*.jar
- org.eclipse.equinox.p2.jarprocessor_*.jar
- org.eclipse.equinox.p2.metadata_*.jar
- org.eclipse.equinox.p2.metadata.repository_*.jar
- org.eclipse.equinox.p2.operations_*.jar
- org.eclipse.equinox.p2.publisher_*.jar
- org.eclipse.equinox.p2.publisher.eclipse_*.jar
- org.eclipse.equinox.p2.reconciler.dropins_*.jar
- org.eclipse.equinox.p2.repository_*.jar
- org.eclipse.equinox.p2.touchpoint.eclipse_*.jar
- org.eclipse.equinox.p2.touchpoint.natives_*.jar
- org.eclipse.equinox.p2.transport.ecf_*.jar
- org.eclipse.equinox.p2.ui_*.jar
- org.eclipse.equinox.p2.ui.sdk_*.jar
- org.eclipse.equinox.p2.ui.sdk.scheduler_*.jar
- org.eclipse.equinox.p2.updatechecker_*.jar
- org.eclipse.equinox.preferences_*.jar
- org.eclipse.equinox.registry_*.jar
- org.eclipse.equinox.security_*.jar
- org.eclipse.equinox.security.ui_*.jar
- org.eclipse.equinox.simpleconfigurator_*.jar
- org.eclipse.equinox.simpleconfigurator.manipulator_*.jar
- org.eclipse.equinox.util_*.jar
- org.eclipse.help_*.jar
- org.eclipse.help.base_*.jar
- org.eclipse.help.ui_*.jar
- org.eclipse.help.webapp_*.jar
- org.eclipse.jdt.core.compiler.batch_*.jar
- org.eclipse.jface_*.jar
- org.eclipse.jface.databinding_*.jar
- org.eclipse.jface.text_*.jar
- org.eclipse.rcp_*.jar
- org.eclipse.text_*.jar
- org.eclipse.ui_*.jar
- org.eclipse.ui.forms_*.jar
- org.eclipse.ui.intro_*.jar
- org.eclipse.ui.net_*.jar
- org.eclipse.ui.views_*.jar
- org.eclipse.ui.workbench_*.jar
- org.eclipse.update.configurator_*.jar
- "
- # org.eclipse.equinox.launcher determines what launches (don't symlink this jar)
+popd () {
+ command popd "$@" > /dev/null
+}
- FOLDERS="
- org.eclipse.equinox.launcher.gtk.linux.*
- org.eclipse.equinox.security.linux.*
- org.eclipse.swt.gtk.linux.*
- "
+function _sym {
+ if [ -f $1 ]; then
+ echo "linking $1 to $2"
+ rm -rf $1
+ ln -s $2 $1
+ else
+ echo "Failed to find $1"
+ ls -l
+ exit 1
+ fi
+}
- for name in ${JARS}; do
- _sym $1/$name $ECLIPSE_DIR/$name
- done
- for name in ${FOLDERS}; do
- _sym $1/$name ${ECLIPSE_DIR}/$name
- done
+function _symlink {
+ _f=$(ls | grep -e "^$1" || :)
+ if [ -n "$_f" ] ; then
+ rm -rf $_f
+ for SCL_JAVA_DIR in ${SCL_JAVA_DIRS}; do
+ if [ -f ${SCL_JAVA_DIR}/$2 ]; then
+ echo "linking ${_f%.jar}.jar to ${SCL_JAVA_DIR}/$2"
+ ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar
+ return 0
+ fi
+ done
+ echo "not found $2 in any of ${SCL_JAVA_DIRS}"
+ exit 1
+ fi
+}
+pushd $1
+ # owasp-java-encoder
+ _sym org.owasp.encoder_1.2.2.jar /usr/share/java/owasp-java-encoder/encoder.jar
+ # jakarta-activation
+ _sym com.sun.activation.jakarta.activation_1.2.2.jar
/usr/share/java/jakarta-activation/jakarta.activation.jar
+ # HdrHistogram
+ _sym org.hdrhistogram.HdrHistogram_2.1.11.jar /usr/share/java/HdrHistogram.jar
+ # javamail
+ _sym com.sun.mail.jakarta.mail_1.6.5.jar /usr/share/java/jakarta-mail/jakarta.mail.jar
+ # jmc-core
+ _symlink org.openjdk.jmc.common_ common.jar
+ _symlink org.openjdk.jmc.flightrecorder_ flightrecorder.jar
+ _symlink org.openjdk.jmc.flightrecorder.rules_ flightrecorder.rules.jar
+ _symlink org.openjdk.jmc.flightrecorder.rules.jdk_ flightrecorder.rules.jdk.jar
popd