From 1cb1a7203aaca1c41dc30b3fad73d7e8a1398061 Mon Sep 17 00:00:00 2001 From: Jie Kang Date: Nov 30 2018 19:19:52 +0000 Subject: Update jmc package --- diff --git a/jmc/0_remove_twitter.patch b/jmc/0_remove_twitter.patch deleted file mode 100644 index 545e843..0000000 --- a/jmc/0_remove_twitter.patch +++ /dev/null @@ -1,277 +0,0 @@ -diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF ---- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF -+++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF -@@ -54,7 +54,6 @@ - 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/org.openjdk.jmc.updatesite.ide/category.xml b/application/org.openjdk.jmc.updatesite.ide/category.xml ---- a/application/org.openjdk.jmc.updatesite.ide/category.xml -+++ b/application/org.openjdk.jmc.updatesite.ide/category.xml -@@ -55,10 +55,6 @@ - id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0"> - - -- -- -- - -diff --git a/application/org.openjdk.jmc.updatesite.ide/feature.xml b/application/org.openjdk.jmc.updatesite.ide/feature.xml ---- a/application/org.openjdk.jmc.updatesite.ide/feature.xml -+++ b/application/org.openjdk.jmc.updatesite.ide/feature.xml -@@ -67,10 +67,6 @@ - version="0.0.0"/> - - -- -- - -diff --git a/application/org.openjdk.jmc.updatesite.rcp/category.xml b/application/org.openjdk.jmc.updatesite.rcp/category.xml ---- a/application/org.openjdk.jmc.updatesite.rcp/category.xml -+++ b/application/org.openjdk.jmc.updatesite.rcp/category.xml -@@ -55,10 +55,6 @@ - id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0"> - - -- -- -- - -diff --git a/application/org.openjdk.jmc.updatesite.rcp/feature.xml b/application/org.openjdk.jmc.updatesite.rcp/feature.xml ---- a/application/org.openjdk.jmc.updatesite.rcp/feature.xml -+++ b/application/org.openjdk.jmc.updatesite.rcp/feature.xml -@@ -67,10 +67,6 @@ - version="0.0.0"/> - - -- -- - -diff --git a/application/pom.xml b/application/pom.xml ---- a/application/pom.xml -+++ b/application/pom.xml -@@ -50,7 +50,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 -@@ -72,7 +71,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 ---- a/license/THIRDPARTYREADME.txt -+++ b/license/THIRDPARTYREADME.txt -@@ -367,187 +367,3 @@ - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - 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, --which may be included with this product. -- -- -- 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. -- --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 diff --git a/jmc/1_javamail.patch b/jmc/1_javamail.patch deleted file mode 100644 index b16787e..0000000 --- a/jmc/1_javamail.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml ---- a/application/org.openjdk.jmc.feature.core/feature.xml -+++ b/application/org.openjdk.jmc.feature.core/feature.xml -@@ -161,35 +161,7 @@ - unpack="false"/> - - -- -- -- -- -- -- -- -- - - -- -+ -+ - - - diff --git a/jmc/3_remove_profiles.patch b/jmc/3_remove_profiles.patch deleted file mode 100644 index 70be804..0000000 --- a/jmc/3_remove_profiles.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/pom.xml b/pom.xml ---- a/pom.xml -+++ b/pom.xml -@@ -88,53 +88,6 @@ - ${snapshot.repo} - - -- -- -- photon -- -- true -- -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho-version} -- -- -- -- org.openjdk.jmc -- platform-definition-photon -- 7.0.0-SNAPSHOT -- -- -- -- -- -- -- -- -- oxygen -- -- -- -- org.eclipse.tycho -- target-platform-configuration -- ${tycho-version} -- -- -- -- org.openjdk.jmc -- platform-definition-oxygen -- 7.0.0-SNAPSHOT -- -- -- -- -- -- -- -- - - - diff --git a/jmc/4_remove_localization.patch b/jmc/4_remove_localization.patch deleted file mode 100644 index 4ba10d2..0000000 --- a/jmc/4_remove_localization.patch +++ /dev/null @@ -1,50 +0,0 @@ -# HG changeset patch -# Parent 6dfe58a53a9c2f2148ff30f94b9859112ca05bad - -diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml ---- a/application/org.openjdk.jmc.feature.rcp/feature.xml -+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml -@@ -52,18 +52,10 @@ - version="0.0.0"/> - - -- -- - - -- -- - -@@ -103,24 +95,6 @@ - unpack="false"/> - - -- -- -- -- - - -- -- org.openjdk.jmc.feature.core - org.openjdk.jmc.feature.flightrecorder - org.openjdk.jmc.feature.flightrecorder.ext.g1 -- org.openjdk.jmc.feature.flightrecorder.ext.jfx - org.openjdk.jmc.feature.flightrecorder.metadata - org.openjdk.jmc.feature.ide - org.openjdk.jmc.feature.ide.launch - org.openjdk.jmc.feature.jconsole -- org.openjdk.jmc.feature.joverflow - org.openjdk.jmc.feature.license - org.openjdk.jmc.feature.pde - org.openjdk.jmc.feature.rcp -@@ -75,7 +73,6 @@ - org.openjdk.jmc.flightrecorder.controlpanel.ui - org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration - org.openjdk.jmc.flightrecorder.ext.g1 -- org.openjdk.jmc.flightrecorder.ext.jfx - org.openjdk.jmc.flightrecorder.metadata - org.openjdk.jmc.flightrecorder.pde - org.openjdk.jmc.flightrecorder.rules.extensionprovider -@@ -85,10 +82,7 @@ - org.openjdk.jmc.ide.jdt - org.openjdk.jmc.ide.launch - org.openjdk.jmc.ide.ui -- org.openjdk.jmc.javafx.osgi - org.openjdk.jmc.jdp -- org.openjdk.jmc.joverflow -- org.openjdk.jmc.joverflow.ui - org.openjdk.jmc.osgi.extension - org.openjdk.jmc.pde - org.openjdk.jmc.rcp.application -diff --git a/application/tests/pom.xml b/application/tests/pom.xml ---- a/application/tests/pom.xml -+++ b/application/tests/pom.xml -@@ -48,7 +48,6 @@ - org.openjdk.jmc.greychart.test - org.openjdk.jmc.ide.launch.test - org.openjdk.jmc.jdp.test -- org.openjdk.jmc.joverflow.test - org.openjdk.jmc.rjmx.services.jfr.test - org.openjdk.jmc.rjmx.test - org.openjdk.jmc.ui.common.test diff --git a/jmc/6_remove_ide_jdt.patch b/jmc/6_remove_ide_jdt.patch deleted file mode 100644 index 3b2cae9..0000000 --- a/jmc/6_remove_ide_jdt.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# Parent 361c91e54fb1074e7483ec160a4dac6c1675d649 - -diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml ---- a/application/org.openjdk.jmc.feature.ide/feature.xml -+++ b/application/org.openjdk.jmc.feature.ide/feature.xml -@@ -65,11 +65,4 @@ - install-size="0" - version="0.0.0" - unpack="false"/> -- -- - -\ No newline at end of file -diff --git a/application/pom.xml b/application/pom.xml ---- a/application/pom.xml -+++ b/application/pom.xml -@@ -79,7 +79,6 @@ - org.openjdk.jmc.flightrecorder.ui - org.openjdk.jmc.greychart - org.openjdk.jmc.greychart.ui -- org.openjdk.jmc.ide.jdt - org.openjdk.jmc.ide.launch - org.openjdk.jmc.ide.ui - org.openjdk.jmc.jdp diff --git a/jmc/7_remove_buchen_repo.patch b/jmc/7_remove_buchen_repo.patch deleted file mode 100644 index 3ad6bf3..0000000 --- a/jmc/7_remove_buchen_repo.patch +++ /dev/null @@ -1,18 +0,0 @@ -# HG changeset patch -# Parent e578b12592dbe1e92201ab61ccdb32a1205f9b37 - -diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml ---- a/application/org.openjdk.jmc.rcp.product/pom.xml -+++ b/application/org.openjdk.jmc.rcp.product/pom.xml -@@ -141,11 +141,4 @@ - - ../../target/ - -- -- -- buchen-maven-repo -- http://buchen.github.io/maven-repo -- default -- -- - diff --git a/jmc/8_add_hamcrest.patch b/jmc/8_add_hamcrest.patch deleted file mode 100644 index 5d4bc88..0000000 --- a/jmc/8_add_hamcrest.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF ---- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF -+++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF -@@ -12,7 +12,8 @@ - org.openjdk.jmc.rjmx.services.jfr, - org.openjdk.jmc.rjmx, - org.openjdk.jmc.common, -- org.openjdk.jmc.flightrecorder.configuration -+ org.openjdk.jmc.flightrecorder.configuration, -+ org.hamcrest.core - Export-Package: org.openjdk.jmc.rjmx.services.jfr.test - Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test --Import-Package: org.openjdk.jmc.flightrecorder.jdk -+Import-Package: org.openjdk.jmc.flightrecorder.jdk, org.hamcrest.core diff --git a/jmc/generate_jmc_tarball.sh b/jmc/generate_jmc_tarball.sh old mode 100755 new mode 100644 index dfe912c..237ba12 --- a/jmc/generate_jmc_tarball.sh +++ b/jmc/generate_jmc_tarball.sh @@ -1,9 +1,11 @@ #!/bin/sh -wget http://hg.openjdk.java.net/jmc/jmc/archive/ecb68ef82eb7.tar.gz -tar xzf ecb68ef82eb7.tar.gz -rm ecb68ef82eb7.tar.gz -mv jmc-ecb68ef82eb7/ jmc-7.0.0/ +RELEASE=9aa7085f938b + +wget http://hg.openjdk.java.net/jmc/jmc/archive/${RELEASE}.tar.gz +tar xzf ${RELEASE}.tar.gz +rm ${RELEASE}.tar.gz +mv jmc-${RELEASE}/ jmc-7.0.0/ rm -r jmc-7.0.0/core/ tar czf jmc-7.0.0.tar.gz jmc-7.0.0/ rm -r jmc-7.0.0 diff --git a/jmc/jmc-add-hamcrest.patch b/jmc/jmc-add-hamcrest.patch new file mode 100644 index 0000000..5d4bc88 --- /dev/null +++ b/jmc/jmc-add-hamcrest.patch @@ -0,0 +1,14 @@ +diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF +--- a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF ++++ b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/META-INF/MANIFEST.MF +@@ -12,7 +12,8 @@ + org.openjdk.jmc.rjmx.services.jfr, + org.openjdk.jmc.rjmx, + org.openjdk.jmc.common, +- org.openjdk.jmc.flightrecorder.configuration ++ org.openjdk.jmc.flightrecorder.configuration, ++ org.hamcrest.core + Export-Package: org.openjdk.jmc.rjmx.services.jfr.test + Automatic-Module-Name: org.openjdk.jmc.rjmx.services.jfr.test +-Import-Package: org.openjdk.jmc.flightrecorder.jdk ++Import-Package: org.openjdk.jmc.flightrecorder.jdk, org.hamcrest.core diff --git a/jmc/jmc-remove-buchen-repo.patch b/jmc/jmc-remove-buchen-repo.patch new file mode 100644 index 0000000..3ad6bf3 --- /dev/null +++ b/jmc/jmc-remove-buchen-repo.patch @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent e578b12592dbe1e92201ab61ccdb32a1205f9b37 + +diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml +--- a/application/org.openjdk.jmc.rcp.product/pom.xml ++++ b/application/org.openjdk.jmc.rcp.product/pom.xml +@@ -141,11 +141,4 @@ + + ../../target/ + +- +- +- buchen-maven-repo +- http://buchen.github.io/maven-repo +- default +- +- + diff --git a/jmc/jmc-remove-ide-jdt.patch b/jmc/jmc-remove-ide-jdt.patch new file mode 100644 index 0000000..3b2cae9 --- /dev/null +++ b/jmc/jmc-remove-ide-jdt.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 361c91e54fb1074e7483ec160a4dac6c1675d649 + +diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml +--- a/application/org.openjdk.jmc.feature.ide/feature.xml ++++ b/application/org.openjdk.jmc.feature.ide/feature.xml +@@ -65,11 +65,4 @@ + install-size="0" + version="0.0.0" + unpack="false"/> +- +- + +\ No newline at end of file +diff --git a/application/pom.xml b/application/pom.xml +--- a/application/pom.xml ++++ b/application/pom.xml +@@ -79,7 +79,6 @@ + org.openjdk.jmc.flightrecorder.ui + org.openjdk.jmc.greychart + org.openjdk.jmc.greychart.ui +- org.openjdk.jmc.ide.jdt + org.openjdk.jmc.ide.launch + org.openjdk.jmc.ide.ui + org.openjdk.jmc.jdp diff --git a/jmc/jmc-remove-localization.patch b/jmc/jmc-remove-localization.patch new file mode 100644 index 0000000..63b2cce --- /dev/null +++ b/jmc/jmc-remove-localization.patch @@ -0,0 +1,47 @@ +diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml +--- a/application/org.openjdk.jmc.feature.rcp/feature.xml ++++ b/application/org.openjdk.jmc.feature.rcp/feature.xml +@@ -52,18 +52,10 @@ + version="0.0.0"/> + + +- +- + + +- +- + +@@ -105,24 +97,6 @@ + unpack="false"/> + + +- +- +- +- + + +- +- org.openjdk.jmc.feature.core + org.openjdk.jmc.feature.flightrecorder + org.openjdk.jmc.feature.flightrecorder.ext.g1 +- org.openjdk.jmc.feature.flightrecorder.ext.jfx + org.openjdk.jmc.feature.flightrecorder.metadata + org.openjdk.jmc.feature.ide + org.openjdk.jmc.feature.ide.launch + org.openjdk.jmc.feature.jconsole +- org.openjdk.jmc.feature.joverflow + org.openjdk.jmc.feature.license + org.openjdk.jmc.feature.pde + org.openjdk.jmc.feature.rcp +@@ -75,7 +73,6 @@ + org.openjdk.jmc.flightrecorder.controlpanel.ui + org.openjdk.jmc.flightrecorder.controlpanel.ui.configuration + org.openjdk.jmc.flightrecorder.ext.g1 +- org.openjdk.jmc.flightrecorder.ext.jfx + org.openjdk.jmc.flightrecorder.metadata + org.openjdk.jmc.flightrecorder.pde + org.openjdk.jmc.flightrecorder.rules.extensionprovider +@@ -85,10 +82,7 @@ + org.openjdk.jmc.ide.jdt + org.openjdk.jmc.ide.launch + org.openjdk.jmc.ide.ui +- org.openjdk.jmc.javafx.osgi + org.openjdk.jmc.jdp +- org.openjdk.jmc.joverflow +- org.openjdk.jmc.joverflow.ui + org.openjdk.jmc.osgi.extension + org.openjdk.jmc.pde + org.openjdk.jmc.rcp.application +diff --git a/application/tests/pom.xml b/application/tests/pom.xml +--- a/application/tests/pom.xml ++++ b/application/tests/pom.xml +@@ -48,7 +48,6 @@ + org.openjdk.jmc.greychart.test + org.openjdk.jmc.ide.launch.test + org.openjdk.jmc.jdp.test +- org.openjdk.jmc.joverflow.test + org.openjdk.jmc.rjmx.services.jfr.test + org.openjdk.jmc.rjmx.test + org.openjdk.jmc.ui.common.test diff --git a/jmc/jmc-remove-profiles.patch b/jmc/jmc-remove-profiles.patch new file mode 100644 index 0000000..9aac2ff --- /dev/null +++ b/jmc/jmc-remove-profiles.patch @@ -0,0 +1,91 @@ +diff --git a/pom.xml b/pom.xml +--- a/pom.xml ++++ b/pom.xml +@@ -95,53 +95,6 @@ + ${snapshot.repo} + + +- +- +- photon +- +- true +- +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-photon +- 7.0.0-SNAPSHOT +- +- +- +- +- +- +- +- +- oxygen +- +- +- +- org.eclipse.tycho +- target-platform-configuration +- ${tycho.version} +- +- +- +- org.openjdk.jmc +- platform-definition-oxygen +- 7.0.0-SNAPSHOT +- +- +- +- +- +- +- +- + + + +diff --git a/releng/platform-definitions/platform-definition-oxygen/.project b/releng/platform-definitions/platform-definition-oxygen/.project +--- a/releng/platform-definitions/platform-definition-oxygen/.project ++++ b/releng/platform-definitions/platform-definition-oxygen/.project +@@ -5,7 +5,13 @@ + + + ++ ++ org.eclipse.m2e.core.maven2Builder ++ ++ ++ + + ++ org.eclipse.m2e.core.maven2Nature + + +diff --git a/releng/platform-definitions/platform-definition-photon/.project b/releng/platform-definitions/platform-definition-photon/.project +--- a/releng/platform-definitions/platform-definition-photon/.project ++++ b/releng/platform-definitions/platform-definition-photon/.project +@@ -5,7 +5,13 @@ + + + ++ ++ org.eclipse.m2e.core.maven2Builder ++ ++ ++ + + ++ org.eclipse.m2e.core.maven2Nature + + diff --git a/jmc/jmc-remove-twitter.patch b/jmc/jmc-remove-twitter.patch new file mode 100644 index 0000000..545e843 --- /dev/null +++ b/jmc/jmc-remove-twitter.patch @@ -0,0 +1,277 @@ +diff --git a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF +--- a/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF ++++ b/application/org.openjdk.jmc.rjmx/META-INF/MANIFEST.MF +@@ -54,7 +54,6 @@ + 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/org.openjdk.jmc.updatesite.ide/category.xml b/application/org.openjdk.jmc.updatesite.ide/category.xml +--- a/application/org.openjdk.jmc.updatesite.ide/category.xml ++++ b/application/org.openjdk.jmc.updatesite.ide/category.xml +@@ -55,10 +55,6 @@ + id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0"> + + +- +- +- + +diff --git a/application/org.openjdk.jmc.updatesite.ide/feature.xml b/application/org.openjdk.jmc.updatesite.ide/feature.xml +--- a/application/org.openjdk.jmc.updatesite.ide/feature.xml ++++ b/application/org.openjdk.jmc.updatesite.ide/feature.xml +@@ -67,10 +67,6 @@ + version="0.0.0"/> + + +- +- + +diff --git a/application/org.openjdk.jmc.updatesite.rcp/category.xml b/application/org.openjdk.jmc.updatesite.rcp/category.xml +--- a/application/org.openjdk.jmc.updatesite.rcp/category.xml ++++ b/application/org.openjdk.jmc.updatesite.rcp/category.xml +@@ -55,10 +55,6 @@ + id="org.openjdk.jmc.feature.console.ui.subscriptions" version="0.0.0"> + + +- +- +- + +diff --git a/application/org.openjdk.jmc.updatesite.rcp/feature.xml b/application/org.openjdk.jmc.updatesite.rcp/feature.xml +--- a/application/org.openjdk.jmc.updatesite.rcp/feature.xml ++++ b/application/org.openjdk.jmc.updatesite.rcp/feature.xml +@@ -67,10 +67,6 @@ + version="0.0.0"/> + + +- +- + +diff --git a/application/pom.xml b/application/pom.xml +--- a/application/pom.xml ++++ b/application/pom.xml +@@ -50,7 +50,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 +@@ -72,7 +71,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 +--- a/license/THIRDPARTYREADME.txt ++++ b/license/THIRDPARTYREADME.txt +@@ -367,187 +367,3 @@ + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + 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, +-which may be included with this product. +- +- +- 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. +- +-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 diff --git a/jmc/jmc-update-ee.patch b/jmc/jmc-update-ee.patch new file mode 100644 index 0000000..97c63b0 --- /dev/null +++ b/jmc/jmc-update-ee.patch @@ -0,0 +1,32 @@ +diff --git a/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.console.ui/META-INF/MANIFEST.MF +--- 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,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 +@@ -22,7 +21,6 @@ + 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", +- javax.inject;version="1.0.0" ++Import-Package: 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 +--- a/application/org.openjdk.jmc.feature.rcp/feature.xml ++++ b/application/org.openjdk.jmc.feature.rcp/feature.xml +@@ -84,7 +84,7 @@ + + + +- ++ + + + diff --git a/jmc/jmc-update-javamail.patch b/jmc/jmc-update-javamail.patch new file mode 100644 index 0000000..3078bd3 --- /dev/null +++ b/jmc/jmc-update-javamail.patch @@ -0,0 +1,40 @@ +diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml +--- a/application/org.openjdk.jmc.feature.core/feature.xml ++++ b/application/org.openjdk.jmc.feature.core/feature.xml +@@ -161,35 +161,7 @@ + unpack="false"/> + + +- +- +- +- +- +- +- +- - 7.0.0-2 -- Changed installation directory from /usr/share/java/jmc to /usr/share/jmc - -* Fri Sep 14 2018 Salman Siddiqui - 7.0.0-1 +* Fri Sep 14 2018 Salman Siddiqui - 7.0.0-9.20181122hg9aa7085f938b - Initial packaging diff --git a/jmc/symlink_eclipse_libs.sh b/jmc/symlink_eclipse_libs.sh new file mode 100644 index 0000000..7460bfe --- /dev/null +++ b/jmc/symlink_eclipse_libs.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +# This script replaces plugins with symlinks +# $1 : folder of jars to replace with symlinks +# $2 : folder of jars to be symlinked to +set -e + +ECLIPSE_DIR=/usr/lib/eclipse/plugins + +JARS=" +org.eclipse.core*.jar +org.eclipse.e4*.jar +org.eclipse.ecf*.jar +org.eclipse.equinox.app*.jar +org.eclipse.equinox.bidi*.jar +org.eclipse.equinox.common*.jar +org.eclipse.equinox.concurrent*.jar +org.eclipse.equinox.ds*.jar +org.eclipse.equinox.event*.jar +org.eclipse.equinox.frameworkadmin*.jar +org.eclipse.equinox.http*.jar +org.eclipse.equinox.jsp*.jar +org.eclipse.equinox.p2*.jar +org.eclipse.equinox.preferences*.jar +org.eclipse.equinox.registry*.jar +org.eclipse.equinox.security*.jar +org.eclipse.equinox.simpleconfigurator*.jar +org.eclipse.equinox.util*.jar +org.eclipse.help*.jar +org.eclipse.jdt*.jar +org.eclipse.jface*.jar +org.eclipse.rcp*.jar +org.eclipse.swt*.jar +org.eclipse.text*.jar +org.eclipse.ui*.jar +org.eclipse.update*.jar +" + +# org.eclipse.equinox.launcher determines what launches + +function _sym { + if [ -f $1 ] + then + echo "linking $1 to $2" + rm -rf $1 + ln -s $2 $1 + else + echo "failed to link $1 to $2" + exit 1 + fi +} + +for name in ${JARS}; do + echo ${name} +done + +pushd $1 + for name in ${JARS}; do + for i in ${name}; do + _sym $i ${ECLIPSE_DIR}/$i + done + done +popd +