Skip to content

Commit

Permalink
Include m2e in the product and fix the example to use java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
@laeubi
Christoph Läubrich authored and laeubi committed Oct 23, 2023
1 parent 5841033 commit 5ed74bc
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 39 deletions.
6 changes: 5 additions & 1 deletion examples/java-datatable/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
5 changes: 5 additions & 0 deletions examples/java-datatable/.settings/org.eclipse.core.resources.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
8 changes: 8 additions & 0 deletions examples/java-datatable/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=17
4 changes: 2 additions & 2 deletions examples/java-datatable/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<cucumber-version>6.9.1</cucumber-version>
<hamcrest.version>2.2</hamcrest.version>
</properties>
Expand Down
1 change: 1 addition & 0 deletions io.cucumber.eclipse.product/cucumber-eclipse.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<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
104 changes: 68 additions & 36 deletions io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,63 +28,95 @@
<unit id="net.mihai-nita.ansicon.feature.group" version="1.4.3.202012111715"/>
</location>
<location path="${eclipse_home}" type="Profile"/>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
<version>16.0.0</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
<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 includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>gherkin</artifactId>
<version>16.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>
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>6.9.1</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>6.9.1</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>
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.cucumber</groupId>
<artifactId>cucumber-core</artifactId>
<version>6.9.1</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-core</artifactId>
<version>6.9.1</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>
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.cucumber</groupId>
<artifactId>cucumber-expressions</artifactId>
<version>11.0.0</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-expressions</artifactId>
<version>11.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>
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<location includeDependencyScope="compile" includeSource="true" missingManifest="ignore" type="Maven">
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<type>jar</type>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="ignore" type="Maven">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<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"/>
<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>
</target>

0 comments on commit 5ed74bc

Please sign in to comment.