mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-03-28 14:56:28 +01:00
Update to latest Eclipse Platform and Orbit
Includes logging changes/simplification brought on by https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/588
This commit is contained in:
Jonah Graham
parent
1d0550a9f1
commit
1b19ba20c2
5 changed files with 33 additions and 32 deletions
|
|
@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.cdt.meson.core;bundle-version="1.0.0",
|
|||
org.eclipse.core.resources,
|
||||
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.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",
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
|
|||
</license>
|
||||
|
||||
<plugins>
|
||||
<plugin id="bcpg"/>
|
||||
<plugin id="com.google.gson"/>
|
||||
<plugin id="com.ibm.icu"/>
|
||||
<plugin id="com.sun.jna"/>
|
||||
|
|
@ -188,8 +189,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
|
|||
<plugin id="com.sun.xml.bind"/>
|
||||
<plugin id="jakarta.servlet-api"/>
|
||||
<plugin id="jakarta.xml.bind"/>
|
||||
<plugin id="javax.activation" version="1.2.2.v20201119-1642"/>
|
||||
<plugin id="javax.activation" version="2.0.0.v20201118-1818"/>
|
||||
<plugin id="javax.activation" version="1.2.2.v20221112-0806"/>
|
||||
<plugin id="javax.activation" version="2.0.0.v20221112-0806"/>
|
||||
<plugin id="javax.annotation"/>
|
||||
<plugin id="javax.el"/>
|
||||
<plugin id="javax.inject"/>
|
||||
|
|
@ -356,6 +357,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
|
|||
<plugin id="org.eclipse.help.base"/>
|
||||
<plugin id="org.eclipse.help.ui"/>
|
||||
<plugin id="org.eclipse.help.webapp"/>
|
||||
<plugin id="org.eclipse.jdt.core"/>
|
||||
<plugin id="org.eclipse.jetty.http"/>
|
||||
<plugin id="org.eclipse.jetty.io"/>
|
||||
<plugin id="org.eclipse.jetty.security"/>
|
||||
|
|
@ -422,12 +424,13 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
|
|||
<plugin id="org.osgi.util.xml"/>
|
||||
<plugin id="org.sat4j.core"/>
|
||||
<plugin id="org.sat4j.pb"/>
|
||||
<plugin id="org.slf4j.api"/>
|
||||
<plugin id="org.tukaani.xz"/>
|
||||
<plugin id="org.w3c.css.sac"/>
|
||||
<plugin id="org.w3c.dom.events"/>
|
||||
<plugin id="org.w3c.dom.smil"/>
|
||||
<plugin id="org.w3c.dom.svg"/>
|
||||
<plugin id="slf4j.api"/>
|
||||
<plugin id="slf4j.nop"/>
|
||||
</plugins>
|
||||
|
||||
<configurations>
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.cdt.debug.application,
|
|||
org.eclipse.cdt.core.native
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Import-Package: org.apache.log4j;version="1.2.19",
|
||||
org.eclipse.cdt.utils.pty,
|
||||
Import-Package: org.eclipse.cdt.utils.pty,
|
||||
org.eclipse.core.resources,
|
||||
org.eclipse.debug.core
|
||||
Export-Package: org.eclipse.cdt.debug.application.tests;x-internal:=true
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.application.tests;
|
||||
|
||||
import org.apache.log4j.ConsoleAppender;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.log4j.SimpleLayout;
|
||||
import org.eclipse.core.runtime.IPath;
|
||||
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
|
||||
import org.eclipse.swtbot.swt.finder.SWTBot;
|
||||
|
|
@ -24,7 +21,6 @@ import org.eclipse.swtbot.swt.finder.waits.Conditions;
|
|||
import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
|
||||
import org.junit.After;
|
||||
import org.junit.AfterClass;
|
||||
|
||||
public abstract class StandaloneTest {
|
||||
|
||||
|
|
@ -34,15 +30,11 @@ public abstract class StandaloneTest {
|
|||
protected static String projectName;
|
||||
protected static SWTBotShell mainShell;
|
||||
protected static SWTBotView projectExplorer;
|
||||
private static final Logger fLogger = Logger.getRootLogger();
|
||||
|
||||
public static void init(String projectName) throws Exception {
|
||||
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
|
||||
SWTBotPreferences.TIMEOUT = 20000;
|
||||
|
||||
fLogger.removeAllAppenders();
|
||||
fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
|
||||
|
||||
bot = new SWTBot();
|
||||
Utilities.getDefault().buildProject(projectName);
|
||||
final IPath executablePath = Utilities.getDefault().getProjectPath(projectName).append("a.out"); //$NON-NLS-1$
|
||||
|
|
@ -82,14 +74,6 @@ public abstract class StandaloneTest {
|
|||
// mainShell.activate();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test class tear down method.
|
||||
*/
|
||||
@AfterClass
|
||||
public static void tearDown() {
|
||||
fLogger.removeAllAppenders();
|
||||
}
|
||||
|
||||
private static final class WaitForFileCondition extends DefaultCondition {
|
||||
private final IPath executablePath;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?>
|
||||
<target name="cdt" sequenceNumber="125">
|
||||
<target name="cdt" sequenceNumber="127">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
|
||||
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="https://download.eclipse.org/eclipse/updates/4.25/R-4.25-202208311800/"/>
|
||||
<repository location="https://download.eclipse.org/eclipse/updates/4.26-I-builds/I20221117-1330/"/>
|
||||
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
|
||||
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
|
||||
|
|
@ -50,14 +50,13 @@
|
|||
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20221109014815/repository/"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20221118032057/repository/"/>
|
||||
<unit id="com.google.gson" version="0.0.0"/>
|
||||
<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
|
||||
<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
|
||||
<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
|
||||
<unit id="com.sun.xml.bind" version="2.3.3.v20221112-0806"/>
|
||||
<unit id="javax.activation" version="1.2.2.v20221112-0806"/>
|
||||
<unit id="jakarta.xml.bind" version="2.3.3.v20221112-0806"/>
|
||||
<unit id="org.antlr.runtime" version="0.0.0"/>
|
||||
<unit id="org.apache.commons.compress" version="0.0.0"/>
|
||||
<unit id="org.apache.log4j" version="0.0.0"/>
|
||||
<unit id="org.assertj" version="0.0.0"/>
|
||||
<unit id="org.freemarker" version="0.0.0"/>
|
||||
<unit id="org.hamcrest" version="0.0.0"/>
|
||||
|
|
@ -67,8 +66,8 @@
|
|||
<unit id="org.mockito.mockito-core" version="0.0.0"/>
|
||||
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
|
||||
<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
|
||||
<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
|
||||
<unit id="javax.activation" version="2.0.0.v20201118-1818"/>
|
||||
<unit id="com.sun.jna.platform" version="5.8.0.v20221112-0806"/>
|
||||
<unit id="javax.activation" version="2.0.0.v20221112-0806"/>
|
||||
<unit id="javax.xml" version="1.4.1.v20220503-2331"/>
|
||||
<unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
|
||||
<unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
|
||||
|
|
@ -79,8 +78,25 @@
|
|||
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository/"/>
|
||||
<unit id="javax.xml.stream" version="0.0.0"/>
|
||||
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
|
||||
<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
|
||||
</location>
|
||||
|
||||
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.36</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
<!-- slf4j-api requires 1 impl, providing a dummy one... -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-nop</artifactId>
|
||||
<version>1.7.36</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</location>
|
||||
</locations>
|
||||
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<launcherArgs>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue