From 9228ed6e00d1220ae65450f72d22d20b8a752e6e Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Fri, 18 Apr 2025 00:37:04 +0200
Subject: [PATCH 1/2] [Build] Remove definition PLUGIN_PATH system-property for
 I-build tests

All usages of the 'PLUGIN_PATH' system-property in tests have been
removed. Therefore that property and it's defining ANT property
'plugin-path' can be removed.
---
 .../eclipse-junit-tests/src/main/scripts/library.xml   | 10 +---------
 .../bundles/org.eclipse.releng.tests/test.xml          |  4 ----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
index 917b9cd088a..e33c6bf6407 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
@@ -66,8 +66,6 @@
 
             test-output   - overrides default output file produced from test run. [May not currently override default?]
 
-            plugin-path   - path to root of plug-in
-
             useEclipseExe - property setting forces test to launch via eclipse executable. [Not fully supported. See bug 387638.]
 
             junit-report-output - output directory for junit reports produced for specified classname.
@@ -150,9 +148,6 @@
         <property
             name="extraVMargs"
             value="" />
-        <property
-            name="plugin-path"
-            value="" />
 
       <property
             name="timeout"
@@ -271,9 +266,6 @@
             <arg value="-junitReportOutput" />
             <arg path="${junit-report-output}" />
             <jvmarg line="${frameworkvmargs} ${loglocation} ${vmargs} ${extraVMargs} ${frameworkperfargs}" />
-            <sysproperty
-                key="PLUGIN_PATH"
-                value="${plugin-path}" />
             <env
                 key="ECLIPSE_I_BUILD_TEST"
                 value="true"/>
@@ -339,7 +331,7 @@
             <arg line="-nosplash" />
             <arg line="--launcher.suppressErrors" />
             <arg line="${consolelog}" />
-            <arg line="-vmargs ${frameworkvmargs} ${loglocation} ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}" />
+            <arg line="-vmargs ${frameworkvmargs} ${loglocation} ${vmargs} ${extraVMargs}" />
         </exec>
         <antcall target="collect-results" />
     </target>
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml
index 23e78a23ce3..76b8a317211 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml
@@ -226,10 +226,6 @@
       <property
         name="classname"
         value="org.eclipse.releng.tests.BuildTests" />
-      <property
-        name="plugin-path"
-        value="${eclipse-home}/plugins/${org.eclipse.releng.tests}" />
-      
       <property
         name="vmargs"
         value="-DdownloadHost=${downloadHost} -DbuildId=${buildId}"  />

From 0c86e15c707bcb14003ab6a3561bd8eee80f1366 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Fri, 18 Apr 2025 13:20:19 +0000
Subject: [PATCH 2/2] Version bump(s) for 4.36 stream

---
 .../bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF       | 2 +-
 .../bundles/org.eclipse.releng.tests/pom.xml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
index ace3aedf57b..a8ca55a8953 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.releng.tests;singleton:=true
-Bundle-Version: 3.6.600.qualifier
+Bundle-Version: 3.6.700.qualifier
 Eclipse-BundleShape: dir
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
index 8f41661b9eb..f84f1ffc6c3 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
+++ b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/pom.xml
@@ -21,7 +21,7 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.releng.tests</artifactId>
-  <version>3.6.600-SNAPSHOT</version>
+  <version>3.6.700-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>