Fix compatibility issues

* build against 2024-03
* tycho bump

dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target

@@ -19,7 +19,7 @@
 <unit id="org.eclipse.zest.core" version="0.0.0"/>
 <unit id="org.eclipse.zest.layouts" version="0.0.0"/>
 <unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2023-12/"/>
+<repository location="https://download.eclipse.org/releases/2024-03/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
@@ -37,6 +37,11 @@
 <unit id="javax.xml.bind" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+</location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.test.feature.group" version="3.5.100.v20120528-1714-7R7dBhBgLiCViQnG8ISKO73701A1"/>
 <repository location="https://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400"/>
@@ -75,5 +80,5 @@
 <repository location="https://download.eclipse.org/cbi/updates/license"/>
 </location>
 </locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 </target>

dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target

@@ -24,7 +24,7 @@
 <unit id="org.eclipse.birt.chart.device.swt" version=""/>
 
 <unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2024-03/"/>
+<repository location="https://download.eclipse.org/releases/2024-06/"/>
 </location>
 
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -44,6 +44,11 @@
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
 </location>
 
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+</location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.test.feature.group" version="3.5.100.v20120528-1714-7R7dBhBgLiCViQnG8ISKO73701A1"/>
 <repository location="https://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400"/>
@@ -83,5 +88,5 @@
 <repository location="https://download.eclipse.org/cbi/updates/license"/>
 </location>
 </locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 </target>

plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/phar/wizard/WizardPharFileResourceImportPage1.java

@@ -83,7 +83,7 @@ public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelec
 
 	public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelection selection,
 			String[] fileImportMask) {
-		super("zipFileImportPage1", aWorkbench, selection); //$NON-NLS-1$
+		super("zipFileImportPage1", selection); //$NON-NLS-1$
 
 		setTitle(PharImportMessages.ArchiveExport_exportTitle);
 		setDescription(PharImportMessages.ArchiveImport_description);
@@ -96,8 +96,8 @@ public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelec
 	}
 
 	/**
-	 * Called when the user presses the Cancel button. Return a boolean indicating
-	 * permission to close the wizard.
+	 * Called when the user presses the Cancel button. Return a boolean
+	 * indicating permission to close the wizard.
 	 * 
 	 * @return boolean
 	 */
@@ -117,8 +117,8 @@ public void createControl(Composite parent) {
 	}
 
 	/**
-	 * Create the options specification widgets. There is only one in this case so
-	 * create no group.
+	 * Create the options specification widgets. There is only one in this case
+	 * so create no group.
 	 * 
 	 * @param parent
 	 *            org.eclipse.swt.widgets.Composite
@@ -175,8 +175,8 @@ private PharFile getSpecifiedPharSourceFile(String fileName) {
 	}
 
 	/**
-	 * Answer a boolean indicating whether the specified source currently exists and
-	 * is valid (ie.- proper format)
+	 * Answer a boolean indicating whether the specified source currently exists
+	 * and is valid (ie.- proper format)
 	 */
 	private boolean ensureZipSourceIsValid() {
 		ZipFile specifiedFile = getSpecifiedZipSourceFile();
@@ -203,8 +203,8 @@ private boolean ensurePharSourceIsValid() {
 	}
 
 	/**
-	 * Answer a boolean indicating whether the specified source currently exists and
-	 * is valid (ie.- proper format)
+	 * Answer a boolean indicating whether the specified source currently exists
+	 * and is valid (ie.- proper format)
 	 */
 	@Override
 	protected boolean ensureSourceIsValid() {
@@ -218,9 +218,9 @@ protected boolean ensureSourceIsValid() {
 	}
 
 	/**
-	 * The Finish button was pressed. Try to do the required work now and answer a
-	 * boolean indicating success. If <code>false</code> is returned then the wizard
-	 * will not close.
+	 * The Finish button was pressed. Try to do the required work now and answer
+	 * a boolean indicating success. If <code>false</code> is returned then the
+	 * wizard will not close.
 	 * 
 	 * @return boolean
 	 */
@@ -245,8 +245,8 @@ private void disposeStructureProvider() {
 	}
 
 	/**
-	 * Returns a content provider for <code>FileSystemElement</code>s that returns
-	 * only files as children.
+	 * Returns a content provider for <code>FileSystemElement</code>s that
+	 * returns only files as children.
 	 */
 	@Override
 	protected ITreeContentProvider getFileProvider() {
@@ -300,8 +300,8 @@ protected MinimizedFileSystemElement getFileSystemTree() {
 	}
 
 	/**
-	 * Returns a content provider for <code>FileSystemElement</code>s that returns
-	 * only folders as children.
+	 * Returns a content provider for <code>FileSystemElement</code>s that
+	 * returns only folders as children.
 	 */
 	@Override
 	protected ITreeContentProvider getFolderProvider() {
@@ -334,7 +334,8 @@ public boolean hasChildren(Object o) {
 	}
 
 	/**
-	 * Answer the string to display as the label for the source specification field
+	 * Answer the string to display as the label for the source specification
+	 * field
 	 */
 	@Override
 	protected String getSourceLabel() {
@@ -404,7 +405,8 @@ private TarFile getSpecifiedTarSourceFile(String fileName) {
 	}
 
 	/**
-	 * Open a FileDialog so that the user can specify the source file to import from
+	 * Open a FileDialog so that the user can specify the source file to import
+	 * from
 	 */
 	@Override
 	protected void handleSourceBrowseButtonPressed() {
@@ -467,8 +469,8 @@ protected void initializeOperation(ImportOperation op) {
 	}
 
 	/**
-	 * Opens a file selection dialog and returns a string representing the selected
-	 * file, or <code>null</code> if the dialog was canceled.
+	 * Opens a file selection dialog and returns a string representing the
+	 * selected file, or <code>null</code> if the dialog was canceled.
 	 */
 	protected String queryZipFileToImport() {
 		FileDialog dialog = new FileDialog(sourceNameField.getShell(), SWT.OPEN | SWT.SHEET);
@@ -495,8 +497,8 @@ protected void resetSelection() {
 	}
 
 	/**
-	 * Use the dialog store to restore widget values to the values that they held
-	 * last time this wizard was used to completion
+	 * Use the dialog store to restore widget values to the values that they
+	 * held last time this wizard was used to completion
 	 */
 	@Override
 	protected void restoreWidgetValues() {
@@ -521,9 +523,9 @@ protected void restoreWidgetValues() {
 	 * Since Finish was pressed, write widget values to the dialog store so that
 	 * they will persist into the next invocation of this wizard page.
 	 * 
-	 * Note that this method is identical to the one that appears in the superclass.
-	 * This is necessary because proper overriding of instance variables is not
-	 * occurring.
+	 * Note that this method is identical to the one that appears in the
+	 * superclass. This is necessary because proper overriding of instance
+	 * variables is not occurring.
 	 */
 	@Override
 	protected void saveWidgetValues() {

pom.xml

@@ -11,7 +11,7 @@
 
 	<!-- this is the parent POM from which all modules inherit common settings -->
 	<properties>
-		<tycho-version>4.0.6</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 		<antrun-version>1.8</antrun-version>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<test.vmargs>-server</test.vmargs>
@@ -28,8 +28,8 @@
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 		<sonar.junit.reportPaths>${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.ui.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.composer.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.composer.api.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.formatter.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.profile.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.refactoring.core.tests/target/surefire-reports</sonar.junit.reportPaths>
 		<sonar.skippedModules>org.eclipse.php.core.performance.tests,org.eclipse.php,features,org.eclipse.php.repository,org.eclipse.php.core.parser</sonar.skippedModules>
-		<sonar.java.source>17</sonar.java.source>
-		<sonar.java.target>17</sonar.java.target>
+		<sonar.java.source>21</sonar.java.source>
+		<sonar.java.target>21</sonar.java.target>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/pdt.git</tycho.scmUrl>