From 063301deca2976648fb6878dbc45eaa27e3f9915 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Sat, 11 Jul 2020 16:31:20 +0300
Subject: [PATCH] Bug 565144 - CDT.setup and .target should be configured for
 2020-09

Changes for .setup and .target
* add "com.sun.jna" bundle from Orbit
* add "com.sun.jna.platform" bundle from Orbit

Changes for "org.eclipse.cdt.debug.application.product":
* remove "org.eclipse.update.configurator" bundle
* add "org.eclipse.jface.notifications" bundle
* add "com.sun.jna" bundle
* add "com.sun.jna.platform" bundle

Change-Id: Ic1a0b2d6d5189c9f3652def987d3c6a0daa4c7ee
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 .../org.eclipse.cdt.debug.application.product/debug.product  | 5 +++--
 releng/CDT.setup                                             | 4 ++++
 releng/org.eclipse.cdt.target/cdt.target                     | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index e0207c09331..4fe620a7bf2 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -174,6 +174,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <plugins>
       <plugin id="com.google.gson"/>
       <plugin id="com.ibm.icu"/>
+      <plugin id="com.sun.jna"/>
+      <plugin id="com.sun.jna.platform"/>
       <plugin id="com.sun.xml.bind"/>
       <plugin id="javax.activation"/>
       <plugin id="javax.annotation"/>
@@ -336,6 +338,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.jetty.util"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.notifications"/>
       <plugin id="org.eclipse.jface.text"/>
       <plugin id="org.eclipse.launchbar.core"/>
       <plugin id="org.eclipse.launchbar.ui"/>
@@ -372,7 +375,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.ui.views.properties.tabbed"/>
       <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.eclipse.ui.workbench.texteditor"/>
-      <plugin id="org.eclipse.update.configurator"/>
       <plugin id="org.eclipse.urischeme"/>
       <plugin id="org.freemarker"/>
       <plugin id="org.sat4j.core"/>
@@ -391,7 +393,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
-      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
    </configurations>
 
    <repositories>
diff --git a/releng/CDT.setup b/releng/CDT.setup
index d23a98319af..6db39bb6780 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -168,6 +168,10 @@
             name="org.eclipse.license.feature.group"/>
         <requirement
             name="com.google.gson"/>
+        <requirement
+            name="com.sun.jna"/>
+        <requirement
+            name="com.sun.jna.platform"/>
         <requirement
             name="com.sun.xml.bind"/>
         <requirement
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 6a034fc14e6..5151fd25cac 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -52,6 +52,8 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
+<unit id="com.sun.jna" version="0.0.0"/>
+<unit id="com.sun.jna.platform" version="0.0.0"/>
 <unit id="com.sun.xml.bind" version="0.0.0"/>
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.xml.bind" version="0.0.0"/>