diff --git a/devenv/launches/RCPTT IDE.launch b/devenv/launches/RCPTT IDE.launch
index 4810266a5..5ab0f2b9f 100644
--- a/devenv/launches/RCPTT IDE.launch	
+++ b/devenv/launches/RCPTT IDE.launch	
@@ -3,6 +3,7 @@
     <booleanAttribute key="append.args" value="true"/>
     <booleanAttribute key="askclear" value="true"/>
     <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticIncludeRequirements" value="true"/>
     <booleanAttribute key="automaticValidate" value="false"/>
     <stringAttribute key="bootstrap" value=""/>
     <stringAttribute key="checked" value="[NONE]"/>
@@ -12,7 +13,7 @@
     <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RCPTT IDE"/>
     <booleanAttribute key="default" value="false"/>
     <setAttribute key="deselected_workspace_bundles"/>
-    <booleanAttribute key="includeOptional" value="true"/>
+    <booleanAttribute key="includeOptional" value="false"/>
     <stringAttribute key="location" value="${workspace_loc}/../runtime-rcpttIde"/>
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -32,22 +33,17 @@
         <setEntry value="bcpg@default:default"/>
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava*33.0.0.jre@default:default"/>
         <setEntry value="com.google.guava.failureaccess@default:default"/>
-        <setEntry value="com.google.guava@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.jcraft.jsch@default:default"/>
-        <setEntry value="com.sun.el@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
         <setEntry value="com.sun.xml.bind@default:default"/>
         <setEntry value="jakarta.activation@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
         <setEntry value="jakarta.xml.bind@default:default"/>
         <setEntry value="javax.activation@default:default"/>
         <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.el@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
-        <setEntry value="javax.servlet.jsp-api@default:default"/>
         <setEntry value="javax.xml@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
@@ -70,35 +66,25 @@
         <setEntry value="org.apache.batik.awt.util@default:default"/>
         <setEntry value="org.apache.batik.bridge@default:default"/>
         <setEntry value="org.apache.batik.codec@default:default"/>
-        <setEntry value="org.apache.batik.constants*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.constants*1.9.1.v20180227-1645@default:default"/>
-        <setEntry value="org.apache.batik.css*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.css*1.9.1.v20181015-1528@default:default"/>
-        <setEntry value="org.apache.batik.dom*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.dom*1.9.1.v20190730-1743@default:default"/>
+        <setEntry value="org.apache.batik.constants@default:default"/>
+        <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.dom.svg@default:default"/>
-        <setEntry value="org.apache.batik.ext.awt@default:default"/>
+        <setEntry value="org.apache.batik.dom@default:default"/>
         <setEntry value="org.apache.batik.ext@default:default"/>
         <setEntry value="org.apache.batik.gvt@default:default"/>
-        <setEntry value="org.apache.batik.i18n*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.i18n*1.9.1.v20180227-1645@default:default"/>
+        <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.parser@default:default"/>
         <setEntry value="org.apache.batik.script@default:default"/>
-        <setEntry value="org.apache.batik.svggen*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.svggen*1.9.1.v20190730-1743@default:default"/>
+        <setEntry value="org.apache.batik.svggen@default:default"/>
         <setEntry value="org.apache.batik.transcoder@default:default"/>
-        <setEntry value="org.apache.batik.util*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.util*1.9.1.v20180703-1553@default:default"/>
-        <setEntry value="org.apache.batik.xml*1.16.0.v20221027-0840@default:default"/>
-        <setEntry value="org.apache.batik.xml*1.9.1.v20190730-1743@default:default"/>
+        <setEntry value="org.apache.batik.util@default:default"/>
+        <setEntry value="org.apache.batik.xml@default:default"/>
         <setEntry value="org.apache.commons.codec@default:default"/>
-        <setEntry value="org.apache.commons.collections4@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.lang3.source@default:default"/>
         <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
-        <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
         <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
@@ -106,13 +92,9 @@
         <setEntry value="org.apache.httpcomponents.client5.httpclient5@default:default"/>
         <setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
         <setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
-        <setEntry value="org.apache.jasper.glassfish@default:default"/>
-        <setEntry value="org.apache.lucene.analyzers-common@default:default"/>
-        <setEntry value="org.apache.lucene.analyzers-smartcn@default:default"/>
         <setEntry value="org.apache.lucene.core@default:default"/>
         <setEntry value="org.apache.poi.ooxml@default:default"/>
         <setEntry value="org.apache.poi@default:default"/>
-        <setEntry value="org.apache.xalan@default:default"/>
         <setEntry value="org.apache.xmlgraphics@default:default"/>
         <setEntry value="org.apiguardian.api@default:default"/>
         <setEntry value="org.aspectj.runtime@default:default"/>
@@ -150,8 +132,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"/>
@@ -238,7 +218,6 @@
         <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
         <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
         <setEntry value="org.eclipse.equinox.launcher.cocoa.macosx.aarch64@default:false"/>
-        <setEntry value="org.eclipse.equinox.launcher.cocoa.macosx@default:false"/>
         <setEntry value="org.eclipse.equinox.launcher@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.console@default:default"/>
@@ -276,7 +255,6 @@
         <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
         <setEntry value="org.eclipse.equinox.weaving.aspectj@default:default"/>
         <setEntry value="org.eclipse.equinox.weaving.hook@default:false"/>
-        <setEntry value="org.eclipse.gef.doc.isv@default:default"/>
         <setEntry value="org.eclipse.gef@default:default"/>
         <setEntry value="org.eclipse.gmf.runtime.common.core@default:default"/>
         <setEntry value="org.eclipse.gmf.runtime.common.ui.action.ide@default:default"/>
@@ -321,8 +299,6 @@
         <setEntry value="org.eclipse.help.ui@default:default"/>
         <setEntry value="org.eclipse.help.webapp@default:default"/>
         <setEntry value="org.eclipse.help@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*1.2.100.v20220826-1026@default:default"/>
-        <setEntry value="org.eclipse.jdt.annotation*2.2.700.v20220826-1026@default:default"/>
         <setEntry value="org.eclipse.jdt.apt.core@default:default"/>
         <setEntry value="org.eclipse.jdt.apt.pluggable.core@default:default"/>
         <setEntry value="org.eclipse.jdt.apt.ui@default:default"/>
@@ -347,8 +323,6 @@
         <setEntry value="org.eclipse.jetty.io@default:default"/>
         <setEntry value="org.eclipse.jetty.security@default:default"/>
         <setEntry value="org.eclipse.jetty.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
         <setEntry value="org.eclipse.jetty.util@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.notifications@default:default"/>
@@ -365,7 +339,6 @@
         <setEntry value="org.eclipse.ocl.ecore@default:default"/>
         <setEntry value="org.eclipse.ocl@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.api.tools.annotations@default:default"/>
@@ -381,13 +354,6 @@
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.pde.launching@default:default"/>
         <setEntry value="org.eclipse.pde.runtime@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.bundle@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.context@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.core@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.css@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.event@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.model@default:default"/>
-        <setEntry value="org.eclipse.pde.spy.preferences@default:default"/>
         <setEntry value="org.eclipse.pde.ua.core@default:default"/>
         <setEntry value="org.eclipse.pde.ua.ui@default:default"/>
         <setEntry value="org.eclipse.pde.ui.templates@default:default"/>
@@ -408,7 +374,6 @@
         <setEntry value="org.eclipse.team.ui@default:default"/>
         <setEntry value="org.eclipse.text.quicksearch@default:default"/>
         <setEntry value="org.eclipse.text@default:default"/>
-        <setEntry value="org.eclipse.tools.layout.spy@default:default"/>
         <setEntry value="org.eclipse.ui.browser@default:default"/>
         <setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
         <setEntry value="org.eclipse.ui.cocoa@default:false"/>
@@ -436,11 +401,11 @@
         <setEntry value="org.eclipse.ui@default:default"/>
         <setEntry value="org.eclipse.update.configurator@3:true"/>
         <setEntry value="org.eclipse.urischeme@default:default"/>
+        <setEntry value="org.hamcrest*2.2.0@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.hamcrest.integration@default:default"/>
         <setEntry value="org.hamcrest.library@default:default"/>
         <setEntry value="org.hamcrest.text@default:default"/>
-        <setEntry value="org.hamcrest@default:default"/>
         <setEntry value="org.jsoup@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.mockito@default:default"/>
@@ -468,12 +433,7 @@
         <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"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.eclipse.rcptt.core.builder@default:default"/>
@@ -533,6 +493,7 @@
         <setEntry value="org.eclipse.rcptt.launching.ext@default:default"/>
         <setEntry value="org.eclipse.rcptt.launching.injection@default:default"/>
         <setEntry value="org.eclipse.rcptt.launching.p2utils@default:default"/>
+        <setEntry value="org.eclipse.rcptt.launching.rap.ui@default:default"/>
         <setEntry value="org.eclipse.rcptt.launching.remote.ui@default:default"/>
         <setEntry value="org.eclipse.rcptt.launching.remote@default:default"/>
         <setEntry value="org.eclipse.rcptt.launching.tests@default:false"/>
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
index 04c7c7262..3f269875f 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
+++ b/launching/org.eclipse.rcptt.launching.p2utils/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rcptt.launching.injection;bundle-version="[2.5.5,3.0.0)",
  org.eclipse.pde.core,
  org.eclipse.equinox.p2.repository.tools,
- org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.director;bundle-version="2.6.200",
  org.eclipse.rcptt.util;bundle-version="[2.5.5,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java b/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java
index b344561d5..049c12656 100644
--- a/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java
+++ b/launching/org.eclipse.rcptt.launching.p2utils/src/org/eclipse/rcptt/launching/p2utils/P2Utils.java
@@ -392,7 +392,7 @@ public static void expandFeatures(IProgressMonitor monitor, IMetadataRepository
 				false); // slicingOptions.followOnlyFilteredRequirements());
 
 		IQueryable<IInstallableUnit> slice = slicer
-				.slice(availableUnits.toArray(new IInstallableUnit[availableUnits.size()]), monitor);
+				.slice(availableUnits, monitor);
 		availableUnits.addAll(slice.query(QueryUtil.ALL_UNITS, monitor).toSet());
 	}
 }
diff --git a/launching/tests/pom.xml b/launching/tests/pom.xml
index 4a58adfb7..8ab020abf 100644
--- a/launching/tests/pom.xml
+++ b/launching/tests/pom.xml
@@ -10,17 +10,39 @@
     	Xored Software Inc - initial API and implementation and/or initial documentation
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>rcptt.launching</artifactId>
-    <groupId>org.eclipse.rcptt</groupId>
-    <version>2.5.5-SNAPSHOT</version>
-  </parent>
-  <artifactId>launching.tests</artifactId>
-  <packaging>pom</packaging>
-  <modules>
-    <module>org.eclipse.rcptt.launching.ext.tests</module>
-    <module>org.eclipse.rcptt.launching.tests</module>
-    <module>org.eclipse.rcptt.reporting.html.tests</module>
-  </modules>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>rcptt.launching</artifactId>
+		<groupId>org.eclipse.rcptt</groupId>
+		<version>2.5.5-SNAPSHOT</version>
+	</parent>
+	<artifactId>launching.tests</artifactId>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.eclipse.rcptt.launching.ext.tests</module>
+		<module>org.eclipse.rcptt.launching.tests</module>
+		<module>org.eclipse.rcptt.reporting.html.tests</module>
+	</modules>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<configuration>
+						<dependency-resolution>
+							<extraRequirements>
+								<requirement>
+									<!-- Tycho 2.7.5 surefire JUnit4 support imports javax.annotation package, but fails to add it to dependencies -->
+									<type>eclipse-plugin</type>
+									<id>javax.annotation</id>
+									<versionRange>1.3.5</versionRange>
+								</requirement>
+							</extraRequirements>
+						</dependency-resolution>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
\ No newline at end of file
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
index 3219449af..7243dde6e 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
@@ -93,6 +93,8 @@ public void updateInfo() {
 		IStatus status = PDELocationUtils.validateProductLocation(location);
 		if (!status.isOK()) {
 			setStatus(status);
+		} else {
+			setStatus(Status.warning("RCPTT RAP supoprt will be removed in a following release. See https://github.com/eclipse/org.eclipse.rcptt/issues/56"));
 		}
 
 		if (needUpdate && status.isOK()) {
diff --git a/modules/rap/bundles/runtime/pom.xml b/modules/rap/bundles/runtime/pom.xml
index 9f76f7a9f..ceb2d501c 100644
--- a/modules/rap/bundles/runtime/pom.xml
+++ b/modules/rap/bundles/runtime/pom.xml
@@ -9,49 +9,41 @@
     Contributors:
     	Xored Software Inc - initial API and implementation and/or initial documentation
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>bundles</artifactId>
-    <groupId>org.eclipse.rcptt.module.rap</groupId>
-    <version>2.5.5-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>runtime</artifactId>
-  <packaging>pom</packaging>
-
-
-
-  <profiles>
-    <profile>
-      <id>core</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-        <modules>
-          <module>contexts</module>
-          <module>ecl</module>
-          <module>org.eclipse.rcptt.core.ecl.debug.rap</module>
-          <module>org.eclipse.rcptt.forms.impl.rap</module>
-          <module>org.eclipse.rcptt.runtime.ui.rap</module>
-          <module>org.eclipse.rcptt.util.swt.rap</module>
-          <module>org.eclipse.rcptt.rap.aspects</module>
-          <module>tesla</module>
-          <module>verifications</module>
-          <module>watson</module>
-        </modules>
-    </profile>
-
-    <profile>
-      <id>ide</id>
-      <modules>
-        <module>updates</module>
-      </modules>
-    </profile>
-
-  </profiles>
-
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>bundles</artifactId>
+		<groupId>org.eclipse.rcptt.module.rap</groupId>
+		<version>2.5.5-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>runtime</artifactId>
+	<packaging>pom</packaging>
+	<profiles>
+		<profile>
+			<id>core</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>contexts</module>
+				<module>ecl</module>
+				<module>org.eclipse.rcptt.core.ecl.debug.rap</module>
+				<module>org.eclipse.rcptt.forms.impl.rap</module>
+				<module>org.eclipse.rcptt.runtime.ui.rap</module>
+				<module>org.eclipse.rcptt.util.swt.rap</module>
+				<module>org.eclipse.rcptt.rap.aspects</module>
+				<module>tesla</module>
+				<module>verifications</module>
+				<module>watson</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>ide</id>
+			<modules>
+				<module>updates</module>
+			</modules>
+		</profile>
+	</profiles>
 </project>
diff --git a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
index b50f64808..fa04f314d 100644
--- a/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
+++ b/modules/rap/features/org.eclipse.rcptt.runtime-feature.rap/feature.xml
@@ -38,9 +38,12 @@
       <import plugin="org.eclipse.rcptt.tesla.ecl"/>
       <import feature="org.eclipse.emf.ecore"/>
       <import plugin="org.aspectj.runtime"/>
-      <import feature="org.eclipse.rap.equinox.target.feature" version="3.1.0.qualifier"/>
+      <import feature="org.eclipse.rap.equinox.target.feature" version="3.1.0.qualifier" match="compatible"/>
       <import feature="org.eclipse.rap.feature" version="3.1.0.qualifier"/>
       <import plugin="com.google.guava"/>
+      <import plugin="org.eclipse.core.variables" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filebuffers" version="3.6.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.7.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -528,25 +531,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.core.variables"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties
index 906af046c..1df72351d 100644
--- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties
+++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ecl/EclEditorPluginResources.properties
@@ -20,4 +20,19 @@ ContentAssistTip.tooltip=Content Tip
 ContentAssistTip.image=
 ContentAssistTip.description=Content Tip
 Editor.Undo.label=Undo
-Editor.Redo.label=Redo
\ No newline at end of file
+Editor.Redo.label=Redo
+
+Editor.Cut.label=Cu&t
+Editor.Cut.tooltip=Cut
+Editor.Cut.image=
+Editor.Cut.description=Cut
+
+Editor.Copy.label=&Copy
+Editor.Copy.tooltip=Copy
+Editor.Copy.image=
+Editor.Copy.description=Copy
+
+Editor.Paste.label=&Paste
+Editor.Paste.tooltip=Paste
+Editor.Paste.image=
+Editor.Paste.description=Paste
diff --git a/rcpttTests/pom-base.xml b/rcpttTests/pom-base.xml
index 27cd65e89..9301bd29f 100644
--- a/rcpttTests/pom-base.xml
+++ b/rcpttTests/pom-base.xml
@@ -21,7 +21,7 @@
     <pluginRepository>
       <id>rcptt-releases</id>
       <name>RCPTT Maven repository Releases</name>
-      <url>http://repo.eclipse.org/content/repositories/rcptt-releases/</url>
+      <url>https://repo.eclipse.org/content/repositories/rcptt-releases/</url>
     </pluginRepository>
     <pluginRepository>
       <id>rcptt-snapshots</id>
diff --git a/releng/ide/pom.xml b/releng/ide/pom.xml
index 6b686f0e0..3fe618de5 100644
--- a/releng/ide/pom.xml
+++ b/releng/ide/pom.xml
@@ -73,12 +73,12 @@
     <repository>
       <id>2023-06-updates</id>
       <layout>p2</layout>
-      <url>https://download.eclipse.org/eclipse/updates/4.28/</url>
+      <url>https://download.eclipse.org/eclipse/updates/4.31/</url>
     </repository>
     <repository>
       <id>2023-06</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/2023-06</url>
+      <url>http://download.eclipse.org/releases/2024-03</url>
     </repository>
     <repository>
       <id>orbit</id>
diff --git a/releng/rap/pom.xml b/releng/rap/pom.xml
index 6c4cd7038..f798a1396 100644
--- a/releng/rap/pom.xml
+++ b/releng/rap/pom.xml
@@ -51,7 +51,7 @@
     <buildUrl>file:/${user.dir}</buildUrl>
     <rapRcpttRepository>${buildUrl}/</rapRcpttRepository>
     <rcpttRepositoryFull>${buildUrl}/repository/full/target/repository/</rcpttRepositoryFull>
-    <rapRepository>http://download.eclipse.org/rt/rap/3.1</rapRepository>
+    <rapRepository>http://download.eclipse.org/rt/rap/3.8</rapRepository>
     <rcpttExternalDepencenciesRepository>${buildUrl}/repository/dependencies/target/repository</rcpttExternalDepencenciesRepository>
   </properties>
   
diff --git a/releng/runtime/pom.xml b/releng/runtime/pom.xml
index 85cb8f6f4..d077b71e8 100644
--- a/releng/runtime/pom.xml
+++ b/releng/runtime/pom.xml
@@ -49,11 +49,6 @@
 				<module>../../repository/e4x</module>
 			</modules>
 			<repositories>
-				<repository>
-					<id>neon</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/neon</url>
-				</repository>
 				<repository>
 					<id>ajdt48</id>
 					<layout>p2</layout>
diff --git a/releng/target-platforms/2024-03/ide.target b/releng/target-platforms/2024-03/ide.target
new file mode 100644
index 000000000..fcc9334d3
--- /dev/null
+++ b/releng/target-platforms/2024-03/ide.target
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target includeMode="feature" name="2024-03" sequenceNumber="95">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.apache.commons.lang3" version="0.0.0"/>
+<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
+<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
+<unit id="com.sun.xml.bind" version="0.0.0"/>
+<unit id="javax.activation" version="0.0.0"/>
+<unit id="javax.xml" version="0.0.0"/>
+<unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
+<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/nebula/archive/releases/3.1.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/releases/2024-03/202403131000/"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
+<unit id="org.jsoup" version="0.0.0"/>
+<unit id="slf4j.api" version="0.0.0"/>
+<unit id="org.apache.commons.commons-fileupload" version="0.0.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.aspectj.runtime" version="0.0.0"/>
+<unit id="org.aspectj.weaver" version="0.0.0"/>
+<unit id="org.eclipse.equinox.weaving.aspectj" version="0.0.0"/>
+<unit id="org.eclipse.equinox.weaving.hook" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/ajdt/423/dev/update"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/swtchart/releases/0.14.0/repository"/>
+<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
+</location>
+</locations>
+</target>
diff --git a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
index 0a770bc8b..586043b17 100644
--- a/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
+++ b/runner/org.eclipse.rcptt.runner/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.rcptt.core,
  org.eclipse.rcptt.reporting.util;bundle-version="[2.5.5,3.0.0)",
  org.eclipse.rcptt.launching.rap;bundle-version="[2.5.5,3.0.0)",
  org.eclipse.swt,
- org.slf4j.api;bundle-version="1.7.30",
+ slf4j.api;bundle-version="2.0.12",
  jakarta.servlet-api;bundle-version="4.0.0",
  bcpg;bundle-version="1.73.0",
  bcprov;bundle-version="1.73.0"
diff --git a/runner/product/rcptt.runner.product b/runner/product/rcptt.runner.product
index 7e7db833f..2ed6538b8 100644
--- a/runner/product/rcptt.runner.product
+++ b/runner/product/rcptt.runner.product
@@ -40,6 +40,9 @@
       <plugin id="com.ibm.icu"/>
       <plugin id="com.jcraft.jsch"/>
       <plugin id="com.sun.el"/>
+      <plugin id="com.sun.el.javax.el"/>
+      <plugin id="jakarta.annotation-api"/>
+      <plugin id="jakarta.inject.jakarta.inject-api"/>
       <plugin id="jakarta.servlet-api"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
@@ -49,7 +52,9 @@
       <plugin id="javax.xml"/>
       <plugin id="org.antlr.runtime"/>
       <plugin id="org.apache.ant"/>
+      <plugin id="org.apache.aries.spifly.dynamic.bundle"/>
       <plugin id="org.apache.commons.codec"/>
+      <plugin id="org.apache.commons.commons-fileupload"/>
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.lang3"/>
       <plugin id="org.apache.commons.logging"/>
@@ -57,6 +62,9 @@
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
       <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.apache.httpcomponents.client5.httpclient5"/>
+      <plugin id="org.apache.httpcomponents.core5.httpcore5"/>
+      <plugin id="org.apache.httpcomponents.core5.httpcore5-h2"/>
       <plugin id="org.apache.httpcomponents.httpclient"/>
       <plugin id="org.apache.httpcomponents.httpcore"/>
       <plugin id="org.apache.jasper.glassfish"/>
@@ -116,11 +124,9 @@
       <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.frameworkadmin"/>
       <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-      <plugin id="org.eclipse.equinox.http.jetty"/>
       <plugin id="org.eclipse.equinox.http.registry"/>
+      <plugin id="org.eclipse.equinox.http.service.api"/>
       <plugin id="org.eclipse.equinox.http.servlet"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
       <plugin id="org.eclipse.equinox.launcher"/>
       <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64" fragment="true"/>
       <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
@@ -162,21 +168,13 @@
       <plugin id="org.eclipse.jdt.apt.pluggable.core"/>
       <plugin id="org.eclipse.jdt.core"/>
       <plugin id="org.eclipse.jdt.core.compiler.batch"/>
-      <plugin id="org.eclipse.jdt.core.manipulation"/>
       <plugin id="org.eclipse.jdt.debug"/>
-      <plugin id="org.eclipse.jdt.junit"/>
       <plugin id="org.eclipse.jdt.junit.core"/>
       <plugin id="org.eclipse.jdt.junit.runtime"/>
       <plugin id="org.eclipse.jdt.junit4.runtime"/>
       <plugin id="org.eclipse.jdt.launching"/>
       <plugin id="org.eclipse.jdt.launching.macosx"/>
-      <plugin id="org.eclipse.jdt.launching.ui.macosx"/>
-      <plugin id="org.eclipse.jetty.http"/>
-      <plugin id="org.eclipse.jetty.io"/>
-      <plugin id="org.eclipse.jetty.security"/>
-      <plugin id="org.eclipse.jetty.server"/>
-      <plugin id="org.eclipse.jetty.servlet"/>
-      <plugin id="org.eclipse.jetty.util"/>
+      <plugin id="org.eclipse.jetty.logging"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jsch.core"/>
       <plugin id="org.eclipse.osgi"/>
@@ -189,9 +187,7 @@
       <plugin id="org.eclipse.pde.build"/>
       <plugin id="org.eclipse.pde.core"/>
       <plugin id="org.eclipse.pde.ds.core"/>
-      <plugin id="org.eclipse.pde.junit.runtime"/>
       <plugin id="org.eclipse.pde.launching"/>
-      <plugin id="org.eclipse.pde.runtime"/>
       <plugin id="org.eclipse.pde.ua.core"/>
       <plugin id="org.eclipse.platform"/>
       <plugin id="org.eclipse.rcp"/>
@@ -205,8 +201,6 @@
       <plugin id="org.eclipse.rcptt.core.launching"/>
       <plugin id="org.eclipse.rcptt.core.scenario"/>
       <plugin id="org.eclipse.rcptt.core.search"/>
-      <plugin id="org.eclipse.rcptt.core.swt"/>
-      <plugin id="org.eclipse.rcptt.core.swt.win64" fragment="true"/>
       <plugin id="org.eclipse.rcptt.ctx.capability"/>
       <plugin id="org.eclipse.rcptt.ctx.debug"/>
       <plugin id="org.eclipse.rcptt.ctx.extensions"/>
@@ -286,15 +280,20 @@
       <plugin id="org.eclipse.team.core"/>
       <plugin id="org.eclipse.text"/>
       <plugin id="org.eclipse.update.configurator"/>
+      <plugin id="org.hamcrest"/>
       <plugin id="org.hamcrest.core"/>
       <plugin id="org.junit"/>
       <plugin id="org.objectweb.asm"/>
+      <plugin id="org.objectweb.asm.commons"/>
       <plugin id="org.objectweb.asm.tree"/>
+      <plugin id="org.objectweb.asm.tree.analysis"/>
+      <plugin id="org.objectweb.asm.util"/>
       <plugin id="org.osgi.service.cm"/>
       <plugin id="org.osgi.service.component"/>
       <plugin id="org.osgi.service.component.annotations"/>
       <plugin id="org.osgi.service.device"/>
       <plugin id="org.osgi.service.event"/>
+      <plugin id="org.osgi.service.http.whiteboard"/>
       <plugin id="org.osgi.service.prefs"/>
       <plugin id="org.osgi.service.repository"/>
       <plugin id="org.osgi.util.function"/>
@@ -307,6 +306,7 @@
       <plugin id="org.w3c.dom.events"/>
       <plugin id="org.w3c.dom.smil"/>
       <plugin id="org.w3c.dom.svg"/>
+      <plugin id="slf4j.api"/>
    </plugins>
 
    <configurations>
diff --git a/runtime/tests/pom.xml b/runtime/tests/pom.xml
index bbd23150c..f867140f6 100644
--- a/runtime/tests/pom.xml
+++ b/runtime/tests/pom.xml
@@ -68,6 +68,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>aarch64</id>
+			<activation>
+				<os>
+					<arch>aarch64</arch>
+				</os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>tycho-surefire-plugin</artifactId>
+						<groupId>org.eclipse.tycho</groupId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>runtime4x</id>
 			<properties>