7348: JMC preference options are duplicated

Reviewed-by: hirt

application/org.openjdk.jmc.console.agent/META-INF/MANIFEST.MF

@@ -6,10 +6,10 @@ Bundle-Version: 8.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.jface.text,
- org.eclipse.ui.editors,
+ org.eclipse.ui.editors;resolution:=optional,
  org.eclipse.core.filesystem,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
+ org.eclipse.ui.ide;resolution:=optional,
+ org.eclipse.core.resources;resolution:=optional,
  org.eclipse.e4.core.contexts,
  org.openjdk.jmc.console.ui,
  org.openjdk.jmc.flightrecorder.ui,

application/org.openjdk.jmc.feature.console.agent/feature.xml

@@ -1,4 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--   
+   Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2021, Red Hat Inc. All rights reserved.
+   
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+   
+   The contents of this file are subject to the terms of either the Universal Permissive License 
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+   
+   or the following license:
+   
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+   
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+   
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+   
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, 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.
+-->
 <feature
       id="org.openjdk.jmc.feature.console.agent"
       label="JMC Agent Plugin"
@@ -9,9 +42,16 @@
    </description>
 
    <requires>
-      <import feature="org.openjdk.jmc.feature.core" version="8.0.0.qualifier"/>
-      <import feature="org.openjdk.jmc.feature.console" version="8.0.0.qualifier"/>
-      <import plugin="org.openjdk.jmc.console.agent" version="8.0.0.qualifier"/>
+      <import feature="org.openjdk.jmc.feature.core" match="equivalent"/>
+      <import feature="org.openjdk.jmc.feature.console" match="equivalent"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
    </requires>
 
+   <plugin
+      id="org.openjdk.jmc.console.agent"
+      download-size="0"
+      install-size="0"
+      version="0.0.0"
+      unpack="false"/>
 </feature>