Skip to content

Commit

Permalink
Build with via 2023-12
Browse files Browse the repository at this point in the history
* tycho bump
* replace javax.inject by jakarta.inject
* remove ptp.remote.feature from target
  • Loading branch information
zulus committed Feb 26, 2024
1 parent 3eec77a commit fdee944
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
<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"/>


<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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
<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=""/>
<unit id="org.eclipse.birt.chart.engine.extension" version=""/>
<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">
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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


Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit fdee944

Please sign in to comment.