javax -> jakarta in e4 example

eclipse-emf-parsley · Nov 16, 2023 · d63079e · d63079e
1 parent 8dc864c
commit d63079e
Show file tree

Hide file tree

Showing 6 changed files with 856 additions and 62 deletions.
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.di,
- javax.annotation,
- org.eclipse.equinox.event
+ org.eclipse.equinox.event,
+ jakarta.annotation-api;bundle-version="2.1.1"
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/...rg/eclipse/emf/parsley/examples/eclipse4/parsleypart/handlers/ShowParsleyPartHandler.java b/...rg/eclipse/emf/parsley/examples/eclipse4/parsleypart/handlers/ShowParsleyPartHandler.java
@@ -11,13 +11,13 @@
 
 package org.eclipse.emf.parsley.examples.eclipse4.parsleypart.handlers;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 
+import jakarta.inject.Inject;
+
 public class ShowParsleyPartHandler {
 
 	@Inject

diff --git a/...t/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java b/...t/src/org/eclipse/emf/parsley/examples/eclipse4/parsleypart/parts/ParsleyE4ModelPart.java
@@ -11,9 +11,6 @@
  *******************************************************************************/
 package org.eclipse.emf.parsley.examples.eclipse4.parsleypart.parts;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -27,6 +24,9 @@
 
 import com.google.inject.Injector;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class ParsleyE4ModelPart {
 
 	private TreeFormComposite treeFormComposite;

diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Eclipse4
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.eclipse4;singleton:=true
 Bundle-Version: 1.15.0.qualifier
-Require-Bundle: javax.inject,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.jface,
@@ -19,6 +18,6 @@ Require-Bundle: javax.inject,
  org.eclipse.emf.common,
  org.eclipse.emf.edit,
  org.eclipse.emf.parsley,
- javax.annotation
+ jakarta.annotation-api;bundle-version="2.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.emf.parsley.examples.eclipse4
diff --git a/...ley.examples.eclipse4/src/org/eclipse/emf/parsley/examples/eclipse4/parts/SamplePart.java b/...ley.examples.eclipse4/src/org/eclipse/emf/parsley/examples/eclipse4/parts/SamplePart.java
@@ -11,9 +11,6 @@
  *******************************************************************************/
 package org.eclipse.emf.parsley.examples.eclipse4.parts;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.ui.MDirtyable;
@@ -26,6 +23,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class SamplePart {
 
 	private Text txtInput;

diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/EmfParsleyEclipse4ExampleTest.launch b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/EmfParsleyEclipse4ExampleTest.launch