From 83ffb82ff34bd4550c8cc7d21f440fde72575da1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 30 Mar 2021 14:40:14 -0400 Subject: [PATCH] import jmc-8.0.0-7.module+el8.4.0+10094+02d29114 --- .gitignore | 2 +- .jmc.metadata | 2 +- ...e-twitter.patch => 0-remove-twitter.patch} | 27 ++- ...profiles.patch => 1-remove-profiles.patch} | 63 +++--- .../10-revert-lz4-java-name-override.patch | 42 ++++ SOURCES/11-tycho.patch | 23 ++ SOURCES/12-remove-chromium.patch | 22 ++ SOURCES/13-revert-graphview.patch | 130 +++++++++++ SOURCES/14-revert-6852.patch | 12 + SOURCES/15-fix-javamail.patch | 13 ++ SOURCES/16-revert-resourcelocator.patch | 208 ++++++++++++++++++ SOURCES/17-revert-list-of.patch | 21 ++ ...tion.patch => 2-remove-localization.patch} | 21 +- ...e-ide-jdt.patch => 3-remove-ide-jdt.patch} | 8 +- ...-repo.patch => 4-remove-buchen-repo.patch} | 1 + ...dd-hamcrest.patch => 5-add-hamcrest.patch} | 3 +- ...{remove-arch.patch => 6-remove-arch.patch} | 8 +- SOURCES/7-remove-jacoco-dep.patch | 16 ++ SOURCES/8-revert-flameview.patch | 185 ++++++++++++++++ SOURCES/9-update-flags.patch | 14 ++ SOURCES/fix-javamail.patch | 64 ------ SOURCES/fix-jfr-message.patch | 12 - SOURCES/javax.patch | 34 --- SOURCES/remove-jfx.patch | 74 ------- SOURCES/symlink_libs.sh | 54 ++--- SPECS/jmc.spec | 126 ++++++++--- 26 files changed, 872 insertions(+), 313 deletions(-) rename SOURCES/{remove-twitter.patch => 0-remove-twitter.patch} (95%) rename SOURCES/{remove-profiles.patch => 1-remove-profiles.patch} (78%) create mode 100644 SOURCES/10-revert-lz4-java-name-override.patch create mode 100644 SOURCES/11-tycho.patch create mode 100644 SOURCES/12-remove-chromium.patch create mode 100644 SOURCES/13-revert-graphview.patch create mode 100644 SOURCES/14-revert-6852.patch create mode 100644 SOURCES/15-fix-javamail.patch create mode 100644 SOURCES/16-revert-resourcelocator.patch create mode 100644 SOURCES/17-revert-list-of.patch rename SOURCES/{remove-localization.patch => 2-remove-localization.patch} (89%) rename SOURCES/{remove-ide-jdt.patch => 3-remove-ide-jdt.patch} (86%) rename SOURCES/{remove-buchen-repo.patch => 4-remove-buchen-repo.patch} (94%) rename SOURCES/{add-hamcrest.patch => 5-add-hamcrest.patch} (91%) rename SOURCES/{remove-arch.patch => 6-remove-arch.patch} (84%) create mode 100644 SOURCES/7-remove-jacoco-dep.patch create mode 100644 SOURCES/8-revert-flameview.patch create mode 100644 SOURCES/9-update-flags.patch delete mode 100644 SOURCES/fix-javamail.patch delete mode 100644 SOURCES/fix-jfr-message.patch delete mode 100644 SOURCES/javax.patch delete mode 100644 SOURCES/remove-jfx.patch diff --git a/.gitignore b/.gitignore index 32aaa13..5d1009f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/9871e02a9e40.tar.gz +SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz diff --git a/.jmc.metadata b/.jmc.metadata index d280f6a..6f8a31c 100644 --- a/.jmc.metadata +++ b/.jmc.metadata @@ -1 +1 @@ -f204e02359b91f8158edb5dc2934e6506567bce1 SOURCES/9871e02a9e40.tar.gz +84a94e40c47c9b5ab5975bb4c97ad6f69ae0c68f SOURCES/8ab40bfb565c1002e84bb238a620ab81bb64eceb.tar.gz diff --git a/SOURCES/remove-twitter.patch b/SOURCES/0-remove-twitter.patch similarity index 95% rename from SOURCES/remove-twitter.patch rename to SOURCES/0-remove-twitter.patch index f7c6839..fdefa07 100644 --- a/SOURCES/remove-twitter.patch +++ b/SOURCES/0-remove-twitter.patch @@ -1,7 +1,8 @@ diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF +index 775f1d8..979a323 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 @@ +@@ -57,7 +57,6 @@ Export-Package: org.openjdk.jmc.rjmx, org.openjdk.jmc.rjmx.triggers; x-friends:="org.openjdk.jmc.console.ui.notification, org.openjdk.jmc.alert, @@ -10,9 +11,10 @@ diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application 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 9f8783a..7aa8842 100644 --- a/application/pom.xml +++ b/application/pom.xml -@@ -50,7 +50,6 @@ +@@ -59,7 +59,6 @@ org.openjdk.jmc.console.jconsole org.openjdk.jmc.console.pde org.openjdk.jmc.console.persistence @@ -20,7 +22,7 @@ diff --git a/application/pom.xml b/application/pom.xml org.openjdk.jmc.console.ui org.openjdk.jmc.console.ui.diagnostic org.openjdk.jmc.console.ui.mbeanbrowser -@@ -72,7 +71,6 @@ +@@ -81,7 +80,6 @@ org.openjdk.jmc.feature.pde org.openjdk.jmc.feature.rcp org.openjdk.jmc.feature.rcp.update @@ -29,17 +31,18 @@ diff --git a/application/pom.xml b/application/pom.xml org.openjdk.jmc.flightrecorder.controlpanel.ui org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt +index 596a8db..ba7bf83 100644 --- a/license/THIRDPARTYREADME.txt +++ b/license/THIRDPARTYREADME.txt -@@ -296,191 +296,6 @@ - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +@@ -297,187 +297,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.7, + +-%% The following notice is provided with respect to Twitter4J v4.0.7, -which may be included with this product. - -- +- Copyright 2007 Yusuke Yamamoto +- - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ @@ -215,11 +218,7 @@ diff --git a/license/THIRDPARTYREADME.txt b/license/THIRDPARTYREADME.txt - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - --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. + %% The following notice is provided with respect to D3 v6.1.3, which may + be included with this product. diff --git a/SOURCES/remove-profiles.patch b/SOURCES/1-remove-profiles.patch similarity index 78% rename from SOURCES/remove-profiles.patch rename to SOURCES/1-remove-profiles.patch index 6a85c87..6e51aef 100644 --- a/SOURCES/remove-profiles.patch +++ b/SOURCES/1-remove-profiles.patch @@ -1,13 +1,35 @@ diff --git a/pom.xml b/pom.xml +index 587d175..1c7c1f1 100644 --- a/pom.xml +++ b/pom.xml -@@ -99,95 +99,6 @@ +@@ -109,95 +109,6 @@ ${snapshot.repo} - - -- 2019-03 +- 2020-12 +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-2020-12 +- 8.0.0-SNAPSHOT +- +- +- +- +- +- +- +- +- 2020-09 - - true - @@ -21,8 +43,8 @@ diff --git a/pom.xml b/pom.xml - - - org.openjdk.jmc -- platform-definition-2019-03 -- 7.0.0-SNAPSHOT +- platform-definition-2020-09 +- 8.0.0-SNAPSHOT - - - @@ -31,7 +53,7 @@ diff --git a/pom.xml b/pom.xml - - - -- 2018-12 +- 2020-06 - - - @@ -42,8 +64,8 @@ diff --git a/pom.xml b/pom.xml - - - org.openjdk.jmc -- platform-definition-2018-12 -- 7.0.0-SNAPSHOT +- platform-definition-2020-06 +- 8.0.0-SNAPSHOT - - - @@ -52,7 +74,7 @@ diff --git a/pom.xml b/pom.xml - - - -- 2018-09 +- 2020-03 - - - @@ -63,29 +85,8 @@ diff --git a/pom.xml b/pom.xml - - - org.openjdk.jmc -- platform-definition-2018-09 -- 7.0.0-SNAPSHOT -- -- -- -- -- -- -- -- -- photon -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho.version} -- -- -- -- org.openjdk.jmc -- platform-definition-photon -- 7.0.0-SNAPSHOT +- platform-definition-2020-03 +- 8.0.0-SNAPSHOT - - - diff --git a/SOURCES/10-revert-lz4-java-name-override.patch b/SOURCES/10-revert-lz4-java-name-override.patch new file mode 100644 index 0000000..4265ed3 --- /dev/null +++ b/SOURCES/10-revert-lz4-java-name-override.patch @@ -0,0 +1,42 @@ +diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml +index f42eed3..b53c5e5 100644 +--- a/application/org.openjdk.jmc.feature.core/feature.xml ++++ b/application/org.openjdk.jmc.feature.core/feature.xml +@@ -95,7 +95,7 @@ + unpack="false"/> + + + + + + org.lz4:lz4-java:${lz4.version} +- true +- +- org.lz4.lz4-java +- org.lz4.lz4-java +- + + + org.hdrhistogram:HdrHistogram:${hdrhistogram.version} diff --git a/SOURCES/11-tycho.patch b/SOURCES/11-tycho.patch new file mode 100644 index 0000000..32c8abc --- /dev/null +++ b/SOURCES/11-tycho.patch @@ -0,0 +1,23 @@ +diff --git a/pom.xml b/pom.xml +index 329f840..c5f06c9 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -77,7 +77,7 @@ + + UTF-8 + UTF-8 +- 2.0.0 ++ 2.1.0 + 1.4 + 2.8.2 + 0.3.1 +@@ -144,7 +144,8 @@ + tycho-compiler-plugin + ${tycho.version} + +- false ++ false ++ false + + + diff --git a/SOURCES/12-remove-chromium.patch b/SOURCES/12-remove-chromium.patch new file mode 100644 index 0000000..ac30732 --- /dev/null +++ b/SOURCES/12-remove-chromium.patch @@ -0,0 +1,22 @@ +diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml +index b53c5e5..1eb682d 100644 +--- a/application/org.openjdk.jmc.feature.core/feature.xml ++++ b/application/org.openjdk.jmc.feature.core/feature.xml +@@ -62,17 +62,6 @@ + + + +- +- + + org.openjdk.jmc.flightrecorder.graphview + eclipse-plugin +- +- +- 1.4.2 +- 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-v5-js +- ${download-maven-plugin.phase} +- +- wget +- +- +- https://d3js.org/d3.v5.min.js +- false +- ${download-maven-plugin.output} +- true +- true +- +- +- +- wasm +- ${download-maven-plugin.phase} +- +- wget +- +- +- https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js +- false +- ${download-maven-plugin.output} +- true +- true +- +- +- +- d3-graphviz-js +- ${download-maven-plugin.phase} +- +- wget +- +- +- https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js +- false +- ${download-maven-plugin.output} +- true +- true +- +- +- +- graphvizlib-wasm +- ${download-maven-plugin.phase} +- +- wget +- +- +- https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm +- false +- ${download-maven-plugin.output} +- true +- true +- +- +- +- +- +- + +diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java +index 1389545..d356c2e 100644 +--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java ++++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java +@@ -85,18 +85,7 @@ import org.openjdk.jmc.ui.misc.DisplayToolkit; + public class GraphView extends ViewPart implements ISelectionListener { + private static final String HTML_PAGE; + static { +- String jsD3V5 = "jslibs/d3.v5.min.js"; +- String jsGraphviz = "jslibs/index.js"; +- String wasmGraphviz = "jslibs/graphvizlib.wasm"; +- String jsGraphizD3 = "jslibs/d3-graphviz.js"; +- +- String wasmBase64 = loadBase64FromFile(wasmGraphviz); +- +- HTML_PAGE = String.format(loadStringFromFile("page.template"), loadLibraries(jsD3V5), +- // we inline base64 wasm in the library code to avoid fetching it at runtime +- loadStringFromFile(jsGraphviz, "wasmBinaryFile=\"graphvizlib.wasm\";", +- "wasmBinaryFile=dataURIPrefix + '" + wasmBase64 + "';"), +- loadLibraries(jsGraphizD3)); ++ HTML_PAGE = String.format(loadStringFromFile("page.template")); + } + + private enum ModelState { +diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template +index eb7423a..e424576 100644 +--- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template ++++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template +@@ -3,12 +3,13 @@ + + + +- +- +- + + + ++ ++ ++ ++ +
+ ++ ++ + +- +