Skip to content

Commit

Permalink
Update to tycho 4.0.5, eclipse 2023-12 and javaxinject to jakarta inject
Browse files Browse the repository at this point in the history
  • Loading branch information
opcoach committed Feb 7, 2024
1 parent 859ee40 commit a2750bc
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions com.opcoach.e4.preferences.example/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Bundle-Name: Test E4 Preferences
Bundle-SymbolicName: com.opcoach.e4.preferences.example;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: OPCOACH
Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="0.0.0",
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.e4.ui.services;bundle-version="0.0.0",
Expand All @@ -15,7 +14,8 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
org.eclipse.e4.core.di.extensions;bundle-version="0.0.0",
com.opcoach.e4.preferences,
com.opcoach.e4.preferences.provider.example
com.opcoach.e4.preferences.provider.example,
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.annotation;version="1.2.0"
Import-Package: jakarta.annotation;version="2.1.1"
Automatic-Module-Name: com.opcoach.e4.preferences.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
*******************************************************************************/
package com.opcoach.e4.preferences.example.parts;

import javax.annotation.PostConstruct;
import javax.inject.Inject;

import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.di.extensions.Preference;
import org.eclipse.e4.ui.di.Focus;
Expand All @@ -31,6 +28,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;

public class SamplePart
{

Expand Down
2 changes: 1 addition & 1 deletion com.opcoach.e4.preferences/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.ui.services,
org.eclipse.core.commands
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.inject;version="1.0.0",
Import-Package: jakarta.inject;version="2.0.1",
org.eclipse.jface,
org.eclipse.jface.dialogs,
org.eclipse.jface.preference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

package com.opcoach.e4.preferences;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
*/
package com.opcoach.e4.preferences.handlers;

import javax.inject.Named;

import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.core.di.annotations.Optional;
Expand All @@ -32,6 +30,8 @@
import com.opcoach.e4.preferences.internal.E4PrefManager;
import com.opcoach.e4.preferences.internal.E4PreferenceRegistry;

import jakarta.inject.Named;

/**
* This handler if provided to open preference pages. In a pure E4 application
* it is not provided. In a E3 application it is defined by default.
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<packaging>pom</packaging>

<properties>
<tycho-version>4.0.1</tycho-version>
<tycho-version>4.0.5</tycho-version>
</properties>

<repositories>
<repository>
<id>SimRel202-12</id>
<id>SimRel203-12</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/2023-06</url>
<url>http://download.eclipse.org/releases/2023-12</url>
</repository>
</repositories>

Expand Down

0 comments on commit a2750bc

Please sign in to comment.