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

merged the last RC branch

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16922 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2009-04-08 15:47:29 +00:00
1 parent fd5988d39a
commit dabb35190e
15 files changed
+74 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/ClassicPluginStrategy.java
+3 -2
View File
@@ -162,12 +162,13 @@ public class ClassicPluginStrategy implements PluginStrategy {
String hudsonVersion = manifest.getMainAttributes().getValue("Hudson-Version");
String shortName = manifest.getMainAttributes().getValue("Short-Name");
if (!"maven-plugin".equals(shortName) &&
(hudsonVersion == null || hudsonVersion.compareTo("1.296") <= 0)) {
// some earlier versions of maven-hpi-plugin apparently puts "null" as a literal here. Watch out for those.
(hudsonVersion == null || hudsonVersion.equals("null") || hudsonVersion.compareTo("1.296") <= 0)) {
optionalDependencies.add(new PluginWrapper.Dependency("maven-plugin:" + Hudson.VERSION));
}
ClassLoader dependencyLoader = new DependencyClassLoader(getClass()
.getClassLoader(), dependencies);
.getClassLoader(), Util.join(dependencies,optionalDependencies));
ClassLoader classLoader = new URLClassLoader(paths.toArray(new URL[paths.size()]),
dependencyLoader);