diff --git a/org.eclipse.draw2d-feature/feature.xml b/org.eclipse.draw2d-feature/feature.xml
index a42725dcb..b02b08cb7 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.21.0.qualifier"
+      version="3.22.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 e73ee5b64..4ad73f2dc 100644
--- a/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF
+++ b/org.eclipse.draw2d.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.draw2d.doc.isv; singleton:=true
-Bundle-Version: 3.13.200.qualifier
+Bundle-Version: 3.13.300.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
diff --git a/org.eclipse.draw2d.doc.isv/pom.xml b/org.eclipse.draw2d.doc.isv/pom.xml
index 7ecda2dc7..c15a3dd50 100644
--- a/org.eclipse.draw2d.doc.isv/pom.xml
+++ b/org.eclipse.draw2d.doc.isv/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.eclipse.draw2d.plugins</groupId>
 	<artifactId>org.eclipse.draw2d.doc.isv</artifactId>
-	<version>3.13.200-SNAPSHOT</version>
+	<version>3.13.300-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic Draw2d Developer Documentation</name>
 	<build>
diff --git a/org.eclipse.draw2d.examples/META-INF/MANIFEST.MF b/org.eclipse.draw2d.examples/META-INF/MANIFEST.MF
index 18db8c964..d568a09cb 100644
--- a/org.eclipse.draw2d.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.draw2d.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.draw2d.examples
-Bundle-Version: 3.16.0.qualifier
+Bundle-Version: 3.16.100.qualifier
 Export-Package: gef.bugs;x-friends:="org.eclipse.draw2d.tests"
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.draw2d;bundle-version="[3.16.0,4.0.0)"
diff --git a/org.eclipse.draw2d.sdk-feature/feature.xml b/org.eclipse.draw2d.sdk-feature/feature.xml
index 6afb4b025..0c8ffeda2 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.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.draw2d"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.draw2d/META-INF/MANIFEST.MF b/org.eclipse.draw2d/META-INF/MANIFEST.MF
index d0ef1a23a..dc8ccb3a4 100644
--- a/org.eclipse.draw2d/META-INF/MANIFEST.MF
+++ b/org.eclipse.draw2d/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.draw2d;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.17.100.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.draw2d,
diff --git a/org.eclipse.gef-feature/feature.xml b/org.eclipse.gef-feature/feature.xml
index 671180e0c..5dd2de7f1 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.21.0.qualifier"
+      version="3.22.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.21.0.target b/org.eclipse.gef.baseline/gef-classic-3.21.0.target
new file mode 100644
index 000000000..fa701a16f
--- /dev/null
+++ b/org.eclipse.gef.baseline/gef-classic-3.21.0.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="GEF Classic 3.21.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="http://download.eclipse.org/staging/2024-09"/>
+			<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/META-INF/MANIFEST.MF b/org.eclipse.gef.doc.isv/META-INF/MANIFEST.MF
index ee3f78470..c0b7f6633 100644
--- a/org.eclipse.gef.doc.isv/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef.doc.isv; singleton:=true
-Bundle-Version: 3.13.600.qualifier
+Bundle-Version: 3.13.700.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
diff --git a/org.eclipse.gef.doc.isv/pom.xml b/org.eclipse.gef.doc.isv/pom.xml
index 7baf7e42a..3e30198d1 100644
--- a/org.eclipse.gef.doc.isv/pom.xml
+++ b/org.eclipse.gef.doc.isv/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.eclipse.gef.plugins</groupId>
 	<artifactId>org.eclipse.gef.doc.isv</artifactId>
-	<version>3.13.600-SNAPSHOT</version>
+	<version>3.13.700-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic GEF Developer Documentation</name>
 	<build>
diff --git a/org.eclipse.gef.examples-feature/feature.xml b/org.eclipse.gef.examples-feature/feature.xml
index 9b3375160..396a15410 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.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.gef.examples.logic"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gef.examples.flow/META-INF/MANIFEST.MF b/org.eclipse.gef.examples.flow/META-INF/MANIFEST.MF
index d472e82b8..d05a1131b 100644
--- a/org.eclipse.gef.examples.flow/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef.examples.flow/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.gef.examples.flow; singleton:=true
-Bundle-Version: 3.16.100.qualifier
+Bundle-Version: 3.16.200.qualifier
 Bundle-Activator: org.eclipse.gef.examples.flow.FlowPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.gef.examples.logic/META-INF/MANIFEST.MF b/org.eclipse.gef.examples.logic/META-INF/MANIFEST.MF
index cd7f46066..498b3703b 100644
--- a/org.eclipse.gef.examples.logic/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef.examples.logic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef.examples.logic; singleton:=true
-Bundle-Version: 3.14.500.qualifier
+Bundle-Version: 3.14.600.qualifier
 Bundle-Activator: org.eclipse.gef.examples.logicdesigner.LogicPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.gef.examples.shapes/META-INF/MANIFEST.MF b/org.eclipse.gef.examples.shapes/META-INF/MANIFEST.MF
index cd6839968..62a827424 100644
--- a/org.eclipse.gef.examples.shapes/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef.examples.shapes/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef.examples.shapes; singleton:=true
-Bundle-Version: 3.15.100.qualifier
+Bundle-Version: 3.15.200.qualifier
 Bundle-Activator: org.eclipse.gef.examples.shapes.ShapesPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.gef.examples.text/META-INF/MANIFEST.MF b/org.eclipse.gef.examples.text/META-INF/MANIFEST.MF
index e329b7cc5..080a690ab 100644
--- a/org.eclipse.gef.examples.text/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef.examples.text/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef.examples.text; singleton:=true
-Bundle-Version: 3.15.200.qualifier
+Bundle-Version: 3.15.300.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gef.examples.text,
diff --git a/org.eclipse.gef.sdk-feature/feature.xml b/org.eclipse.gef.sdk-feature/feature.xml
index ee3a231fa..fca62b5d4 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.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.gef"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.gef/META-INF/MANIFEST.MF b/org.eclipse.gef/META-INF/MANIFEST.MF
index a2bf06268..784c7a56a 100644
--- a/org.eclipse.gef/META-INF/MANIFEST.MF
+++ b/org.eclipse.gef/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.gef; singleton:=true
-Bundle-Version: 3.19.0.qualifier
+Bundle-Version: 3.19.100.qualifier
 Bundle-Activator: org.eclipse.gef.internal.InternalGEFPlugin
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.zest-feature/feature.xml b/org.eclipse.zest-feature/feature.xml
index eddac8e06..c6d9378e8 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.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.zest.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.zest.core/META-INF/MANIFEST.MF b/org.eclipse.zest.core/META-INF/MANIFEST.MF
index ea4ed00cc..82160245d 100644
--- a/org.eclipse.zest.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.zest.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.zest.core;singleton:=true
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
-Bundle-Version: 1.13.0.qualifier
+Bundle-Version: 1.13.100.qualifier
 Require-Bundle: org.eclipse.zest.layouts,
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.draw2d;visibility:=reexport
diff --git a/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF b/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
index e6ed6d022..acbd16013 100644
--- a/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
+++ b/org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.zest.doc.isv; singleton:=true
-Bundle-Version: 1.8.800.qualifier
+Bundle-Version: 1.8.900.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: true
diff --git a/org.eclipse.zest.doc.isv/pom.xml b/org.eclipse.zest.doc.isv/pom.xml
index 4db89f0ce..f30ee6b54 100644
--- a/org.eclipse.zest.doc.isv/pom.xml
+++ b/org.eclipse.zest.doc.isv/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.eclipse.zest.plugins</groupId>
 	<artifactId>org.eclipse.zest.doc.isv</artifactId>
-	<version>1.8.800-SNAPSHOT</version>
+	<version>1.8.900-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] GEF Classic Zest Developer Documentation</name>
 	<build>
diff --git a/org.eclipse.zest.examples/META-INF/MANIFEST.MF b/org.eclipse.zest.examples/META-INF/MANIFEST.MF
index 536893700..f21616d7f 100644
--- a/org.eclipse.zest.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.zest.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.zest.examples
-Bundle-Version: 3.18.0.qualifier
+Bundle-Version: 3.18.100.qualifier
 Export-Package: org.eclipse.zest.examples.jface;x-friends:="org.eclipse.zest.tests",
  org.eclipse.zest.examples.swt;x-friends:="org.eclipse.zest.tests",
  org.eclipse.zest.examples.uml;x-friends:="org.eclipse.zest.tests"
diff --git a/org.eclipse.zest.layouts/META-INF/MANIFEST.MF b/org.eclipse.zest.layouts/META-INF/MANIFEST.MF
index 38554437a..4ad69f154 100644
--- a/org.eclipse.zest.layouts/META-INF/MANIFEST.MF
+++ b/org.eclipse.zest.layouts/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.zest.layouts;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.zest.layouts,
diff --git a/org.eclipse.zest.sdk-feature/feature.xml b/org.eclipse.zest.sdk-feature/feature.xml
index 358b7e5bc..52df5b45b 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.21.0.qualifier"
+      version="3.22.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.zest.core"
       license-feature="org.eclipse.license"
diff --git a/pom.xml b/pom.xml
index 97657626f..8d7bc65cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<cbi-plugins.version>1.4.3</cbi-plugins.version>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/gef-classic.git</tycho.scmUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<comparator.repo>https://download.eclipse.org/tools/gef/classic/release/3.20.0</comparator.repo>
+		<comparator.repo>https://download.eclipse.org/tools/gef/classic/release/3.21.0</comparator.repo>
 		<surefire.timeout>300</surefire.timeout>
 		<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
 		<jruby.version>9.4.5.0</jruby.version>
@@ -210,6 +210,10 @@
 							<goal>compare-version-with-baselines</goal>
 						</goals>
 						<configuration>
+							<ignoredPatterns>
+								<pattern>META-INF/ECLIPSE_.RSA</pattern>
+								<pattern>META-INF/ECLIPSE_.SF</pattern>
+							</ignoredPatterns>
 							<baselines>
 								<baseline>${comparator.repo}</baseline> <!-- Previous release) -->
 							</baselines>
diff --git a/target-platform/GEF_classic.target b/target-platform/GEF_classic.target
index cb2791f3d..048f72228 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="http://download.eclipse.org/staging/2024-09"/>
+		<repository location="http://download.eclipse.org/staging/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>