Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions io.cucumber.eclipse.editor/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
org.eclipse.ui.workbench.texteditor,
io.cucumber.tag-expressions,
org.eclipse.unittest.ui;bundle-version="1.0.0",
io.cucumber.gherkin-utils;bundle-version="9.0.0",
org.eclipse.core.expressions;bundle-version="3.9.500"
org.eclipse.core.expressions;bundle-version="3.9.500",
io.cucumber.gherkin.utils;bundle-version="11.0.0",
io.cucumber.cucumber-gherkin;bundle-version="7.33.0"
Copy link
Copy Markdown
Member

@mpkorstanje mpkorstanje May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This conflicts with gherkin.utils.

And do you need io.cucumber.cucumber-gherkin? I wrote that mostly as an internal adaptor so I didn't have to rewrite everything when introducing messages. It will eventuallyTM fade out.

Ideally you'd use io.cucumber.gherkin here instead.

Bundle-RequiredExecutionEnvironment: JavaSE-21
Automatic-Module-Name: io.cucumber.eclipse.editor
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public Position getPosition(io.cucumber.messages.types.Location location, int li
throws BadLocationException {
int line = location.getLine().intValue();
int offset = document.getLineOffset(line - 1 - lineOffset);
return new Position(offset + location.getColumn().orElse(0l).intValue() - 1, 1);
return new Position(offset + location.getColumn().orElse(0).intValue() - 1, 1);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boo

IHyperlink[] hyperlinks = editorDocument.getSteps()
.filter(step -> step.getLocation().getLine() == lineNumber).map(step -> {
long column = step.getLocation().getColumn().orElse(0l) - 1;
long column = step.getLocation().getColumn().orElse(0) - 1;
String keyword = step.getKeyword();
Long statementStartOffset = lineStartOffset + column + keyword.length();
IRegion stepRegion = new Region(statementStartOffset.intValue(), step.getText().length());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ public void build() throws CoreException {
if (error.getSource().getLocation().isPresent()) {
SourceReference source = error.getSource();
Location location = source.getLocation().get();
Long l = location.getLine();
Integer l = location.getLine();
line = l == null ? null : l.intValue();
column = location.getColumn().orElse(-1l).intValue();
column = location.getColumn().orElse(-1).intValue();
} else {
line = -1;
column = -1;
Expand Down
3 changes: 2 additions & 1 deletion io.cucumber.eclipse.java.plugins/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: io.cucumber.eclipse.java.plugins
Require-Bundle: io.cucumber.cucumber-plugin,
io.cucumber.messages,
io.cucumber.cucumber-core
io.cucumber.cucumber-core,
io.cucumber.messagesn.ndjson;bundle-version="0.4.1"
Export-Package: io.cucumber.eclipse.java.plugins
Import-Package: com.fasterxml.jackson.annotation;version="[2.20.0,3.0.0)"
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,6 @@ public void writeValue(Writer writer, Envelope value) throws IOException {
};
} catch (Exception e) {
}
return new Jackson();
return new io.cucumber.messages.ndjson.Serializer();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,27 @@
<repository location="https://download.eclipse.org/technology/m2e/releases/latest/"/>
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.0.0"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" label="Gherkin" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
<version>37.0.1</version>
<artifactId>gherkin-utils</artifactId>
<version>11.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>7.33.0</version>
<artifactId>gherkin</artifactId>
<version>39.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,*
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-core</artifactId>
<artifactId>cucumber-java</artifactId>
<version>7.34.3</version>
<type>jar</type>
</dependency>
Expand All @@ -54,16 +42,16 @@ Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,*
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,!io.cucumber.messages.ndjson.internal.*,*
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-expressions</artifactId>
<version>18.0.1</version>
<artifactId>cucumber-core</artifactId>
<version>7.34.3</version>
Copy link
Copy Markdown
Member

@mpkorstanje mpkorstanje May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version isn't compatible with messages-ndjson further down in this file. You'd need the unreleased v8 version here or downgrade messages-ndjson.

<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -72,7 +60,7 @@ Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,*
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,!io.cucumber.messages.ndjson.internal.*,*
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
Expand All @@ -92,24 +80,6 @@ Export-Package: *;version="${version}";-noimport:=true
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin-utils</artifactId>
<version>10.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: !sun.*,io.cucumber.messages.internal.com.google.gson*,!io.cucumber.messages.internal.*,!org.checkerframework.*,*
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jackson" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
Expand Down Expand Up @@ -144,6 +114,28 @@ Export-Package: *;version="${version}";-noimport:=true
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Cucumber" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-expressions</artifactId>
<version>19.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>messages-ndjson</artifactId>
Copy link
Copy Markdown
Member

@mpkorstanje mpkorstanje May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With messages-ndjson do you still need the jackson dependencies above?

<version>0.4.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>messages</artifactId>
<version>32.3.1</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-21"/>
</target>
Loading