From 9dcf501395012b08b52750ead4c5e7d53432fc94 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost <olivier.prouvost@opcoach.com>
Date: Wed, 7 Feb 2024 16:34:06 +0100
Subject: [PATCH] Update TP to 2023-12, tycho, jakarta...

---
 .../E4Tester_Core_Tests_macosx.launch         | 26 ++++++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../core/E4TesterUITestApplication.java       |  6 +-
 .../e4tester/core/stubs/E4TesterLogger.java   |  7 +--
 .../E4Tester_Components_Tests_linux.launch    | 25 +--------
 .../E4Tester_Components_Tests_macosx.launch   | 24 +++++---
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../e4tester/test/components/Part1.java       |  8 +--
 .../e4tester/test/components/Part2.java       |  8 +--
 .../nattable/components/NattablePart1.java    |  8 +--
 .../E4Tester_ComponentApplication.launch      | 41 ++++++++------
 ...4Tester_ComponentApplication_macosx.launch | 38 +++++++------
 .../META-INF/MANIFEST.MF                      |  6 +-
 .../e4tester/test/eap/parts/SamplePart.java   |  5 +-
 .../com.opcoach.e4tester.tp.target            | 56 ++++++++++---------
 .../com.opcoach.e4tester.tp.tpd               | 23 ++++++--
 com.opcoach.e4tester.tp/pom.xml               |  2 +-
 pom.xml                                       |  4 +-
 18 files changed, 156 insertions(+), 137 deletions(-)

diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
index dc19e2b..da18a35 100644
--- a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
+++ b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
@@ -30,8 +30,9 @@
     <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clean"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.opcoach.e4tester.core.test"/>
@@ -45,8 +46,8 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="jakarta.annotation-api@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
@@ -60,12 +61,14 @@
         <setEntry value="junit-platform-suite-commons@default:default"/>
         <setEntry value="junit-platform-suite-engine@default:default"/>
         <setEntry value="junit-vintage-engine@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
         <setEntry value="org.apache.commons.codec@default:default"/>
         <setEntry value="org.apache.commons.collections4@default:default"/>
+        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
@@ -129,9 +132,10 @@
         <setEntry value="org.eclipse.equinox.transforms.hook@default:false"/>
         <setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
         <setEntry value="org.eclipse.help@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
+        <setEntry value="org.eclipse.jetty.logging@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
         <setEntry value="org.eclipse.nebula.cwt@default:default"/>
@@ -142,12 +146,13 @@
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.nebula@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.poi@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.richtext@default:default"/>
+        <setEntry value="org.eclipse.orbit.xml-apis-ext@default:default"/>
         <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi.util@default:default"/>
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:default"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
         <setEntry value="org.eclipse.ui.cocoa@default:false"/>
@@ -155,7 +160,13 @@
         <setEntry value="org.eclipse.ui@default:default"/>
         <setEntry value="org.eclipse.urischeme@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.hamcrest@default:default"/>
         <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm.util@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
         <setEntry value="org.osgi.service.cm@default:default"/>
         <setEntry value="org.osgi.service.component.annotations@default:default"/>
@@ -173,11 +184,8 @@
         <setEntry value="org.osgi.util.position@default:default"/>
         <setEntry value="org.osgi.util.promise@default:default"/>
         <setEntry value="org.osgi.util.xml@default:default"/>
-        <setEntry value="org.slf4j.api@default:default"/>
         <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.core/META-INF/MANIFEST.MF b/com.opcoach.e4tester.core/META-INF/MANIFEST.MF
index 11c69a6..2c68120 100644
--- a/com.opcoach.e4tester.core/META-INF/MANIFEST.MF
+++ b/com.opcoach.e4tester.core/META-INF/MANIFEST.MF
@@ -20,6 +20,6 @@ Require-Bundle: org.eclipse.e4.core.contexts,
  org.eclipse.jdt.junit5.runtime,
  org.eclipse.e4.ui.di
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: jakarta.inject;version="2.0.1",
  org.junit.jupiter.api
 Automatic-Module-Name: com.opcoach.e4tester.core
diff --git a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java
index 32b2b22..49711cd 100644
--- a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java
+++ b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java
@@ -1,15 +1,11 @@
 package com.opcoach.e4tester.core;
 
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.pde.internal.junit.runtime.PDEJUnitRuntimePlugin;
-import org.eclipse.pde.internal.junit.runtime.PlatformUITestHarness;
 import org.eclipse.pde.internal.junit.runtime.UITestApplication;
 
 public class E4TesterUITestApplication extends UITestApplication {
 
 	
-	
+
 	@Override
 	protected Object runApp(IApplication app, IApplicationContext context) throws Exception {
 		// Get the testable object from the service
diff --git a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/stubs/E4TesterLogger.java b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/stubs/E4TesterLogger.java
index 4399071..680eec6 100644
--- a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/stubs/E4TesterLogger.java
+++ b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/stubs/E4TesterLogger.java
@@ -2,15 +2,11 @@
 
 import java.util.ArrayList;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.log.Logger;
-import org.eclipse.e4.ui.internal.workbench.Activator;
 import org.eclipse.e4.ui.internal.workbench.Policy;
 import org.eclipse.e4.ui.internal.workbench.WorkbenchLogger;
 import org.eclipse.osgi.framework.log.FrameworkLog;
@@ -18,6 +14,9 @@
 import org.eclipse.osgi.service.debug.DebugOptions;
 import org.eclipse.osgi.service.debug.DebugTrace;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 
 /**
  * Logger class duplicate from workbenchlogger
diff --git a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
index 8a87ebe..738df79 100644
--- a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
+++ b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
@@ -27,6 +27,8 @@
     <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
@@ -39,7 +41,6 @@
     <booleanAttribute key="run_in_ui_thread" value="true"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="com.ibm.icu@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
@@ -117,34 +118,12 @@
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
         <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
-        <setEntry value="com.opcoach.e34tools@default:default"/>
-        <setEntry value="com.opcoach.e4.preference.example.e3@default:false"/>
-        <setEntry value="com.opcoach.e4.preferences.example@default:default"/>
-        <setEntry value="com.opcoach.e4.preferences.mainmenu@default:default"/>
-        <setEntry value="com.opcoach.e4.preferences.provider.example@default:default"/>
-        <setEntry value="com.opcoach.e4.preferences@default:default"/>
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
         <setEntry value="com.opcoach.e4tester.core@default:default"/>
         <setEntry value="com.opcoach.e4tester.test.components.test@default:false"/>
         <setEntry value="com.opcoach.e4tester.test.components@default:default"/>
-        <setEntry value="com.opcoach.generator.data@default:default"/>
-        <setEntry value="com.opcoach.generator.model.test@default:false"/>
-        <setEntry value="com.opcoach.generator.model@default:default"/>
-        <setEntry value="com.opcoach.genmodeladdon.core.test@default:false"/>
-        <setEntry value="com.opcoach.genmodeladdon.core@default:default"/>
-        <setEntry value="com.opcoach.genmodeladdon.sample@default:default"/>
-        <setEntry value="com.opcoach.genmodeladdon.ui@default:default"/>
-        <setEntry value="com.opcoach.project.test@default:default"/>
-        <setEntry value="org.lcx.robotframework.eclipselibrary@default:default"/>
-        <setEntry value="org.lcx.robotframework.eclipselibrary_interface@default:default"/>
-        <setEntry value="org.lcx.robotframework.rcp.part1@default:default"/>
-        <setEntry value="org.lcx.robotframework.swtbotplugin@default:default"/>
-        <setEntry value="robotframework-eclipselibrary@default:default"/>
     </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>
     <stringAttribute key="testApplication" value="com.opcoach.e4tester.core.application"/>
diff --git a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
index d84d07e..75afc4a 100644
--- a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
+++ b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
@@ -30,6 +30,7 @@
     <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
@@ -44,8 +45,8 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="jakarta.annotation-api@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
@@ -59,12 +60,14 @@
         <setEntry value="junit-platform-suite-commons@default:default"/>
         <setEntry value="junit-platform-suite-engine@default:default"/>
         <setEntry value="junit-vintage-engine@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
         <setEntry value="org.apache.commons.codec@default:default"/>
         <setEntry value="org.apache.commons.collections4@default:default"/>
+        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
@@ -128,9 +131,10 @@
         <setEntry value="org.eclipse.equinox.transforms.hook@default:false"/>
         <setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
         <setEntry value="org.eclipse.help@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
+        <setEntry value="org.eclipse.jetty.logging@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
         <setEntry value="org.eclipse.nebula.cwt@default:default"/>
@@ -141,12 +145,13 @@
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.nebula@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.poi@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.richtext@default:default"/>
+        <setEntry value="org.eclipse.orbit.xml-apis-ext@default:default"/>
         <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi.util@default:default"/>
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
         <setEntry value="org.eclipse.ui.cocoa@default:false"/>
@@ -154,7 +159,13 @@
         <setEntry value="org.eclipse.ui@default:default"/>
         <setEntry value="org.eclipse.urischeme@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.hamcrest@default:default"/>
         <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm.util@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
         <setEntry value="org.osgi.service.cm@default:default"/>
         <setEntry value="org.osgi.service.component.annotations@default:default"/>
@@ -172,11 +183,8 @@
         <setEntry value="org.osgi.util.position@default:default"/>
         <setEntry value="org.osgi.util.promise@default:default"/>
         <setEntry value="org.osgi.util.xml@default:default"/>
-        <setEntry value="org.slf4j.api@default:default"/>
         <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.components/META-INF/MANIFEST.MF b/com.opcoach.e4tester.test.components/META-INF/MANIFEST.MF
index 9bc4f58..3c009ed 100644
--- a/com.opcoach.e4tester.test.components/META-INF/MANIFEST.MF
+++ b/com.opcoach.e4tester.test.components/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.e4.ui.css.core;bundle-version="0.12.900"
 Export-Package: com.opcoach.e4tester.test.components,
  com.opcoach.e4tester.test.nattable.components
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0"
+Import-Package: jakarta.annotation,
+ jakarta.inject
 Bundle-ClassPath: .,
  lib/org.eclipse.nebula.widgets.nattable.dataset_2.0.0.201910081900.jar
diff --git a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part1.java b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part1.java
index 1bfebdc..260cdaa 100644
--- a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part1.java
+++ b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part1.java
@@ -1,10 +1,6 @@
  
 package com.opcoach.e4tester.test.components;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -21,6 +17,10 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 /** Create a sample part with label and treeviewer */
 public class Part1 {
 	
diff --git a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part2.java b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part2.java
index 7f19fe1..c380044 100644
--- a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part2.java
+++ b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/components/Part2.java
@@ -1,16 +1,16 @@
 
 package com.opcoach.e4tester.test.components;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 /**
  * Create a sample part with a label updated when selection in tree of Part 1
  * changes
diff --git a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/nattable/components/NattablePart1.java b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/nattable/components/NattablePart1.java
index a79abba..7cc6504 100644
--- a/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/nattable/components/NattablePart1.java
+++ b/com.opcoach.e4tester.test.components/src/com/opcoach/e4tester/test/nattable/components/NattablePart1.java
@@ -4,10 +4,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
@@ -45,6 +41,10 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 /**
  * NatTable Part
  * @author root
diff --git a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
index c2ec6c1..68692bb 100644
--- a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
+++ b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
@@ -20,20 +20,25 @@
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="com.opcoach.e4tester.test.eap.product"/>
     <booleanAttribute key="restart" value="true"/>
     <setAttribute key="selected_target_bundles">
+        <setEntry value="bcpg@default:default"/>
+        <setEntry value="bcprov@default:default"/>
+        <setEntry value="biz.aQute.bnd.util@default:default"/>
+        <setEntry value="biz.aQute.bndlib@default:default"/>
         <setEntry value="ca.odell.glazedlists@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="jakarta.annotation-api@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
@@ -47,12 +52,14 @@
         <setEntry value="junit-platform-suite-commons@default:default"/>
         <setEntry value="junit-platform-suite-engine@default:default"/>
         <setEntry value="junit-vintage-engine@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
         <setEntry value="org.apache.commons.codec@default:default"/>
         <setEntry value="org.apache.commons.collections4@default:default"/>
+        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
@@ -64,8 +71,6 @@
         <setEntry value="org.apache.poi@default:default"/>
         <setEntry value="org.apache.xmlgraphics@default:default"/>
         <setEntry value="org.apiguardian.api@default:default"/>
-        <setEntry value="org.bouncycastle.bcpg@default:default"/>
-        <setEntry value="org.bouncycastle.bcprov@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
         <setEntry value="org.eclipse.collections@default:default"/>
         <setEntry value="org.eclipse.compare.core@default:default"/>
@@ -91,8 +96,6 @@
         <setEntry value="org.eclipse.e4.core.di@default:default"/>
         <setEntry value="org.eclipse.e4.core.services@default:default"/>
         <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
-        <setEntry value="org.eclipse.e4.tools.emf.ui@default:default"/>
-        <setEntry value="org.eclipse.e4.tools.services@default:default"/>
         <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
         <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
         <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
@@ -109,12 +112,9 @@
         <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
         <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
         <setEntry value="org.eclipse.emf.common@default:default"/>
-        <setEntry value="org.eclipse.emf.databinding.edit@default:default"/>
-        <setEntry value="org.eclipse.emf.databinding@default:default"/>
         <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
         <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
         <setEntry value="org.eclipse.emf.ecore@default:default"/>
-        <setEntry value="org.eclipse.emf.edit@default:default"/>
         <setEntry value="org.eclipse.equinox.app@default:default"/>
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
@@ -147,14 +147,14 @@
         <setEntry value="org.eclipse.equinox.transforms.hook@default:false"/>
         <setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
         <setEntry value="org.eclipse.help@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
-        <setEntry value="org.eclipse.jdt.compiler.apt@default:false"/>
-        <setEntry value="org.eclipse.jdt.compiler.tool@default:false"/>
+        <setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
         <setEntry value="org.eclipse.jdt.core@default:default"/>
         <setEntry value="org.eclipse.jdt.debug@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.launching@default:default"/>
+        <setEntry value="org.eclipse.jetty.logging@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.text@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
@@ -166,6 +166,7 @@
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.nebula@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.poi@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.richtext@default:default"/>
+        <setEntry value="org.eclipse.orbit.xml-apis-ext@default:default"/>
         <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi.util@default:default"/>
@@ -173,7 +174,7 @@
         <setEntry value="org.eclipse.pde.build@default:default"/>
         <setEntry value="org.eclipse.pde.core@default:default"/>
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
         <setEntry value="org.eclipse.text@default:default"/>
@@ -185,7 +186,13 @@
         <setEntry value="org.eclipse.update.configurator@default:default"/>
         <setEntry value="org.eclipse.urischeme@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.hamcrest@default:default"/>
         <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm.util@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
         <setEntry value="org.osgi.service.cm@default:default"/>
         <setEntry value="org.osgi.service.component.annotations@default:default"/>
@@ -195,6 +202,7 @@
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
+        <setEntry value="org.osgi.service.repository@default:default"/>
         <setEntry value="org.osgi.service.upnp@default:default"/>
         <setEntry value="org.osgi.service.useradmin@default:default"/>
         <setEntry value="org.osgi.service.wireadmin@default:default"/>
@@ -205,12 +213,9 @@
         <setEntry value="org.osgi.util.xml@default:default"/>
         <setEntry value="org.sat4j.core@default:default"/>
         <setEntry value="org.sat4j.pb@default:default"/>
-        <setEntry value="org.slf4j.api@default:default"/>
         <setEntry value="org.tukaani.xz@default:default"/>
         <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
index 3b7b90d..ab97f15 100644
--- a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
+++ b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
@@ -29,12 +29,16 @@
     <stringAttribute key="product" value="com.opcoach.e4tester.test.eap.product"/>
     <booleanAttribute key="restart" value="true"/>
     <setAttribute key="selected_target_bundles">
+        <setEntry value="bcpg@default:default"/>
+        <setEntry value="bcprov@default:default"/>
+        <setEntry value="biz.aQute.bnd.util@default:default"/>
+        <setEntry value="biz.aQute.bndlib@default:default"/>
         <setEntry value="ca.odell.glazedlists@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="jakarta.annotation-api@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
         <setEntry value="javax.inject@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
@@ -48,12 +52,14 @@
         <setEntry value="junit-platform-suite-commons@default:default"/>
         <setEntry value="junit-platform-suite-engine@default:default"/>
         <setEntry value="junit-vintage-engine@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
         <setEntry value="org.apache.commons.codec@default:default"/>
         <setEntry value="org.apache.commons.collections4@default:default"/>
+        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
@@ -65,8 +71,6 @@
         <setEntry value="org.apache.poi@default:default"/>
         <setEntry value="org.apache.xmlgraphics@default:default"/>
         <setEntry value="org.apiguardian.api@default:default"/>
-        <setEntry value="org.bouncycastle.bcpg@default:default"/>
-        <setEntry value="org.bouncycastle.bcprov@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
         <setEntry value="org.eclipse.collections@default:default"/>
         <setEntry value="org.eclipse.compare.core@default:default"/>
@@ -92,8 +96,6 @@
         <setEntry value="org.eclipse.e4.core.di@default:default"/>
         <setEntry value="org.eclipse.e4.core.services@default:default"/>
         <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
-        <setEntry value="org.eclipse.e4.tools.emf.ui@default:default"/>
-        <setEntry value="org.eclipse.e4.tools.services@default:default"/>
         <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
         <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
         <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
@@ -110,12 +112,9 @@
         <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
         <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
         <setEntry value="org.eclipse.emf.common@default:default"/>
-        <setEntry value="org.eclipse.emf.databinding.edit@default:default"/>
-        <setEntry value="org.eclipse.emf.databinding@default:default"/>
         <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
         <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
         <setEntry value="org.eclipse.emf.ecore@default:default"/>
-        <setEntry value="org.eclipse.emf.edit@default:default"/>
         <setEntry value="org.eclipse.equinox.app@default:default"/>
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
@@ -148,14 +147,14 @@
         <setEntry value="org.eclipse.equinox.transforms.hook@default:false"/>
         <setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
         <setEntry value="org.eclipse.help@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
-        <setEntry value="org.eclipse.jdt.compiler.apt@default:false"/>
-        <setEntry value="org.eclipse.jdt.compiler.tool@default:false"/>
+        <setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
         <setEntry value="org.eclipse.jdt.core@default:default"/>
         <setEntry value="org.eclipse.jdt.debug@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.launching@default:default"/>
+        <setEntry value="org.eclipse.jetty.logging@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.notifications@default:default"/>
         <setEntry value="org.eclipse.jface.text@default:default"/>
@@ -168,6 +167,7 @@
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.nebula@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.nattable.extension.poi@default:default"/>
         <setEntry value="org.eclipse.nebula.widgets.richtext@default:default"/>
+        <setEntry value="org.eclipse.orbit.xml-apis-ext@default:default"/>
         <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi.util@default:default"/>
@@ -175,7 +175,7 @@
         <setEntry value="org.eclipse.pde.build@default:default"/>
         <setEntry value="org.eclipse.pde.core@default:default"/>
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
         <setEntry value="org.eclipse.text@default:default"/>
@@ -186,7 +186,13 @@
         <setEntry value="org.eclipse.update.configurator@default:default"/>
         <setEntry value="org.eclipse.urischeme@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.hamcrest@default:default"/>
         <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm.util@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
         <setEntry value="org.osgi.service.cm@default:default"/>
         <setEntry value="org.osgi.service.component.annotations@default:default"/>
@@ -196,6 +202,7 @@
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
+        <setEntry value="org.osgi.service.repository@default:default"/>
         <setEntry value="org.osgi.service.upnp@default:default"/>
         <setEntry value="org.osgi.service.useradmin@default:default"/>
         <setEntry value="org.osgi.service.wireadmin@default:default"/>
@@ -206,12 +213,9 @@
         <setEntry value="org.osgi.util.xml@default:default"/>
         <setEntry value="org.sat4j.core@default:default"/>
         <setEntry value="org.sat4j.pb@default:default"/>
-        <setEntry value="org.slf4j.api@default:default"/>
         <setEntry value="org.tukaani.xz@default:default"/>
         <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.eap/META-INF/MANIFEST.MF b/com.opcoach.e4tester.test.eap/META-INF/MANIFEST.MF
index 25fd3e2..f334401 100644
--- a/com.opcoach.e4tester.test.eap/META-INF/MANIFEST.MF
+++ b/com.opcoach.e4tester.test.eap/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: Eap
 Bundle-SymbolicName: com.opcoach.e4tester.test.eap;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.swt;bundle-version="0.0.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
  org.eclipse.jface;bundle-version="0.0.0",
@@ -17,5 +16,6 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
  com.opcoach.e4tester.test.components;bundle-version="1.0.0",
  org.eclipse.e4.ui.workbench.renderers.swt
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.annotation;version="0.0.0"
+Import-Package: jakarta.annotation;version="2.1.1",
+ jakarta.inject;version="2.0.1"
 Automatic-Module-Name: com.opcoach.e4tester.core.test.eap
diff --git a/com.opcoach.e4tester.test.eap/src/com/opcoach/e4tester/test/eap/parts/SamplePart.java b/com.opcoach.e4tester.test.eap/src/com/opcoach/e4tester/test/eap/parts/SamplePart.java
index a1b546e..429c5d1 100644
--- a/com.opcoach.e4tester.test.eap/src/com/opcoach/e4tester/test/eap/parts/SamplePart.java
+++ b/com.opcoach.e4tester.test.eap/src/com/opcoach/e4tester/test/eap/parts/SamplePart.java
@@ -2,8 +2,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
@@ -16,6 +14,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 TableViewer tableViewer;
diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
index 7f5eafc..12deb1f 100644
--- a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
+++ b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="E4 Tester 2022-12" sequenceNumber="1690820097">
+<target name="E4 Tester 2023-12" sequenceNumber="1707318898">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.28.0.v20230605-0440"/>
-      <unit id="org.eclipse.e4.rcp.feature.group" version="4.28.0.v20230525-0648"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2100.v20230415-0944"/>
-      <unit id="org.eclipse.jdt.junit5.runtime" version="1.1.100.v20220907-0450"/>
-      <unit id="junit-jupiter-api" version="5.9.3"/>
-      <unit id="junit-jupiter-engine" version="5.9.3"/>
-      <unit id="junit-jupiter-migrationsupport" version="5.9.3"/>
-      <unit id="junit-jupiter-params" version="5.9.3"/>
-      <unit id="junit-platform-commons" version="1.9.3"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.15.0.v20230605-0440"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
-      <repository location="https://download.eclipse.org/releases/2023-06"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.30.0.v20231201-0512"/>
+      <unit id="org.eclipse.e4.rcp.feature.group" version="4.30.0.v20231113-1355"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/>
+      <unit id="org.eclipse.jdt.junit5.runtime" version="1.1.200.v20231102-1522"/>
+      <unit id="junit-jupiter-api" version="5.10.1"/>
+      <unit id="junit-jupiter-engine" version="5.10.1"/>
+      <unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
+      <unit id="junit-jupiter-params" version="5.10.1"/>
+      <unit id="junit-platform-commons" version="1.10.1"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.15.200.v20231201-0110"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+      <unit id="jakarta.annotation-api" version="2.1.1"/>
+      <repository location="https://download.eclipse.org/releases/2023-12"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="2.2.0.202306301103"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="2.2.0.202306301103"/>
-      <repository location="https://download.eclipse.org/nattable/releases/2.2.0/repository"/>
+      <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
+      <repository location="https://download.eclipse.org/releases/2023-09"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="2.2.1.202311151329"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.jar" version="2.2.1.202311151329"/>
+      <repository location="https://download.eclipse.org/nattable/releases/2.2.1/repository"/>
     </location>
   </locations>
 </target>
diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
index 72851e7..fc2901a 100644
--- a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
+++ b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
@@ -1,6 +1,10 @@
-target "E4 Tester 2022-12" with source requirements
+target "E4 Tester 2023-12" with source requirements
 
-location "https://download.eclipse.org/releases/2023-06" {
+
+
+
+
+location "https://download.eclipse.org/releases/2023-12" {
 // org.eclipse.rcp.feature.group
 	org.eclipse.platform.feature.group
 	org.eclipse.e4.rcp.feature.group
@@ -20,14 +24,22 @@ location "https://download.eclipse.org/releases/2023-06" {
 	
 	// Delta pack
 	org.eclipse.equinox.sdk.feature.group 
+	jakarta.inject.jakarta.inject-api
+	jakarta.annotation-api
 	
-	javax.annotation
-	
+	//	org.eclipse.orbit.xml-apis-ext
+		  
+}
+
+// Nebula is not totally updated with its dependencies... Must still get sac (legacy) from 2023-09
+
+location "https://download.eclipse.org/releases/2023-09" {
+	org.w3c.css.sac
 }
 
 
 // Add nebula nattable
-location "https://download.eclipse.org/nattable/releases/2.2.0/repository" {
+location "https://download.eclipse.org/nattable/releases/2.2.1/repository" {
 	
 	org.eclipse.nebula.widgets.nattable.core.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
@@ -39,6 +51,7 @@ location "https://download.eclipse.org/nattable/releases/2.2.0/repository" {
 	org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group
+	org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.jar
 	
 }
 
diff --git a/com.opcoach.e4tester.tp/pom.xml b/com.opcoach.e4tester.tp/pom.xml
index 13c39d0..8a6f239 100644
--- a/com.opcoach.e4tester.tp/pom.xml
+++ b/com.opcoach.e4tester.tp/pom.xml
@@ -10,7 +10,7 @@
 
 <!-- 	<name>E4 Tester Target Platform</name> -->
 	<artifactId>com.opcoach.e4tester.tp</artifactId>
-	<version>4.28.0</version>
+	<version>4.30.0</version>
 	<packaging>eclipse-target-definition</packaging>
 	
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 86bd441..a8d36c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 
 	<properties>
-		<tycho-version>4.0.1</tycho-version>
+		<tycho-version>4.0.5</tycho-version>
 	</properties>
 
 
@@ -81,7 +81,7 @@
 						<artifact>
 							<groupId>com.opcoach.e4tester</groupId>
 							<artifactId>com.opcoach.e4tester.tp</artifactId>
-							<version>4.28.0</version>
+							<version>4.30.0</version>
 						</artifact>
 					</target>
 					<environments>