Merge branch 'master' into Timestamp_issue

Author: somiljain2006

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6504.v878e5b_e776d7
+export ATH_VERSION=6507.vef7dc6b_6f5c4
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21

core/src/main/java/jenkins/util/SetContextClassLoader.java

@@ -41,8 +41,8 @@
  * unclear, {@link #SetContextClassLoader(ClassLoader)} can be used as a fallback with {@link
  * PluginManager.UberClassLoader} as the argument, though this is not as safe since lookups could be
  * ambiguous in case two unrelated plugins both bundle the same library. In functional tests, {@code
- * RealJenkinsRule.Endpoint} can be used to reference a class loader that has access to the plugins
- * defined in the test scenario.
+ * jenkinsRule.getPluginManager().uberClassLoader} can be used to reference a class loader that has
+ * access to the plugins defined in the test scenario.
  *
  * <p>See <a
  * href="https://www.jenkins.io/doc/developer/plugin-development/dependencies-and-class-loading/#context-class-loaders">the

core/src/main/resources/hudson/slaves/Cloud/sidepanel.jelly

@@ -27,10 +27,11 @@ THE SOFTWARE.
     <l:header />
     <l:side-panel>
         <l:tasks>
-            <l:task contextMenu="false" href="." icon="symbol-computer" title="${%Status}"/>
-            <l:task href="configure" icon="symbol-settings"
+            <j:set var="url" value="${h.getNearestAncestorUrl(request2,it)}"/>
+            <l:task contextMenu="false" href="${url}/" icon="symbol-computer" title="${%Status}"/>
+            <l:task href="${url}/configure" icon="symbol-settings"
                     title="${app.hasPermission(app.ADMINISTER) ? '%Configure' : '%View Configuration'}"/>
-            <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}"/>
+            <l:delete permission="${app.ADMINISTER}" title="${%Delete Cloud}" message="${%delete.cloud(it.displayName)}" urlPrefix="${url}"/>
             <t:actions />
         </l:tasks>
         <j:forEach var="action" items="${it.allActions}">

test/src/test/java/jenkins/util/SetContextClassLoaderTest.java

@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.RealJenkinsRule;
 import org.jvnet.hudson.test.junit.jupiter.RealJenkinsExtension;
 
 class SetContextClassLoaderTest {
@@ -20,7 +19,7 @@ void positive() throws Throwable {
     }
 
     private static void _positive(JenkinsRule r) throws ClassNotFoundException {
-        try (SetContextClassLoader sccl = new SetContextClassLoader(RealJenkinsRule.Endpoint.class)) {
+        try (SetContextClassLoader sccl = new SetContextClassLoader(r.getPluginManager().uberClassLoader)) {
             assertEquals("hudson.tasks.Mailer$UserProperty", getUserPropertyClass().getName());
         }
     }