Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup dependencies and adapt to eclipse platform changes #499

Merged
merged 1 commit into from
Oct 23, 2023
Merged

cleanup dependencies and adapt to eclipse platform changes #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion io.cucumber.eclipse.editor/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="META-INF/cucumber-expressions-11.0.0.jar" sourcepath="META-INF/cucumber-expressions-11.0.0-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Expand Down
7 changes: 4 additions & 3 deletions io.cucumber.eclipse.editor/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions io.cucumber.eclipse.editor/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions io.cucumber.eclipse.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</license>

<requires>
<import feature="net.mihai-nita.ansicon" version="1.4.3.202012111715" match="greaterOrEqual"/>
<import feature="io.cucumber.eclipse.thirdparty.feature" version="1.0.0.qualifier"/>
<import plugin="org.eclipse.unittest.ui"/>
</requires>

Expand Down
2 changes: 1 addition & 1 deletion io.cucumber.eclipse.java/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Expand Down
6 changes: 3 additions & 3 deletions io.cucumber.eclipse.java/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions io.cucumber.eclipse.java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions ...umber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberFeatureLaunchUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions ...er/eclipse/java/launching/CucumberFeatureLocalApplicationLaunchConfigurationDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()) {
Expand Down
3 changes: 1 addition & 2 deletions io.cucumber.eclipse.java/src/io/cucumber/eclipse/java/launching/CucumberRuntimeLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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()) {
Expand Down
16 changes: 0 additions & 16 deletions io.cucumber.eclipse.product/cucumber-eclipse.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,9 @@

<features>
<feature id="cucumber.eclipse.feature" installMode="root"/>
<feature id="net.mihai-nita.ansicon" installMode="root"/>
<feature id="org.eclipse.sdk" installMode="root"/>
<feature id="org.eclipse.help" installMode="root"/>
<feature id="org.eclipse.pde" installMode="root"/>
<feature id="org.eclipse.jdt" installMode="root"/>
<feature id="org.eclipse.emf.common" installMode="root"/>
<feature id="org.eclipse.equinox.p2.core.feature" installMode="root"/>
<feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
<feature id="org.eclipse.emf.ecore" installMode="root"/>
<feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
<feature id="org.eclipse.equinox.p2.extras.feature" installMode="root"/>
<feature id="org.eclipse.rcp" installMode="root"/>
<feature id="org.eclipse.ecf.core.feature" installMode="root"/>
<feature id="org.eclipse.equinox.p2.rcp.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
<feature id="org.eclipse.platform" installMode="root"/>
<feature id="org.eclipse.e4.rcp" installMode="root"/>
<feature id="io.cucumber.eclipse.thirdparty.feature" installMode="root"/>
<feature id="org.eclipse.m2e.feature" installMode="root"/>
</features>

Expand Down
28 changes: 4 additions & 24 deletions io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,20 @@
<?pde version="3.8"?>
<target name="targetdefinition" sequenceNumber="10">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2023-09"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://www.mihai-nita.net/eclipse"/>
<unit id="net.mihai-nita.ansicon.feature.group" version="1.4.3.202012111715"/>
</location>
<location path="${eclipse_home}" type="Profile"/>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/>
<unit id="org.eclipse.unittest.ui" version="1.0.0.v20201121-0633"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/m2e/releases/latest/"/>
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="2.4.0.20230827-1557"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
Expand Down Expand Up @@ -114,9 +98,5 @@ Export-Package: *;version="${version}";-noimport:=true
</dependency>
</dependencies>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/m2e/releases/latest/"/>
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="2.4.0.20230827-1557"/>
</location>
</locations>
</target>
17 changes: 0 additions & 17 deletions io.cucumber.eclipse.thirdparty.feature/.project
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion io.cucumber.eclipse.thirdparty.feature/build.properties
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions io.cucumber.eclipse.thirdparty.feature/feature.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions io.cucumber.eclipse.updatesite/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
<feature id="cucumber.eclipse.feature">
<category name="cucumber_eclipse_category_id"/>
</feature>
<feature id="net.mihai-nita.ansicon">
<category name="ansicon"/>
</feature>
<feature id="io.cucumber.eclipse.thirdparty.feature">
<category name="cucumber_eclipse_category_id"/>
</feature>
<category-def name="cucumber_eclipse_category_id" label="Cucumber Eclipse Plugin">
<description>
Offical Eclipse Plugin for Cucumber
</description>
</category-def>
<category-def name="ansicon" label="Ansi Console"/>
</site>
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<module>io.cucumber.eclipse.java</module>
<module>io.cucumber.eclipse.java.plugins</module>
<module>io.cucumber.eclipse.feature</module>
<module>io.cucumber.eclipse.thirdparty.feature</module>
<module>io.cucumber.eclipse.product</module>
<module>io.cucumber.eclipse.updatesite</module>
</modules>
Expand Down