From 0e94ecb47219d62fced5f2452009dfbc89593517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Mon, 23 Oct 2023 17:55:07 +0200 Subject: [PATCH] cleanup dependencies and adapt to eclipse platform changes --- io.cucumber.eclipse.editor/.classpath | 6 ++- .../.settings/org.eclipse.jdt.core.prefs | 7 ++-- .../META-INF/MANIFEST.MF | 3 +- io.cucumber.eclipse.feature/feature.xml | 2 - io.cucumber.eclipse.java/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- io.cucumber.eclipse.java/META-INF/MANIFEST.MF | 3 +- .../launching/CucumberFeatureLaunchUtils.java | 6 +++ ...pplicationLaunchConfigurationDelegate.java | 3 +- .../launching/CucumberRuntimeLauncher.java | 3 +- .../cucumber-eclipse.product | 16 -------- .../cucumber.eclipse.targetdefinition.target | 28 ++----------- .../.project | 17 -------- .../build.properties | 1 - .../feature.xml | 40 ------------------- io.cucumber.eclipse.updatesite/category.xml | 7 ---- pom.xml | 1 - 17 files changed, 27 insertions(+), 124 deletions(-) delete mode 100644 io.cucumber.eclipse.thirdparty.feature/.project delete mode 100644 io.cucumber.eclipse.thirdparty.feature/build.properties delete mode 100644 io.cucumber.eclipse.thirdparty.feature/feature.xml diff --git a/io.cucumber.eclipse.editor/.classpath b/io.cucumber.eclipse.editor/.classpath index 323d2729..8cb01114 100644 --- a/io.cucumber.eclipse.editor/.classpath +++ b/io.cucumber.eclipse.editor/.classpath @@ -1,7 +1,11 @@ - + + + + + diff --git a/io.cucumber.eclipse.editor/.settings/org.eclipse.jdt.core.prefs b/io.cucumber.eclipse.editor/.settings/org.eclipse.jdt.core.prefs index c9545f06..d4540a53 100644 --- a/io.cucumber.eclipse.editor/.settings/org.eclipse.jdt.core.prefs +++ b/io.cucumber.eclipse.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/io.cucumber.eclipse.editor/META-INF/MANIFEST.MF b/io.cucumber.eclipse.editor/META-INF/MANIFEST.MF index 7502a343..e1e91d95 100644 --- a/io.cucumber.eclipse.editor/META-INF/MANIFEST.MF +++ b/io.cucumber.eclipse.editor/META-INF/MANIFEST.MF @@ -30,13 +30,12 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.5.0", io.cucumber.messages;bundle-version="13.2.1", org.eclipse.ui.trace, org.eclipse.ui.console, - net.mihai-nita.ansicon.plugin, org.eclipse.ui.workbench.texteditor, org.apache.commons.commons-text;bundle-version="1.10.0", org.apache.commons.io;bundle-version="2.6.0", io.cucumber.tag-expressions, org.eclipse.unittest.ui;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: io.cucumber.eclipse.editor Bundle-ActivationPolicy: lazy Export-Package: io.cucumber.eclipse.editor, diff --git a/io.cucumber.eclipse.feature/feature.xml b/io.cucumber.eclipse.feature/feature.xml index 11871f9c..1fb61bec 100644 --- a/io.cucumber.eclipse.feature/feature.xml +++ b/io.cucumber.eclipse.feature/feature.xml @@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - diff --git a/io.cucumber.eclipse.java/.classpath b/io.cucumber.eclipse.java/.classpath index e801ebfb..81fe078c 100644 --- a/io.cucumber.eclipse.java/.classpath +++ b/io.cucumber.eclipse.java/.classpath @@ -1,6 +1,6 @@ - + diff --git a/io.cucumber.eclipse.java/.settings/org.eclipse.jdt.core.prefs b/io.cucumber.eclipse.java/.settings/org.eclipse.jdt.core.prefs index c9545f06..62ef3488 100644 --- a/io.cucumber.eclipse.java/.settings/org.eclipse.jdt.core.prefs +++ b/io.cucumber.eclipse.java/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/io.cucumber.eclipse.java/META-INF/MANIFEST.MF b/io.cucumber.eclipse.java/META-INF/MANIFEST.MF index b0f6f631..7db2d0a3 100644 --- a/io.cucumber.eclipse.java/META-INF/MANIFEST.MF +++ b/io.cucumber.eclipse.java/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui, io.cucumber.cucumber-gherkin;bundle-version="6.9.1", org.eclipse.debug.ui, org.eclipse.ui.workbench.texteditor, - net.mihai-nita.ansicon.plugin;bundle-version="1.4.3", org.eclipse.ui.console, io.cucumber.cucumber-gherkin-messages;bundle-version="6.9.1", io.cucumber.messages;bundle-version="13.2.1", @@ -34,7 +33,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.debug.ui, org.eclipse.core.variables, io.cucumber.eclipse.java.plugins -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: io.cucumber.eclipse.java Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.unittest.ui, diff --git a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLaunchUtils.java b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLaunchUtils.java index 1e2d3fd5..1f795e03 100644 --- a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLaunchUtils.java +++ b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLaunchUtils.java @@ -9,6 +9,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.console.ConsolePlugin; public class CucumberFeatureLaunchUtils { @@ -30,6 +31,11 @@ protected static IProject getProject() { return null; } + public static boolean isAnsiConsoleEnabled() { + ConsolePlugin.getDefault().getPreferenceStore().getBoolean("ANSI_support_enabled"); + return false; + } + protected static String getFeaturePath() { IWorkbenchPage page = JDIDebugUIPlugin.getActivePage(); if (page != null) { diff --git a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLocalApplicationLaunchConfigurationDelegate.java b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLocalApplicationLaunchConfigurationDelegate.java index 0bf79bc2..802cff88 100644 --- a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLocalApplicationLaunchConfigurationDelegate.java +++ b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLocalApplicationLaunchConfigurationDelegate.java @@ -47,7 +47,6 @@ import io.cucumber.eclipse.java.plugins.CucumberEclipsePlugin; import io.cucumber.eclipse.java.runtime.CucumberRuntime; import io.cucumber.tagexpressions.Expression; -import mnita.ansiconsole.preferences.AnsiConsolePreferenceUtils; public class CucumberFeatureLocalApplicationLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate implements ILaunchConfigurationDelegate2 { @@ -151,7 +150,7 @@ public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IPr args.add(formatter); args.add("usage"); } - if (!AnsiConsolePreferenceUtils.isAnsiConsoleEnabled()) { + if (!CucumberFeatureLaunchUtils.isAnsiConsoleEnabled()) { args.add("--monochrome"); } if (!tags.isBlank()) { diff --git a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberRuntimeLauncher.java b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberRuntimeLauncher.java index 1db175b8..db0dd21b 100644 --- a/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberRuntimeLauncher.java +++ b/io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberRuntimeLauncher.java @@ -48,7 +48,6 @@ import io.cucumber.messages.Messages.TestStepStarted; import io.cucumber.messages.Messages.Timestamp; import io.cucumber.tagexpressions.Expression; -import mnita.ansiconsole.preferences.AnsiConsolePreferenceUtils; /** * Launches documents using the {@link CucumberRuntime} @@ -187,7 +186,7 @@ public void accept(Envelope envelope) { // TODO other options options.addDefaultSummaryPrinterIfAbsent(); options.setThreads(java.lang.Runtime.getRuntime().availableProcessors()); - options.setMonochrome(!AnsiConsolePreferenceUtils.isAnsiConsoleEnabled()); + options.setMonochrome(!CucumberFeatureLaunchUtils.isAnsiConsoleEnabled()); cucumberRuntime.addPlugin(plugin); try { try (IOConsoleOutputStream stream = console.newOutputStream()) { diff --git a/io.cucumber.eclipse.product/cucumber-eclipse.product b/io.cucumber.eclipse.product/cucumber-eclipse.product index a0df6321..35805e93 100644 --- a/io.cucumber.eclipse.product/cucumber-eclipse.product +++ b/io.cucumber.eclipse.product/cucumber-eclipse.product @@ -16,25 +16,9 @@ - - - - - - - - - - - - - - - - diff --git a/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target b/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target index 4b15e8d3..5ace0f79 100644 --- a/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target +++ b/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target @@ -2,36 +2,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + @@ -114,9 +98,5 @@ Export-Package: *;version="${version}";-noimport:=true - - - - \ No newline at end of file diff --git a/io.cucumber.eclipse.thirdparty.feature/.project b/io.cucumber.eclipse.thirdparty.feature/.project deleted file mode 100644 index 3b7a15c4..00000000 --- a/io.cucumber.eclipse.thirdparty.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - io.cucumber.eclipse.thirdparty.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/io.cucumber.eclipse.thirdparty.feature/build.properties b/io.cucumber.eclipse.thirdparty.feature/build.properties deleted file mode 100644 index 64f93a9f..00000000 --- a/io.cucumber.eclipse.thirdparty.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/io.cucumber.eclipse.thirdparty.feature/feature.xml b/io.cucumber.eclipse.thirdparty.feature/feature.xml deleted file mode 100644 index 7e81b54b..00000000 --- a/io.cucumber.eclipse.thirdparty.feature/feature.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Contains thrid party dependencies for cucumber - - - - Please see the individual plugins for details - - - - Please see the individual plugins for details - - - - - - - - - diff --git a/io.cucumber.eclipse.updatesite/category.xml b/io.cucumber.eclipse.updatesite/category.xml index f1eaee2b..3cd8935e 100644 --- a/io.cucumber.eclipse.updatesite/category.xml +++ b/io.cucumber.eclipse.updatesite/category.xml @@ -3,16 +3,9 @@ - - - - - - Offical Eclipse Plugin for Cucumber - diff --git a/pom.xml b/pom.xml index 0bbaf3ff..4d641b41 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ io.cucumber.eclipse.java io.cucumber.eclipse.java.plugins io.cucumber.eclipse.feature - io.cucumber.eclipse.thirdparty.feature io.cucumber.eclipse.product io.cucumber.eclipse.updatesite