diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc370023f..bb3fa13de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# GEF Classic 3.23.0
+
+## Draw2D
+
+## GEF
+
+## Zest
+
 # GEF Classic 3.22.0
 
 ## Draw2D
diff --git a/org.eclipse.draw2d-feature/feature.xml b/org.eclipse.draw2d-feature/feature.xml
index b02b08cb7..22762aca9 100644
--- a/org.eclipse.draw2d-feature/feature.xml
+++ b/org.eclipse.draw2d-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.draw2d"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF b/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF
index 4ad73f2dc..f03b3c577 100644
--- a/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF
+++ b/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.draw2d.doc.isv; singleton:=true
 Bundle-Version: 3.13.300.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
  org.eclipse.platform.doc.isv;bundle-version="[3.2.0,5.0.0)";resolution:=optional
diff --git a/org.eclipse.draw2d.doc.isv/pom.xml b/org.eclipse.draw2d.doc.isv/pom.xml
index c15a3dd50..43859dc41 100644
--- a/org.eclipse.draw2d.doc.isv/pom.xml
+++ b/org.eclipse.draw2d.doc.isv/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.draw2d.plugins</groupId>
 	<artifactId>org.eclipse.draw2d.doc.isv</artifactId>
-	<version>3.13.300-SNAPSHOT</version>
+	<version>3.13.400-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic Draw2d Developer Documentation</name>
 	<build>
@@ -51,7 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
+				<version>${maven-antrun-plugin.version}</version>
 				<executions>
 					<execution>
 						<?m2e ignore?>
diff --git a/org.eclipse.draw2d.sdk-feature/feature.xml b/org.eclipse.draw2d.sdk-feature/feature.xml
index 0c8ffeda2..5a29b1d3f 100644
--- a/org.eclipse.draw2d.sdk-feature/feature.xml
+++ b/org.eclipse.draw2d.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.draw2d.sdk"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.draw2d"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.draw2d.tests/pom.xml b/org.eclipse.draw2d.tests/pom.xml
index 12320aecf..d2cb803ee 100644
--- a/org.eclipse.draw2d.tests/pom.xml
+++ b/org.eclipse.draw2d.tests/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.draw2d.plugins</groupId>
 	<artifactId>org.eclipse.draw2d.tests</artifactId>
-	<version>3.14.0-SNAPSHOT</version>
+	<version>3.14.100-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
 		<profile>
diff --git a/org.eclipse.gef-feature/feature.xml b/org.eclipse.gef-feature/feature.xml
index 5dd2de7f1..3ef420aed 100644
--- a/org.eclipse.gef-feature/feature.xml
+++ b/org.eclipse.gef-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.gef"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gef.baseline/gef-classic-3.22.0.target b/org.eclipse.gef.baseline/gef-classic-3.22.0.target
new file mode 100644
index 000000000..450baffd8
--- /dev/null
+++ b/org.eclipse.gef.baseline/gef-classic-3.22.0.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="GEF Classic 3.22.0 Base Line Target" sequenceNumber="1">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+			<repository location="http://download.eclipse.org/cbi/updates/license"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/2024-12"/>
+			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
+		</location>
+	</locations>
+</target>
diff --git a/org.eclipse.gef.doc.isv/pom.xml b/org.eclipse.gef.doc.isv/pom.xml
index 3e30198d1..25b4d3bba 100644
--- a/org.eclipse.gef.doc.isv/pom.xml
+++ b/org.eclipse.gef.doc.isv/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.doc.isv</artifactId>
-	<version>3.13.700-SNAPSHOT</version>
+	<version>3.13.800-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic GEF Developer Documentation</name>
 	<build>
@@ -51,7 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
+				<version>${maven-antrun-plugin.version}</version>
 				<executions>
 					<execution>
 						<?m2e ignore?>
diff --git a/org.eclipse.gef.examples-feature/feature.xml b/org.eclipse.gef.examples-feature/feature.xml
index 396a15410..84b03c3d5 100644
--- a/org.eclipse.gef.examples-feature/feature.xml
+++ b/org.eclipse.gef.examples-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.gef.examples"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.gef.examples.logic"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gef.sdk-feature/feature.xml b/org.eclipse.gef.sdk-feature/feature.xml
index fca62b5d4..515b77194 100644
--- a/org.eclipse.gef.sdk-feature/feature.xml
+++ b/org.eclipse.gef.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.gef.sdk"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.gef"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gef.tests/pom.xml b/org.eclipse.gef.tests/pom.xml
index 012e5d3bf..92f096645 100644
--- a/org.eclipse.gef.tests/pom.xml
+++ b/org.eclipse.gef.tests/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.tests</artifactId>
-	<version>3.14.0-SNAPSHOT</version>
+	<version>3.14.100-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
 		<profile>
diff --git a/org.eclipse.gef/.settings/.api_filters b/org.eclipse.gef/.settings/.api_filters
index f80265054..b44bd6fa2 100644
--- a/org.eclipse.gef/.settings/.api_filters
+++ b/org.eclipse.gef/.settings/.api_filters
@@ -1,29 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.gef" version="2">
-    <resource path="src/org/eclipse/gef/handles/NonResizableHandleKit.java" type="org.eclipse.gef.handles.NonResizableHandleKit">
-        <filter id="354463860">
-            <message_arguments>
-                <message_argument value="org.eclipse.gef.handles.NonResizableHandleKit"/>
-                <message_argument value="NonResizableHandleKit()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gef/handles/ResizableHandleKit.java" type="org.eclipse.gef.handles.ResizableHandleKit">
-        <filter id="354463860">
-            <message_arguments>
-                <message_argument value="org.eclipse.gef.handles.ResizableHandleKit"/>
-                <message_argument value="ResizableHandleKit()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gef/rulers/RulerProvider.java" type="org.eclipse.gef.rulers.RulerProvider">
-        <filter id="336658481">
-            <message_arguments>
-                <message_argument value="org.eclipse.gef.rulers.RulerProvider"/>
-                <message_argument value="UNIT_CUSTOM"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/gef/ui/actions/AlignmentRetargetAction.java" type="org.eclipse.gef.ui.actions.AlignmentRetargetAction">
         <filter id="571473929">
             <message_arguments>
@@ -96,20 +72,6 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/gef/ui/actions/SelectionAction.java" type="org.eclipse.gef.ui.actions.SelectionAction">
-        <filter id="354463860">
-            <message_arguments>
-                <message_argument value="org.eclipse.gef.ui.actions.SelectionAction"/>
-                <message_argument value="SelectionAction(IWorkbenchPart)"/>
-            </message_arguments>
-        </filter>
-        <filter id="354463860">
-            <message_arguments>
-                <message_argument value="org.eclipse.gef.ui.actions.SelectionAction"/>
-                <message_argument value="SelectionAction(IWorkbenchPart, int)"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/gef/ui/actions/UndoRetargetAction.java" type="org.eclipse.gef.ui.actions.UndoRetargetAction">
         <filter id="571473929">
             <message_arguments>
diff --git a/org.eclipse.zest-feature/feature.xml b/org.eclipse.zest-feature/feature.xml
index c6d9378e8..fb95c3fdd 100644
--- a/org.eclipse.zest-feature/feature.xml
+++ b/org.eclipse.zest-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.zest"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.zest.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF b/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
index acbd16013..90c9caee5 100644
--- a/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
+++ b/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.zest.doc.isv; singleton:=true
 Bundle-Version: 1.8.900.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
  org.eclipse.jface;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
  org.eclipse.draw2d;bundle-version="[3.16.0,4.0.0)";resolution:=optional,
diff --git a/org.eclipse.zest.doc.isv/pom.xml b/org.eclipse.zest.doc.isv/pom.xml
index f30ee6b54..8bb703b42 100644
--- a/org.eclipse.zest.doc.isv/pom.xml
+++ b/org.eclipse.zest.doc.isv/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.zest.plugins</groupId>
 	<artifactId>org.eclipse.zest.doc.isv</artifactId>
-	<version>1.8.900-SNAPSHOT</version>
+	<version>1.8.1000-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic Zest Developer Documentation</name>
 	<build>
@@ -51,7 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
+				<version>${maven-antrun-plugin.version}</version>
 				<executions>
 					<execution>
 						<?m2e ignore?>
diff --git a/org.eclipse.zest.sdk-feature/feature.xml b/org.eclipse.zest.sdk-feature/feature.xml
index 52df5b45b..00eafaf2b 100644
--- a/org.eclipse.zest.sdk-feature/feature.xml
+++ b/org.eclipse.zest.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.zest.sdk"
       label="%featureName"
-      version="3.22.0.qualifier"
+      version="3.23.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.zest.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.zest.tests/pom.xml b/org.eclipse.zest.tests/pom.xml
index 03871b09c..e7fb07bf1 100644
--- a/org.eclipse.zest.tests/pom.xml
+++ b/org.eclipse.zest.tests/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.gef_root</groupId>
 		<artifactId>org.eclipse.gef.releng</artifactId>
-		<version>3.20.0-SNAPSHOT</version>
+		<version>3.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.zest.plugins</groupId>
 	<artifactId>org.eclipse.zest.tests</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.9.100-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
 		<profile>
diff --git a/pom.xml b/pom.xml
index 99e61f042..a6a0b3e82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,20 +5,20 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.gef_root</groupId>
 	<artifactId>org.eclipse.gef.releng</artifactId>
-	<version>3.20.0-SNAPSHOT</version>
+	<version>3.23.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- this is the parent POM from which all modules inherit common settings -->
 	<properties>
-		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>		
-		<cbi-plugins.version>1.5.0</cbi-plugins.version>
+		<cbi-plugins.version>1.5.2</cbi-plugins.version>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse-gef/gef-classic.git</tycho.scmUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<comparator.repo>https://download.eclipse.org/tools/gef/classic/release/3.21.0</comparator.repo>
+		<comparator.repo>https://download.eclipse.org/tools/gef/classic/release/3.22.0</comparator.repo>
 		<surefire.timeout>300</surefire.timeout>
-		<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
+		<asciidoctor-maven-plugin.version>3.1.1</asciidoctor-maven-plugin.version>
 		<jruby.version>9.4.5.0</jruby.version>
 	</properties>
 
diff --git a/target-platform/GEF_classic.target b/target-platform/GEF_classic.target
index 9302f0f92..199b18d99 100644
--- a/target-platform/GEF_classic.target
+++ b/target-platform/GEF_classic.target
@@ -7,7 +7,7 @@
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/staging/2024-12"/>
+		<repository location="https://download.eclipse.org/staging/2025-03"/>
 		<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
 	</location>