Skip to content

[Core] Extract Gherkin compatibility layer #1804

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.

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

Merged
merged 1 commit into from
Dec 13, 2019
Merged
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
47 changes: 46 additions & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -21,9 +22,24 @@
</properties>

<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-gherkin</artifactId>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-gherkin-vintage</artifactId>
</dependency>

<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
<version>${gherkin-vintage.version}</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin-jvm-deps</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
Expand Down Expand Up @@ -125,6 +141,35 @@
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>io.cucumber:gherkin</include>
<include>io.cucumber:gherkin-jvm-deps</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>gherkin</pattern>
<shadedPattern>io.cucumber.core.internal.gherkin</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/io/cucumber/core/eventbus/EventBus.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.cucumber.core.eventbus;

import java.time.Instant;
import java.util.UUID;

import io.cucumber.plugin.event.Event;
import io.cucumber.plugin.event.EventPublisher;
Expand All @@ -9,6 +10,8 @@ public interface EventBus extends EventPublisher {

Instant getInstant();

UUID generateId();

void send(Event event);

void sendAll(Iterable<Event> queue);
Expand Down
8 changes: 0 additions & 8 deletions core/src/main/java/io/cucumber/core/feature/Container.java

This file was deleted.

40 changes: 0 additions & 40 deletions core/src/main/java/io/cucumber/core/feature/CucumberExamples.java

This file was deleted.

85 changes: 0 additions & 85 deletions core/src/main/java/io/cucumber/core/feature/CucumberFeature.java

This file was deleted.

93 changes: 0 additions & 93 deletions core/src/main/java/io/cucumber/core/feature/CucumberPickle.java

This file was deleted.

30 changes: 0 additions & 30 deletions core/src/main/java/io/cucumber/core/feature/CucumberScenario.java

This file was deleted.

This file was deleted.

This file was deleted.

Loading