From: Jani Simomaa <jani.simomaa@semantum.fi>
Date: Mon, 20 Apr 2020 06:52:00 +0000 (+0000)
Subject: Merge "Revert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind" into release... 
X-Git-Tag: v1.43.0~39
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=91b6412e6c2187870611385be8455b1dc6fa4156;hp=0475e2249457b728c884f14ff1bb221ec8c22e3b;p=simantics%2Fplatform.git

Merge "Revert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind" into release/1.43.0
---

diff --git a/bundles/org.simantics.scl.ui/plugin.xml b/bundles/org.simantics.scl.ui/plugin.xml
index b7d5c9fb2..ac4489d2e 100644
--- a/bundles/org.simantics.scl.ui/plugin.xml
+++ b/bundles/org.simantics.scl.ui/plugin.xml
@@ -142,30 +142,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.ui.views.showView"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+Q S">
-         <parameter
-               id="org.eclipse.ui.views.showView.viewId"
-               value="org.simantics.scl.ui.console">
-         </parameter>
-      </key>
-      <key
-            platform="carbon"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+Q S">
-      </key>
-      <key
-            platform="carbon"
-            commandId="org.eclipse.ui.views.showView"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M3+Q S">
-         <parameter
-               id="org.eclipse.ui.views.showView.viewId"
-               value="org.simantics.scl.ui.console">
-         </parameter>
-      </key>
       <key
             commandId="org.simantics.scl.editor.openModule"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"