提交 8d25a601 编写于 作者: J Jesse Glick

@kohsuke suggests using '@' as separator between shortName & version, rather...

@kohsuke suggests using '@' as separator between shortName & version, rather than ' ', in case we want to allow multiple owners in the future.
上级 deb91959
......@@ -127,7 +127,7 @@ public class XStream2 extends XStream {
return null;
}
PluginWrapper p = pm.whichPlugin(clazz);
return p != null ? p.getShortName() + ' ' + p.getVersion() : null;
return p != null ? p.getShortName() + '@' + p.getVersion() : null;
}
});
return reflectionConverter;
......
......@@ -222,9 +222,9 @@ public class PluginManagerTest extends HudsonTestCase {
UpdateSite.signatureCheck = true;
}
assertNotNull(site.getData());
assertEquals(Collections.emptyList(), jenkins.getPluginManager().prevalidateConfig(new StringInputStream("<whatever><runant plugin=\"ant 1.1\"/></whatever>")));
assertEquals(Collections.emptyList(), jenkins.getPluginManager().prevalidateConfig(new StringInputStream("<whatever><runant plugin=\"ant@1.1\"/></whatever>")));
assertNull(jenkins.getPluginManager().getPlugin("tasks"));
List<Future<UpdateCenterJob>> jobs = jenkins.getPluginManager().prevalidateConfig(new StringInputStream("<whatever><tasks plugin=\"tasks 2.23\"/></whatever>"));
List<Future<UpdateCenterJob>> jobs = jenkins.getPluginManager().prevalidateConfig(new StringInputStream("<whatever><tasks plugin=\"tasks@2.23\"/></whatever>"));
assertEquals(1, jobs.size());
UpdateCenterJob job = jobs.get(0).get(); // blocks for completion
assertEquals("InstallationJob", job.getType());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册