Update to Tycho4 / latest eclipse release

cucumber · Oct 23, 2023 · dcb9e46 · dcb9e46
1 parent c278478
commit dcb9e46
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 11 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -28,6 +28,10 @@ jobs:
         distribution: 'adopt'
         architecture: 'x64'
         cache: maven
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
+      with:
+        maven-version: 3.9.5
     - name: Build with Maven
       working-directory: code
       run: mvn -B package --file pom.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
   <extension>
-    <groupId>org.eclipse.tycho.extras</groupId>
-    <artifactId>tycho-pomless</artifactId>
-    <version>3.0.0</version>
+    <groupId>org.eclipse.tycho</groupId>
+    <artifactId>tycho-build</artifactId>
+    <version>${tycho-version}</version>
   </extension>
 </extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-Dtycho-version=4.0.3
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cucumber-eclipse</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...ipse.java/src/io/cucumber/eclipse/java/preferences/CreateStepDefinitionsFilterDialog.java b/...ipse.java/src/io/cucumber/eclipse/java/preferences/CreateStepDefinitionsFilterDialog.java
@@ -3,8 +3,9 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.debug.internal.ui.actions.StatusInfo;
 import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.ui.Filter;
+//import org.eclipse.jdt.internal.debug.ui.Filter;
 import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+import org.eclipse.jdt.internal.ui.filtertable.Filter;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.StatusDialog;

diff --git a/...er.eclipse.java/src/io/cucumber/eclipse/java/preferences/CucumberJavaPreferencesPage.java b/...er.eclipse.java/src/io/cucumber/eclipse/java/preferences/CucumberJavaPreferencesPage.java
@@ -7,10 +7,13 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.debug.ui.Filter;
-import org.eclipse.jdt.internal.debug.ui.FilterLabelProvider;
-import org.eclipse.jdt.internal.debug.ui.FilterViewerComparator;
+//import org.eclipse.jdt.internal.debug.ui.Filter;
+//import org.eclipse.jdt.internal.debug.ui.FilterLabelProvider;
+//import org.eclipse.jdt.internal.debug.ui.FilterViewerComparator;
 import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
+import org.eclipse.jdt.internal.ui.filtertable.Filter;
+import org.eclipse.jdt.internal.ui.filtertable.FilterLabelProvider;
+import org.eclipse.jdt.internal.ui.filtertable.FilterViewerComparator;
 import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;

diff --git a/io.cucumber.eclipse.product/cucumber-eclipse.product b/io.cucumber.eclipse.product/cucumber-eclipse.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Cucumber Eclipse" uid="cucumber-eclipse" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Cucumber Eclipse" uid="cucumber-eclipse" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -30,7 +30,6 @@
       <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.ecf.filetransfer.httpclient45.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"/>

diff --git a/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target b/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
@@ -19,7 +19,7 @@
 <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/2021-09"/>
+	<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>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,6 @@
 	<name>Cucumber Eclipse Parent</name>
 
 	<properties>
-		<tycho-version>3.0.5</tycho-version>
 		<maven-scm-plugin-version>1.13.0</maven-scm-plugin-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
@@ -53,6 +52,9 @@
 							<arch>x86_64</arch>
 						</environment>
 					</environments>
+					<dependency-resolution>
+					     <localArtifacts>ignore</localArtifacts>
+					</dependency-resolution>
 				</configuration>
 			</plugin>
 			<plugin>