From 6842c80ab1ec5c82dac7ddb04530c6820e370c87 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 30 2021 18:40:14 +0000 Subject: import jmc-8.0.0-7.module+el8.4.0+10094+02d29114 --- 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/0-remove-twitter.patch b/SOURCES/0-remove-twitter.patch new file mode 100644 index 0000000..fdefa07 --- /dev/null +++ b/SOURCES/0-remove-twitter.patch @@ -0,0 +1,224 @@ +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 +@@ -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, +- org.openjdk.jmc.console.twitter, + org.openjdk.jmc.rjmx.test", + 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 +@@ -59,7 +59,6 @@ + org.openjdk.jmc.console.jconsole + org.openjdk.jmc.console.pde + org.openjdk.jmc.console.persistence +- org.openjdk.jmc.console.twitter + org.openjdk.jmc.console.ui + org.openjdk.jmc.console.ui.diagnostic + org.openjdk.jmc.console.ui.mbeanbrowser +@@ -81,7 +80,6 @@ + org.openjdk.jmc.feature.pde + org.openjdk.jmc.feature.rcp + org.openjdk.jmc.feature.rcp.update +- org.openjdk.jmc.feature.twitter + org.openjdk.jmc.flightrecorder.configuration + 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 +@@ -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 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/ +- +- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +- +- 1. Definitions. +- +- "License" shall mean the terms and conditions for use, reproduction, +- and distribution as defined by Sections 1 through 9 of this document. +- +- "Licensor" shall mean the copyright owner or entity authorized by +- the copyright owner that is granting the License. +- +- "Legal Entity" shall mean the union of the acting entity and all +- other entities that control, are controlled by, or are under common +- control with that entity. For the purposes of this definition, +- "control" means (i) the power, direct or indirect, to cause the +- direction or management of such entity, whether by contract or +- otherwise, or (ii) ownership of fifty percent (50%) or more of the +- outstanding shares, or (iii) beneficial ownership of such entity. +- +- "You" (or "Your") shall mean an individual or Legal Entity +- exercising permissions granted by this License. +- +- "Source" form shall mean the preferred form for making modifications, +- including but not limited to software source code, documentation +- source, and configuration files. +- +- "Object" form shall mean any form resulting from mechanical +- transformation or translation of a Source form, including but +- not limited to compiled object code, generated documentation, +- and conversions to other media types. +- +- "Work" shall mean the work of authorship, whether in Source or +- Object form, made available under the License, as indicated by a +- copyright notice that is included in or attached to the work +- (an example is provided in the Appendix below). +- +- "Derivative Works" shall mean any work, whether in Source or Object +- form, that is based on (or derived from) the Work and for which the +- editorial revisions, annotations, elaborations, or other modifications +- represent, as a whole, an original work of authorship. For the purposes +- of this License, Derivative Works shall not include works that remain +- separable from, or merely link (or bind by name) to the interfaces of, +- the Work and Derivative Works thereof. +- +- "Contribution" shall mean any work of authorship, including +- the original version of the Work and any modifications or additions +- to that Work or Derivative Works thereof, that is intentionally +- submitted to Licensor for inclusion in the Work by the copyright owner +- or by an individual or Legal Entity authorized to submit on behalf of +- the copyright owner. For the purposes of this definition, "submitted" +- means any form of electronic, verbal, or written communication sent +- to the Licensor or its representatives, including but not limited to +- communication on electronic mailing lists, source code control systems, +- and issue tracking systems that are managed by, or on behalf of, the +- Licensor for the purpose of discussing and improving the Work, but +- excluding communication that is conspicuously marked or otherwise +- designated in writing by the copyright owner as "Not a Contribution." +- +- "Contributor" shall mean Licensor and any individual or Legal Entity +- on behalf of whom a Contribution has been received by Licensor and +- subsequently incorporated within the Work. +- +- 2. Grant of Copyright License. Subject to the terms and conditions of +- this License, each Contributor hereby grants to You a perpetual, +- worldwide, non-exclusive, no-charge, royalty-free, irrevocable +- copyright license to reproduce, prepare Derivative Works of, +- publicly display, publicly perform, sublicense, and distribute the +- Work and such Derivative Works in Source or Object form. +- +- 3. Grant of Patent License. Subject to the terms and conditions of +- this License, each Contributor hereby grants to You a perpetual, +- worldwide, non-exclusive, no-charge, royalty-free, irrevocable +- (except as stated in this section) patent license to make, have made, +- use, offer to sell, sell, import, and otherwise transfer the Work, +- where such license applies only to those patent claims licensable +- by such Contributor that are necessarily infringed by their +- Contribution(s) alone or by combination of their Contribution(s) +- with the Work to which such Contribution(s) was submitted. If You +- institute patent litigation against any entity (including a +- cross-claim or counterclaim in a lawsuit) alleging that the Work +- or a Contribution incorporated within the Work constitutes direct +- or contributory patent infringement, then any patent licenses +- granted to You under this License for that Work shall terminate +- as of the date such litigation is filed. +- +- 4. Redistribution. You may reproduce and distribute copies of the +- Work or Derivative Works thereof in any medium, with or without +- modifications, and in Source or Object form, provided that You +- meet the following conditions: +- +- (a) You must give any other recipients of the Work or +- Derivative Works a copy of this License; and +- +- (b) You must cause any modified files to carry prominent notices +- stating that You changed the files; and +- +- (c) You must retain, in the Source form of any Derivative Works +- that You distribute, all copyright, patent, trademark, and +- attribution notices from the Source form of the Work, +- excluding those notices that do not pertain to any part of +- the Derivative Works; and +- +- (d) If the Work includes a "NOTICE" text file as part of its +- distribution, then any Derivative Works that You distribute must +- include a readable copy of the attribution notices contained +- within such NOTICE file, excluding those notices that do not +- pertain to any part of the Derivative Works, in at least one +- of the following places: within a NOTICE text file distributed +- as part of the Derivative Works; within the Source form or +- documentation, if provided along with the Derivative Works; or, +- within a display generated by the Derivative Works, if and +- wherever such third-party notices normally appear. The contents +- of the NOTICE file are for informational purposes only and +- do not modify the License. You may add Your own attribution +- notices within Derivative Works that You distribute, alongside +- or as an addendum to the NOTICE text from the Work, provided +- that such additional attribution notices cannot be construed +- as modifying the License. +- +- You may add Your own copyright statement to Your modifications and +- may provide additional or different license terms and conditions +- for use, reproduction, or distribution of Your modifications, or +- for any such Derivative Works as a whole, provided Your use, +- reproduction, and distribution of the Work otherwise complies with +- the conditions stated in this License. +- +- 5. Submission of Contributions. Unless You explicitly state otherwise, +- any Contribution intentionally submitted for inclusion in the Work +- by You to the Licensor shall be under the terms and conditions of +- this License, without any additional terms or conditions. +- Notwithstanding the above, nothing herein shall supersede or modify +- the terms of any separate license agreement you may have executed +- with Licensor regarding such Contributions. +- +- 6. Trademarks. This License does not grant permission to use the trade +- names, trademarks, service marks, or product names of the Licensor, +- except as required for reasonable and customary use in describing the +- origin of the Work and reproducing the content of the NOTICE file. +- +- 7. Disclaimer of Warranty. Unless required by applicable law or +- agreed to in writing, Licensor provides the Work (and each +- Contributor provides its Contributions) on an "AS IS" BASIS, +- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +- implied, including, without limitation, any warranties or conditions +- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +- PARTICULAR PURPOSE. You are solely responsible for determining the +- appropriateness of using or redistributing the Work and assume any +- risks associated with Your exercise of permissions under this License. +- +- 8. Limitation of Liability. In no event and under no legal theory, +- whether in tort (including negligence), contract, or otherwise, +- unless required by applicable law (such as deliberate and grossly +- negligent acts) or agreed to in writing, shall any Contributor be +- liable to You for damages, including any direct, indirect, special, +- incidental, or consequential damages of any character arising as a +- result of this License or out of the use or inability to use the +- Work (including but not limited to damages for loss of goodwill, +- work stoppage, computer failure or malfunction, or any and all +- other commercial damages or losses), even if such Contributor +- has been advised of the possibility of such damages. +- +- 9. Accepting Warranty or Additional Liability. While redistributing +- the Work or Derivative Works thereof, You may choose to offer, +- and charge a fee for, acceptance of support, warranty, indemnity, +- or other liability obligations and/or rights consistent with this +- License. However, in accepting such obligations, You may act only +- on Your own behalf and on Your sole responsibility, not on behalf +- of any other Contributor, and only if You agree to indemnify, +- defend, and hold each Contributor harmless for any liability +- incurred by, or claims asserted against, such Contributor by reason +- of your accepting any such warranty or additional liability. +- +- + %% The following notice is provided with respect to D3 v6.1.3, which may + be included with this product. + diff --git a/SOURCES/1-remove-profiles.patch b/SOURCES/1-remove-profiles.patch new file mode 100644 index 0000000..6e51aef --- /dev/null +++ b/SOURCES/1-remove-profiles.patch @@ -0,0 +1,100 @@ +diff --git a/pom.xml b/pom.xml +index 587d175..1c7c1f1 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -109,95 +109,6 @@ + ${snapshot.repo} + + +- +- +- 2020-12 +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-2020-12 +- 8.0.0-SNAPSHOT +- +- +- +- +- +- +- +- +- 2020-09 +- +- true +- +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-2020-09 +- 8.0.0-SNAPSHOT +- +- +- +- +- +- +- +- +- 2020-06 +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-2020-06 +- 8.0.0-SNAPSHOT +- +- +- +- +- +- +- +- +- 2020-03 +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- 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 @@ + + + +- +- +- + + + ++ ++ ++ ++ +
+ ++ ++ + +- +