From 3effb213fa8049a90b093e197f84fa8bd8c49811 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 6 Jan 2020 09:36:22 -0500
Subject: [PATCH] Bug 558840: [releng] Remove unmaintained AERI from target
 platform

Change-Id: I0e0b424ced0980b7dd347fc8ce61a0fc60a5611d
---
 build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF   | 1 -
 .../cdt/internal/meson/ui/tests/NewManualNinjaTest.java     | 5 -----
 .../cdt/internal/meson/ui/tests/NewMesonConfigureTest.java  | 5 -----
 .../cdt/internal/meson/ui/tests/NewMesonProjectTest.java    | 5 -----
 releng/CDT.setup                                            | 4 ----
 releng/org.eclipse.cdt.target/cdt.target                    | 6 +-----
 6 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
index 1fb9b376720..e32681e5ee8 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.meson.ui.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.cdt.meson.core;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.ui;bundle-version="3.109.0",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.epp.logging.aeri.core;bundle-version="2.0.6",
  org.hamcrest.library;bundle-version="1.3.0",
  org.eclipse.launchbar.ui;bundle-version="2.2.0",
  org.eclipse.launchbar.ui.controls;bundle-version="1.0.1",
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
index 2d1ff80c66d..f57ee012252 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewManualNinjaTest.java
@@ -29,9 +29,6 @@ import org.eclipse.cdt.meson.core.MesonNature;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.epp.logging.aeri.core.ISystemSettings;
-import org.eclipse.epp.logging.aeri.core.SendMode;
-import org.eclipse.epp.logging.aeri.core.SystemControl;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.SWTBot;
@@ -71,8 +68,6 @@ public class NewManualNinjaTest {
 
 	@Before
 	public void before() {
-		ISystemSettings settings = SystemControl.getSystemSettings();
-		settings.setSendMode(SendMode.NEVER);
 		bot.resetWorkbench();
 	}
 
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
index f01ff98a7e0..6fd1354b93e 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonConfigureTest.java
@@ -27,9 +27,6 @@ import org.eclipse.cdt.meson.core.MesonNature;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.epp.logging.aeri.core.ISystemSettings;
-import org.eclipse.epp.logging.aeri.core.SendMode;
-import org.eclipse.epp.logging.aeri.core.SystemControl;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
@@ -68,8 +65,6 @@ public class NewMesonConfigureTest {
 
 	@Before
 	public void before() {
-		ISystemSettings settings = SystemControl.getSystemSettings();
-		settings.setSendMode(SendMode.NEVER);
 		bot.resetWorkbench();
 	}
 
diff --git a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
index 93730b9d7a0..468539f1030 100644
--- a/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
+++ b/build/org.eclipse.cdt.meson.ui.tests/src/org/eclipse/cdt/internal/meson/ui/tests/NewMesonProjectTest.java
@@ -27,9 +27,6 @@ import org.eclipse.cdt.meson.core.MesonNature;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.epp.logging.aeri.core.ISystemSettings;
-import org.eclipse.epp.logging.aeri.core.SendMode;
-import org.eclipse.epp.logging.aeri.core.SystemControl;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
@@ -68,8 +65,6 @@ public class NewMesonProjectTest {
 
 	@Before
 	public void before() {
-		ISystemSettings settings = SystemControl.getSystemSettings();
-		settings.setSendMode(SendMode.NEVER);
 		bot.resetWorkbench();
 	}
 
diff --git a/releng/CDT.setup b/releng/CDT.setup
index af986525fd7..a688878cd08 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -223,8 +223,6 @@
             name="org.apache.log4j"/>
         <requirement
             name="org.assertj"/>
-        <requirement
-            name="org.eclipse.epp.logging.aeri.feature.feature.group"/>
         <requirement
             name="org.eclipse.equinox.executable.feature.group"/>
         <requirement
@@ -306,8 +304,6 @@
               url="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
           <repository
               url="https://download.eclipse.org/mylyn/releases/3.24/"/>
-          <repository
-              url="https://download.eclipse.org/technology/epp/logging/stable/"/>
           <repository
               url="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 53b3bddb98b..c897a79b3bd 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="67">
+<target name="cdt" sequenceNumber="68">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -32,10 +32,6 @@
 <repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/technology/epp/logging/stable/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>