diff --git a/pom.xml b/pom.xml
index 5ca1ca5913..b5926f11ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 
 	<groupId>org.eclipse.tycho</groupId>
 	<artifactId>tycho</artifactId>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.4.0</version>
 	<packaging>pom</packaging>
 
 	<name>Tycho</name>
diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml
index 3fce2d63c8..143be06bc4 100644
--- a/sisu-equinox/pom.xml
+++ b/sisu-equinox/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>sisu-equinox</artifactId>
diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml
index fdfec9aad8..018c4c6350 100644
--- a/sisu-equinox/sisu-equinox-api/pom.xml
+++ b/sisu-equinox/sisu-equinox-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>sisu-equinox-api</artifactId>
 
diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml
index 0db256dc2a..0f3035a4bf 100644
--- a/sisu-equinox/sisu-equinox-embedder/pom.xml
+++ b/sisu-equinox/sisu-equinox-embedder/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>sisu-equinox-embedder</artifactId>
 
diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml
index ca4eb01b29..38e0defbff 100644
--- a/sisu-equinox/sisu-equinox-launching/pom.xml
+++ b/sisu-equinox/sisu-equinox-launching/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>sisu-equinox-launching</artifactId>
 
diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
index 5478a2f506..583f114edf 100644
--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>target-platform-configuration</artifactId>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index 04ff53608f..19bcf17ae4 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
   <artifactId>tycho-artifactcomparator</artifactId>
   <properties>
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
index 700cc760d9..fcd04d8fdc 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests
 Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Fragment-Host: org.eclipse.tycho.core.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.8.2",
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
index e537552f1d..7d563491a0 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
index 247e0d2433..b699a59943 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tycho.core.shared
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Name: Tycho Core Maven/OSGi Shared Classes
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.tycho.artifacts,
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
index 1fa2df52ab..13a94b5a24 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.core.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
index bb0a9cd813..f3d54d5744 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
index 75dd182fa2..69e57bc1e5 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
index 540cb0e369..b4c5a61bfc 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Noop Equinox password provider
 Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
index aec54f8662..b649e55bbf 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.noopsecurity</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
index 9e53d75682..ef5d32858b 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Maven/p2 Repository Integration Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository.tests;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.maven.repository
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
index 6efa238f91..c14eb55bba 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
index 98c08dd0f0..f6a6a1bbf1 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Maven/p2 Repository Integration
 Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
index e38f99cadb..155d339854 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
index 206e3bc78f..90f5cf9f94 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Bundle Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.resolver.impl
 Require-Bundle: org.junit,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
index 0d766f5dd3..c2bc0be720 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
index a9d2356089..306c73dcc8 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Bundle
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.security;bundle-version="1.0.100",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
index c70d4012e2..4e0c474606 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
index 085fa0b33f..7e9f252f0e 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.shared.tests;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.resolver.shared
 Bundle-Vendor: Eclipse Tycho
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
index 45647704ff..dbf90c7452 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.shared.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
index 0cd766f89a..0cd4da91a9 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Export-Package:
  org.eclipse.tycho.p2.resolver.facade,
  org.eclipse.tycho.p2.target.facade,
  org.eclipse.tycho.repository.registry.facade
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes
 Bundle-ManifestVersion: 2
 Bundle-Description: Tycho integrates Maven with Eclipse and OSGi
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
index 8759719b7a..92c60134e1 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
index bd0abc90f2..1157d5a960 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Name: Tycho p2 Tools Bundle
 Bundle-ManifestVersion: 2
 Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
index 1b15d4f495..34c92f8f19 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
index ede46ad9a2..569036954c 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-Name: Tycho p2 Tools Maven/OSGi Shared Classes
 Bundle-ManifestVersion: 2
 Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
index c639f89017..e05f99cd9a 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
index 4c0ca9146c..cd8eef3c02 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Tools Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.tycho.p2.tools.impl
 Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
index 6e5138fe80..43875de8ff 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
index 8f924d60b2..f9e1652422 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Test Utilities
 Bundle-SymbolicName: org.eclipse.tycho.test.utils
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
  org.hamcrest.core,
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
index 6cf9bee7f5..d9dec05a18 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.test.utils</artifactId>
diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml
index e9adea21c1..294494445b 100644
--- a/tycho-bundles/pom.xml
+++ b/tycho-bundles/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-bundles</artifactId>
diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml
index 659c2096d3..155e7814a9 100644
--- a/tycho-bundles/tycho-bundles-external/pom.xml
+++ b/tycho-bundles/tycho-bundles-external/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-bundles-external</artifactId>
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 438d3d5a25..3882bde8b8 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director" version="2.4.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director" version="2.4.0" useFeatures="false" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml
index ff9c62fcb0..86699680b1 100644
--- a/tycho-bundles/tycho-bundles-target/pom.xml
+++ b/tycho-bundles/tycho-bundles-target/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 098af6437f..e29942000d 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-compiler-jdt</artifactId>
 
diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
index a954448237..6a0912860d 100644
--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 04f630c3f4..df292655a3 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-core</artifactId>
 
diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml
index 601661a5ee..d6b750c01b 100644
--- a/tycho-embedder-api/pom.xml
+++ b/tycho-embedder-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-embedder-api</artifactId>
 
diff --git a/tycho-extras/pack200/pom.xml b/tycho-extras/pack200/pom.xml
index 19fc6640fa..5fbc2ffa41 100644
--- a/tycho-extras/pack200/pom.xml
+++ b/tycho-extras/pack200/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-extras</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-pack200</artifactId>
diff --git a/tycho-extras/pack200/tycho-pack200-impl/pom.xml b/tycho-extras/pack200/tycho-pack200-impl/pom.xml
index 84b004bf79..ddd2130499 100644
--- a/tycho-extras/pack200/tycho-pack200-impl/pom.xml
+++ b/tycho-extras/pack200/tycho-pack200-impl/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tycho-pack200</artifactId>
     <groupId>org.eclipse.tycho.extras</groupId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
   <artifactId>tycho-pack200-impl</artifactId>
 
diff --git a/tycho-extras/pack200/tycho-pack200-its/pom.xml b/tycho-extras/pack200/tycho-pack200-its/pom.xml
index 5e4f6d1bb2..66b31c749b 100644
--- a/tycho-extras/pack200/tycho-pack200-its/pom.xml
+++ b/tycho-extras/pack200/tycho-pack200-its/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pack200</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-pack200-its</artifactId>
diff --git a/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml
index 77b0249b29..204ffda897 100644
--- a/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml
+++ b/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pack200</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-pack200a-plugin</artifactId>
diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
index cd166c4f4e..5e507fcd2b 100644
--- a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
+++ b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>tycho-pack200</artifactId>
     <groupId>org.eclipse.tycho.extras</groupId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-pack200b-plugin</artifactId>
diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
index d56666687e..a7835e0ed3 100644
--- a/tycho-extras/pom.xml
+++ b/tycho-extras/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<groupId>org.eclipse.tycho.extras</groupId>
diff --git a/tycho-extras/target-platform-validation-plugin/pom.xml b/tycho-extras/target-platform-validation-plugin/pom.xml
index 4bb03e94e9..7fbdcf4b1b 100644
--- a/tycho-extras/target-platform-validation-plugin/pom.xml
+++ b/tycho-extras/target-platform-validation-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>target-platform-validation-plugin</artifactId>
diff --git a/tycho-extras/tycho-buildtimestamp-jgit/pom.xml b/tycho-extras/tycho-buildtimestamp-jgit/pom.xml
index d8f8dbb419..4514a26733 100644
--- a/tycho-extras/tycho-buildtimestamp-jgit/pom.xml
+++ b/tycho-extras/tycho-buildtimestamp-jgit/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-extras</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
   <artifactId>tycho-buildtimestamp-jgit</artifactId>
 
diff --git a/tycho-extras/tycho-custom-bundle-plugin/pom.xml b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
index ac4ccdf2a7..f01253ea4f 100644
--- a/tycho-extras/tycho-custom-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-extras</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-custom-bundle-plugin</artifactId>
diff --git a/tycho-extras/tycho-dependency-tools-plugin/pom.xml b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
index 59df7f3dd5..6c489fe966 100644
--- a/tycho-extras/tycho-dependency-tools-plugin/pom.xml
+++ b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-dependency-tools-plugin</artifactId>
diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml
index e2ecf6fbaf..19d12ba264 100644
--- a/tycho-extras/tycho-document-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-document-bundle-plugin</artifactId>
diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
index 6d24fbfc28..28f098ac56 100644
--- a/tycho-extras/tycho-eclipserun-plugin/pom.xml
+++ b/tycho-extras/tycho-eclipserun-plugin/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tycho-extras</artifactId>
     <groupId>org.eclipse.tycho.extras</groupId>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>tycho-eclipserun-plugin</artifactId>
diff --git a/tycho-extras/tycho-extras-its/pom.xml b/tycho-extras/tycho-extras-its/pom.xml
index 7c19bada22..2078e0dc7f 100644
--- a/tycho-extras/tycho-extras-its/pom.xml
+++ b/tycho-extras/tycho-extras-its/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-extras-its</artifactId>
diff --git a/tycho-extras/tycho-p2-extras-plugin/pom.xml b/tycho-extras/tycho-p2-extras-plugin/pom.xml
index c28d2043f5..2d49d4947c 100644
--- a/tycho-extras/tycho-p2-extras-plugin/pom.xml
+++ b/tycho-extras/tycho-p2-extras-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2-extras-plugin</artifactId>
diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
index f6d18b7462..e0b913edd0 100644
--- a/tycho-extras/tycho-pomless/pom.xml
+++ b/tycho-extras/tycho-pomless/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	
   <artifactId>tycho-pomless</artifactId>
diff --git a/tycho-extras/tycho-source-feature-plugin/pom.xml b/tycho-extras/tycho-source-feature-plugin/pom.xml
index 588ac902e8..bb236fdcea 100644
--- a/tycho-extras/tycho-source-feature-plugin/pom.xml
+++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>tycho-extras</artifactId>
 		<groupId>org.eclipse.tycho.extras</groupId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-source-feature-plugin</artifactId>
diff --git a/tycho-extras/tycho-sourceref-jgit/pom.xml b/tycho-extras/tycho-sourceref-jgit/pom.xml
index ff24ca2dfe..1e6332a7ff 100644
--- a/tycho-extras/tycho-sourceref-jgit/pom.xml
+++ b/tycho-extras/tycho-sourceref-jgit/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-sourceref-jgit</artifactId>
 
diff --git a/tycho-extras/tycho-version-bump-plugin/pom.xml b/tycho-extras/tycho-version-bump-plugin/pom.xml
index 7760246141..e411aaab47 100644
--- a/tycho-extras/tycho-version-bump-plugin/pom.xml
+++ b/tycho-extras/tycho-version-bump-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-version-bump-plugin</artifactId>
diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
index b43886838e..56b75e3342 100644
--- a/tycho-its/pom.xml
+++ b/tycho-its/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-its</artifactId>
 
diff --git a/tycho-lib-detector/pom.xml b/tycho-lib-detector/pom.xml
index 4acefe144f..2644235957 100644
--- a/tycho-lib-detector/pom.xml
+++ b/tycho-lib-detector/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-lib-detector</artifactId>
 	<name>Tycho JVM Library Detector</name>
diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml
index 70bdac6618..868155b785 100644
--- a/tycho-maven-plugin/pom.xml
+++ b/tycho-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-maven-plugin</artifactId>
diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml
index 83554aa07a..8bd6e67ee0 100644
--- a/tycho-metadata-model/pom.xml
+++ b/tycho-metadata-model/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-metadata-model</artifactId>
 
diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml
index dc41460263..2e038f3789 100644
--- a/tycho-p2/pom.xml
+++ b/tycho-p2/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2</artifactId>
diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
index 9fcaed6c26..46aa8d60cd 100644
--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2-director-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
index 3d029a2bbb..b46aadc73d 100644
--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-p2-facade</artifactId>
 
diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml
index 9ca3a69eb6..89928a6b6c 100644
--- a/tycho-p2/tycho-p2-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
index 6413759596..67a50d1e84 100644
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2-publisher-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml
index ce33319380..5978217616 100644
--- a/tycho-p2/tycho-p2-repository-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-p2-repository-plugin</artifactId>
diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
index 933cc39b92..911c9ef5d0 100644
--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-packaging-plugin</artifactId>
diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml
index 6b64c32211..a4dfb676a0 100644
--- a/tycho-pomgenerator-plugin/pom.xml
+++ b/tycho-pomgenerator-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-pomgenerator-plugin</artifactId>
diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml
index 3fa29ec037..a602eb00dc 100644
--- a/tycho-release/pom.xml
+++ b/tycho-release/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-release</artifactId>
diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
index 4563da5150..34618be30e 100644
--- a/tycho-release/tycho-versions-plugin/pom.xml
+++ b/tycho-release/tycho-versions-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-release</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-versions-plugin</artifactId>
diff --git a/tycho-releng/pom.xml b/tycho-releng/pom.xml
index 820da842d2..9a831ac239 100644
--- a/tycho-releng/pom.xml
+++ b/tycho-releng/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-releng</artifactId>
diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml
index a79538a519..4911a1349e 100644
--- a/tycho-source-plugin/pom.xml
+++ b/tycho-source-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>tycho-source-plugin</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
index c13ce916b5..cda95f2383 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
index cfaad0b06f..01cae1a435 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 95e1a00f48..5c56030617 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit47</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
index 062d73e887..b7824b1099 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit5</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
index 582e68766c..5ff5f5be16 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit54</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
index fcf58af8f6..6086309811 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit55</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
index 0056fcd53a..5a4dbad395 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit56</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
index 75a83f4488..b7f5a7a609 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit57</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
index af31e0c667..8087650aa8 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
  org.eclipse.ui.workbench;bundle-version="3.2.2";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.2.0"
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.0
 Bundle-ClassPath: .,
  jars/surefire-booter-2.22.2.jar,
  jars/surefire-api-2.22.2.jar,
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index 8a8b5261ca..f057cd81e9 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 		<relativePath>../../tycho-bundles/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
index a96da931fc..64f25d2c83 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.testng</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index 1395a442b0..15e2625b48 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 		<relativePath>../tycho-bundles/pom.xml</relativePath>
 	</parent>
 	<artifactId>tycho-surefire</artifactId>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index bd10d6d0d0..66f69a939c 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml
index 56146d4a9d..72e12fb8f0 100644
--- a/tycho-testing-harness/pom.xml
+++ b/tycho-testing-harness/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 	<artifactId>tycho-testing-harness</artifactId>