From c5137634db71fa81fc08705d4870d4b4cda50a05 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Fri, 18 Apr 2025 08:46:59 +0200
Subject: [PATCH 1/2] Leverage Tycho-pomless in e.platform.releng and
 e.platform.common

---
 .gitignore                                    |  8 ++-
 .../org.eclipse.jdt.doc.user/build.properties |  5 +-
 .../bundles/org.eclipse.jdt.doc.user/pom.xml  | 24 -------
 .../build.properties                          | 13 ++++
 .../bundles/org.eclipse.jdt.tips.user/pom.xml | 26 --------
 .../build.properties                          | 13 ++++
 .../org.eclipse.platform.doc.tips/pom.xml     | 26 --------
 .../build.properties                          |  5 +-
 .../org.eclipse.platform.doc.user/pom.xml     | 23 -------
 .../bundles/build.properties                  |  2 +
 .../org.eclipse.ant.optional.junit/pom.xml    | 24 -------
 .../bundles/org.eclipse.rcp/build.properties  |  4 +-
 .../bundles/org.eclipse.rcp/pom.xml           | 34 ----------
 .../org.eclipse.releng.tests/build.properties |  6 +-
 .../bundles/org.eclipse.releng.tests/pom.xml  | 30 ---------
 .../org.eclipse.sdk.examples/build.properties |  4 +-
 .../bundles/org.eclipse.sdk.examples/pom.xml  | 34 ----------
 .../org.eclipse.sdk.tests/build.properties    |  5 +-
 .../bundles/org.eclipse.sdk.tests/pom.xml     | 34 ----------
 .../org.eclipse.test.performance/pom.xml      | 24 -------
 .../bundles/org.eclipse.test/build.properties |  5 +-
 .../bundles/org.eclipse.test/pom.xml          | 27 --------
 .../features/build.properties                 |  1 +
 .../features/org.eclipse.help-feature/pom.xml | 55 ----------------
 .../features/org.eclipse.rcp/pom.xml          | 59 -----------------
 .../org.eclipse.sdk.examples-feature/pom.xml  | 65 -------------------
 .../features/org.eclipse.sdk.tests/pom.xml    | 25 -------
 .../features/org.eclipse.sdk/pom.xml          | 24 -------
 .../features/org.eclipse.test-feature/pom.xml | 26 --------
 eclipse.platform.releng/pom.xml               | 56 +++++++++++-----
 30 files changed, 102 insertions(+), 585 deletions(-)
 delete mode 100644 eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
 delete mode 100644 eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml
 delete mode 100644 eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml
 delete mode 100644 eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml
 create mode 100644 eclipse.platform.releng/bundles/build.properties
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml
 delete mode 100644 eclipse.platform.releng/bundles/org.eclipse.test/pom.xml
 create mode 100644 eclipse.platform.releng/features/build.properties
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.rcp/pom.xml
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.sdk/pom.xml
 delete mode 100644 eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml

diff --git a/.gitignore b/.gitignore
index 284545ce528..d01a6898f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-target/
 bin/
 TMP/m2repo/
 settings.xml
@@ -9,4 +8,9 @@ workspace/
 .metadata/
 RemoteSystemsTempFiles/
 /apiAnalyzer-workspace/
-eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/samples/*/doc-html
\ No newline at end of file
+eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/samples/*/doc-html
+
+# Maven/Tycho build artifats
+target/
+.polyglot.*
+pom.tycho
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties
index b3aff8f0eee..21b0e68a052 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -13,3 +13,6 @@ custom=true
 
 bin.includes=*.properties,*.xml,*.html,*.png,*.css,META-INF/,concepts/, gettingStarted/, images/, reference/, tasks/, tips/, whatsNew/
 bin.excludes=build.properties,build.xml,workspace,.m2
+
+# Maven/Tycho pom model adjustments
+pom.model.groupId = org.eclipse.jdt
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
deleted file mode 100644
index 5ee141e0647..00000000000
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2023 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>eclipse.platform.common</artifactId>
-    <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.jdt</groupId>
-  <artifactId>org.eclipse.jdt.doc.user</artifactId>
-  <version>3.15.2600-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties
index e9863e281ea..5303855b121 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/build.properties
@@ -1,5 +1,18 @@
+###############################################################################
+# Copyright (c) 2018, 2025 Remain Software and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Remain Software - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml
+
+# Maven/Tycho pom model adjustments
+pom.model.groupId = org.eclipse.jdt
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml
deleted file mode 100644
index cc7574137d7..00000000000
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.tips.user/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2018 Remain Software
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-    Contributors:
-        wim.jongman@remainsoftware.com - initial API and implementation
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>eclipse.platform.common</artifactId>
-    <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.jdt</groupId>
-  <artifactId>org.eclipse.tips.core</artifactId>
-  <version>0.3.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties
index 6c480f39f1b..2330bd61a9e 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/build.properties
@@ -1,6 +1,19 @@
+###############################################################################
+# Copyright (c) 2018, 2025 Vogella GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Vogella GmbH - initial API and implementation
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/
+
+# Maven/Tycho pom model adjustments
+pom.model.groupId = org.eclipse.platform
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml
deleted file mode 100644
index 6da90c18978..00000000000
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.tips/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2018 vogella GmbH
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-v20.html
-
-    Contributors:
-        simon.scholz@vogella.com - initial API and implementation
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>eclipse.platform.common</artifactId>
-    <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.platform.doc.tips</artifactId>
-  <version>0.3.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties
index 6b81b794a6e..f2519fe7480 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -14,3 +14,6 @@ bin.includes = META-INF/,\
                reference/, tasks/, tips/, whatsNew/
                
 bin.excludes = build.properties
+
+# Maven/Tycho pom model adjustments
+pom.model.groupId = org.eclipse.platform
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml
deleted file mode 100644
index 961cd1c794f..00000000000
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2018 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>eclipse.platform.common</artifactId>
-    <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.platform.doc.user</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.releng/bundles/build.properties b/eclipse.platform.releng/bundles/build.properties
new file mode 100644
index 00000000000..e580cf2e63c
--- /dev/null
+++ b/eclipse.platform.releng/bundles/build.properties
@@ -0,0 +1,2 @@
+pom.model.artifactId = releng-bundles
+pom.model.groupId = org.eclipse.platform
diff --git a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml
deleted file mode 100644
index ce053609034..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.ant.optional.junit/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.ant.optional.junit</artifactId>
-  <version>3.3.400-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties b/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties
index 849303c9a89..27be2a5ce10 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.rcp/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2016 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -19,3 +19,5 @@ bin.includes = about.html,\
                plugin.properties,\
                META-INF/
 
+# Maven/Tycho pom model adjustments
+pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}'
diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml
deleted file mode 100644
index 820f5f324b7..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.rcp/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2016 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platfrom</groupId>
-  <artifactId>org.eclipse.rcp</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <configuration>
-          <format>'v${buildTimestamp}'</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties
index 98a88631f73..768b94d3bd7 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -23,3 +23,7 @@ bin.includes = compare.properties,\
                .
 source.. = src/
 output.. = bin/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.testSuite = ${project.artifactId}
+pom.model.property.skipTests = true
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
deleted file mode 100644
index f84f1ffc6c3..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2019 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
-     Lars Vogel <Lars.Vogel@vogella.com> - Bug 485612
-     Paul Pazderski - Bug 546468: Enable releng tools tests on automatic builds
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.releng.tests</artifactId>
-  <version>3.6.700-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <properties>
-    <testSuite>${project.artifactId}</testSuite>
-    <skipTests>true</skipTests>
-  </properties>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties
index 1e8f95dda4f..edf96aac7d0 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -25,3 +25,5 @@ bin.includes = about.html,\
 # these files need to end up as root files in <install>/eclipse/
 src.includes=about.html
 
+# Maven/Tycho pom model adjustments
+pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}'
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml
deleted file mode 100644
index 6dfdecc0f43..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2017 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.sdk.examples</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <configuration>
-          <format>'v${buildTimestamp}'</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties
index 7dae64cfbd0..b18895fbfe5 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -18,3 +18,6 @@ bin.includes = about.html,\
                eclipse32.png,\
                plugin.properties,\
                META-INF/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.tycho.buildqualifier.format = 'v${buildTimestamp}'
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml
deleted file mode 100644
index e95cd95fd17..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.sdk.tests</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <configuration>
-          <format>'v${buildTimestamp}'</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml
deleted file mode 100644
index f04cd5e0c0c..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.test.performance/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2017 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.test.performance</artifactId>
-  <version>3.21.100-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
index dbb2d165a0b..29cdac39ffd 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2017 IBM Corporation and others.
+# Copyright (c) 2000, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -19,3 +19,6 @@ bin.includes = .,\
                about.html
 src.includes = about.html
 source.. = src/
+
+# Maven/Tycho pom model adjustments
+pom.model.property.defaultSigning-excludeInnerJars = true
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml
deleted file mode 100644
index 815e9ad2c46..00000000000
--- a/eclipse.platform.releng/bundles/org.eclipse.test/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2017 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.test</artifactId>
-  <version>3.6.200-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  <properties>
-    <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> 
-  </properties>  
-</project>
diff --git a/eclipse.platform.releng/features/build.properties b/eclipse.platform.releng/features/build.properties
new file mode 100644
index 00000000000..bde893d9394
--- /dev/null
+++ b/eclipse.platform.releng/features/build.properties
@@ -0,0 +1 @@
+pom.model.artifactId = releng-features
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
deleted file mode 100644
index 7190ff01092..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2019 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.help.feature</groupId>
-  <artifactId>org.eclipse.help</artifactId>
-  <name>org.eclipse.help.feature</name>
-  <version>2.3.2200-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-    <build>
-     <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>feature-source</id>
-            <goals>
-              <goal>feature-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml b/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml
deleted file mode 100644
index 999aa06c27d..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.rcp/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2014 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.rcp.feature</groupId>
-  <artifactId>org.eclipse.rcp</artifactId>
-  <name>org.eclipse.rcp.feature</name>
-  <packaging>eclipse-feature</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>feature-source</id>
-            <goals>
-              <goal>feature-source</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <plugin id="org.eclipse.rcp"/>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml
deleted file mode 100644
index 4ed70779a83..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2017 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.sdk.feature</groupId>
-  <artifactId>org.eclipse.sdk.examples</artifactId>
-  <name>org.eclipse.sdk.examples.feature</name>
-  <packaging>eclipse-feature</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>feature-source</id>
-            <goals>
-              <goal>feature-source</goal>
-            </goals>
-            <configuration>
-              <features>
-                <feature id="org.eclipse.sdk.examples"/>
-              </features>
-              <!-- 
-              <excludes>
-                <plugin id="org.eclipse.sdk.examples"/>
-              </excludes>
-               -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml
deleted file mode 100644
index 33b3859b463..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.sdk.feature</groupId>
-  <artifactId>org.eclipse.sdk.tests</artifactId>
-  <name>org.eclipse.sdk.tests.feature</name>
-  <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml
deleted file mode 100644
index 76820b25c2a..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2014 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.sdk.feature</groupId>
-  <artifactId>org.eclipse.sdk</artifactId>
-  <name>org.eclipse.sdk.feature</name>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml
deleted file mode 100644
index b9b6a3441b7..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.test-feature/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2019 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     Igor Fedorenko - initial implementation
-     David Williams - cleanup via bug 480072.
--->
-<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>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <groupId>org.eclipse.test.feature</groupId>
-  <artifactId>org.eclipse.test</artifactId>
-  <name>org.eclipse.test.feature</name>
-  <version>3.9.200-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/eclipse.platform.releng/pom.xml b/eclipse.platform.releng/pom.xml
index d509074013d..ab85d6b1679 100644
--- a/eclipse.platform.releng/pom.xml
+++ b/eclipse.platform.releng/pom.xml
@@ -47,25 +47,49 @@
         </repository>
       </repositories>
     </profile>
+    <profile>
+      <id>generate-feature-source</id>
+      <activation>
+        <file>
+          <exists>feature.xml</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>feature-source</id>
+                <goals>
+                  <goal>feature-source</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <modules>
-    <module>bundles/org.eclipse.ant.optional.junit</module>
-    <module>bundles/org.eclipse.rcp</module>
-    <module>bundles/org.eclipse.releng.tests</module>
-    <module>bundles/org.eclipse.sdk.examples</module>
-    <module>bundles/org.eclipse.sdk.tests</module>
-    <module>bundles/org.eclipse.test</module>
-    <module>bundles/org.eclipse.test.performance</module>
-    <module>bundles/org.eclipse.test.performance.win32</module>
-
-    <module>features/org.eclipse.help-feature</module>
-    <module>features/org.eclipse.platform-feature</module>
-    <module>features/org.eclipse.rcp</module>
-    <module>features/org.eclipse.sdk</module>
-    <module>features/org.eclipse.sdk.examples-feature</module>
-    <module>features/org.eclipse.sdk.tests</module>
-    <module>features/org.eclipse.test-feature</module>
+    <module>bundles</module>
+    <module>features</module>
   </modules>
 
 </project>

From 5e6e001ba01f411cae9ec851465adf1f0ef9fb0c Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Tue, 22 Apr 2025 17:08:53 +0000
Subject: [PATCH 2/2] Version bump(s) for 4.36 stream

---
 .../bundles/org.eclipse.test/META-INF/MANIFEST.MF               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
index f2ab114d6cf..c77d2d68a4b 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.test; singleton:=true
-Bundle-Version: 3.6.200.qualifier
+Bundle-Version: 3.6.300.qualifier
 Eclipse-BundleShape: dir
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin