Skip to content

Commit a2750bc

Browse files
committed
Update to tycho 4.0.5, eclipse 2023-12 and javaxinject to jakarta inject
1 parent 859ee40 commit a2750bc

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

com.opcoach.e4.preferences.example/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Bundle-Name: Test E4 Preferences
44
Bundle-SymbolicName: com.opcoach.e4.preferences.example;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: OPCOACH
7-
Require-Bundle: javax.inject;bundle-version="0.0.0",
8-
org.eclipse.core.runtime;bundle-version="0.0.0",
7+
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
98
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
109
org.eclipse.jface;bundle-version="0.0.0",
1110
org.eclipse.e4.ui.services;bundle-version="0.0.0",
@@ -15,7 +14,8 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
1514
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
1615
org.eclipse.e4.core.di.extensions;bundle-version="0.0.0",
1716
com.opcoach.e4.preferences,
18-
com.opcoach.e4.preferences.provider.example
17+
com.opcoach.e4.preferences.provider.example,
18+
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
1919
Bundle-RequiredExecutionEnvironment: JavaSE-11
20-
Import-Package: javax.annotation;version="1.2.0"
20+
Import-Package: jakarta.annotation;version="2.1.1"
2121
Automatic-Module-Name: com.opcoach.e4.preferences.example

com.opcoach.e4.preferences.example/src/com/opcoach/e4/preferences/example/parts/SamplePart.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
*******************************************************************************/
1212
package com.opcoach.e4.preferences.example.parts;
1313

14-
import javax.annotation.PostConstruct;
15-
import javax.inject.Inject;
16-
1714
import org.eclipse.e4.core.di.annotations.Optional;
1815
import org.eclipse.e4.core.di.extensions.Preference;
1916
import org.eclipse.e4.ui.di.Focus;
@@ -31,6 +28,9 @@
3128
import org.eclipse.swt.widgets.Composite;
3229
import org.eclipse.swt.widgets.Text;
3330

31+
import jakarta.annotation.PostConstruct;
32+
import jakarta.inject.Inject;
33+
3434
public class SamplePart
3535
{
3636

com.opcoach.e4.preferences/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
1414
org.eclipse.e4.ui.services,
1515
org.eclipse.core.commands
1616
Bundle-RequiredExecutionEnvironment: JavaSE-11
17-
Import-Package: javax.inject;version="1.0.0",
17+
Import-Package: jakarta.inject;version="2.0.1",
1818
org.eclipse.jface,
1919
org.eclipse.jface.dialogs,
2020
org.eclipse.jface.preference,

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/E4PreferencesAddon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
package com.opcoach.e4.preferences;
1313

14-
import javax.inject.Inject;
14+
import jakarta.inject.Inject;
1515

1616
import org.eclipse.e4.core.contexts.IEclipseContext;
1717
import org.eclipse.e4.core.di.annotations.Optional;

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/handlers/E4PreferencesHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
package com.opcoach.e4.preferences.handlers;
1919

20-
import javax.inject.Named;
21-
2220
import org.eclipse.e4.core.contexts.IEclipseContext;
2321
import org.eclipse.e4.core.di.annotations.Execute;
2422
import org.eclipse.e4.core.di.annotations.Optional;
@@ -32,6 +30,8 @@
3230
import com.opcoach.e4.preferences.internal.E4PrefManager;
3331
import com.opcoach.e4.preferences.internal.E4PreferenceRegistry;
3432

33+
import jakarta.inject.Named;
34+
3535
/**
3636
* This handler if provided to open preference pages. In a pure E4 application
3737
* it is not provided. In a E3 application it is defined by default.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<packaging>pom</packaging>
99

1010
<properties>
11-
<tycho-version>4.0.1</tycho-version>
11+
<tycho-version>4.0.5</tycho-version>
1212
</properties>
1313

1414
<repositories>
1515
<repository>
16-
<id>SimRel202-12</id>
16+
<id>SimRel203-12</id>
1717
<layout>p2</layout>
18-
<url>http://download.eclipse.org/releases/2023-06</url>
18+
<url>http://download.eclipse.org/releases/2023-12</url>
1919
</repository>
2020
</repositories>
2121

0 commit comments

Comments
 (0)