OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-13 20:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jenkinsci/jenkins into anonymous-to-lambda

Browse Source
This commit is contained in:
Jesse Glick committed 2021-08-30 14:18:15 -04:00
2 parents f701dcb41d 0ce5ff1cc9
commit b23b674fc4
380 files changed
+2454 -23429
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/ClassicPluginStrategy.java
+1 -11
View File
@@ -36,7 +36,6 @@ import jenkins.ClassLoaderReflectionToolkit;
import jenkins.ExtensionFilter;
import jenkins.plugins.DetachedPluginsUtil;
import jenkins.util.AntClassLoader;
import jenkins.util.AntWithFindResourceClassLoader;
import jenkins.util.SystemProperties;
import org.apache.commons.io.output.NullOutputStream;
import org.apache.tools.ant.BuildException;
@@ -297,7 +296,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
}
AntWithFindResourceClassLoader classLoader = new AntWithFindResourceClassLoader(parent, true);
AntClassLoader classLoader = new AntClassLoader(parent, true);
classLoader.addPathFiles(paths);
return classLoader;
}
@@ -616,15 +615,6 @@ public class ClassicPluginStrategy implements PluginStrategy {
return transientDependencies;
}
// public List<PluginWrapper> getDependencyPluginWrappers() {
// List<PluginWrapper> r = new ArrayList<PluginWrapper>();
// for (Dependency d : dependencies) {
// PluginWrapper w = pluginManager.getPlugin(d.shortName);
// if (w!=null) r.add(w);
// }
// return r;
// }
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (PluginManager.FAST_LOOKUP) {