diff --git a/core/pom.xml b/core/pom.xml index 8a1cc7fe63..01732c461a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -280,7 +280,7 @@ org.kohsuke.stapler stapler - 1.78 + 1.79 diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index dea81cc1fe..f3892c6b71 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -26,6 +26,7 @@ import org.apache.commons.fileupload.FileItem; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.Stapler; /** * Manages {@link PluginWrapper}s. @@ -70,6 +71,9 @@ public final class PluginManager extends AbstractModelObject { public PluginManager(ServletContext context) { this.context = context; + // JSON binding needs to be able to see all the classes from all the plugins + Stapler.setClassLoader(context,uberClassLoader); + rootDir = new File(Hudson.getInstance().getRootDir(),"plugins"); if(!rootDir.exists()) rootDir.mkdirs();