From fdee94409c794be7b430c3c523cf21090cb3efb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Paku=C5=82a?= <zulus@w3des.net>
Date: Mon, 26 Feb 2024 17:38:43 +0100
Subject: [PATCH] Build with via 2023-12

* tycho bump
* replace javax.inject by jakarta.inject
* remove ptp.remote.feature from target
---
 .../org.eclipse.php.target.current.target                    | 5 +++--
 .../org.eclipse.php.target.next.target                       | 5 +++--
 plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF   | 2 +-
 .../php/composer/core/launch/ScriptLauncherManager.java      | 4 ++--
 plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF     | 2 +-
 .../ui/preferences/launcher/LauncherConfigurationBlock.java  | 4 ++--
 .../php/composer/ui/wizard/AbstractWizardSecondPage.java     | 4 ++--
 pom.xml                                                      | 2 +-
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
index 20bc0a0f9e..cb4765e17b 100644
--- a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
+++ b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target
@@ -10,7 +10,8 @@
 <unit id="org.eclipse.equinox.p2.ui.discovery" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ptp.remote.feature.group" version="0.0.0"/>
+
+<unit id="org.eclipse.ptp.remote.server.core" version="" />
 <unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
 
@@ -18,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-09/"/>
+<repository location="https://download.eclipse.org/releases/2023-12/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
diff --git a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
index 2bf41b42ab..7ebd8495b8 100644
--- a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
+++ b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target
@@ -15,7 +15,8 @@
 <unit id="org.eclipse.equinox.p2.ui.discovery" version=""/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version=""/>
 <unit id="org.eclipse.ptp.rdt.sync.feature.group" version=""/>
-<unit id="org.eclipse.ptp.remote.feature.group" version="" />
+
+<unit id="org.eclipse.ptp.remote.server.core" version="" />
 <unit id="org.eclipse.remote.feature.group" version="" />
 
 <unit id="org.eclipse.birt.chart.engine" version=""/>
@@ -23,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/2023-12/"/>
+<repository location="https://download.eclipse.org/releases/2024-03/"/>
 </location>
 
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
index c08e25cad8..dd285ef152 100755
--- a/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
@@ -37,6 +37,6 @@ Export-Package:
  org.eclipse.php.composer.core.visitor,
  org.eclipse.php.composer.internal.core.resources,
  org.eclipse.php.composer.internal.core.util
-Import-Package: javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: jakarta.inject
 
 
diff --git a/plugins/org.eclipse.php.composer.core/src/org/eclipse/php/composer/core/launch/ScriptLauncherManager.java b/plugins/org.eclipse.php.composer.core/src/org/eclipse/php/composer/core/launch/ScriptLauncherManager.java
index 2db9ac47e5..7f480284ed 100644
--- a/plugins/org.eclipse.php.composer.core/src/org/eclipse/php/composer/core/launch/ScriptLauncherManager.java
+++ b/plugins/org.eclipse.php.composer.core/src/org/eclipse/php/composer/core/launch/ScriptLauncherManager.java
@@ -15,8 +15,6 @@
 
 import java.util.HashMap;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
@@ -26,6 +24,8 @@
 import org.eclipse.php.composer.core.launch.environment.EnvironmentFactory;
 import org.eclipse.php.composer.core.log.Logger;
 
+import jakarta.inject.Inject;
+
 /**
  * 
  * @Inject the {@link ScriptLauncherManager} into your service to retrieve a
diff --git a/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
index 3d8434d540..6c6e772d8a 100755
--- a/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
@@ -61,5 +61,5 @@ Export-Package:
  org.eclipse.php.composer.ui.wizard.importer,
  org.eclipse.php.composer.ui.wizard.project,
  org.eclipse.php.composer.ui.wizard.project.template
-Import-Package: javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: jakarta.inject
 Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/preferences/launcher/LauncherConfigurationBlock.java b/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/preferences/launcher/LauncherConfigurationBlock.java
index 06445576cc..885818ff49 100644
--- a/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/preferences/launcher/LauncherConfigurationBlock.java
+++ b/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/preferences/launcher/LauncherConfigurationBlock.java
@@ -17,8 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.dltk.internal.ui.wizards.dialogfields.SelectionButtonDialogFieldGroup;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
@@ -45,6 +43,8 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
+import jakarta.inject.Inject;
+
 public abstract class LauncherConfigurationBlock extends OptionsConfigurationBlock implements IDialogFieldListener {
 
 	protected final Key phpExecutable;
diff --git a/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/wizard/AbstractWizardSecondPage.java b/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/wizard/AbstractWizardSecondPage.java
index 8ae24c7dc2..245f843050 100644
--- a/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/wizard/AbstractWizardSecondPage.java
+++ b/plugins/org.eclipse.php.composer.ui/src/org/eclipse/php/composer/ui/wizard/AbstractWizardSecondPage.java
@@ -22,8 +22,6 @@
 import java.util.Observable;
 import java.util.Observer;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.dltk.core.DLTKCore;
@@ -64,6 +62,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
 
+import jakarta.inject.Inject;
+
 public abstract class AbstractWizardSecondPage extends CapabilityConfigurationPage
 		implements IPHPProjectCreateWizardPage, Observer {
 
diff --git a/pom.xml b/pom.xml
index 80fbe7d531..80b278b4c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<!-- this is the parent POM from which all modules inherit common settings -->
 	<properties>
-		<tycho-version>4.0.2</tycho-version>
+		<tycho-version>4.0.6</tycho-version>
 		<antrun-version>1.8</antrun-version>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<test.vmargs>-server</test.vmargs>