From 3e5b403f6500d4df0b3313856c3bed369614aa48 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 9 Oct 2012 20:44:48 -0400 Subject: [PATCH] =?UTF-8?q?Trim=20snapshot=20version=20strings=20in=20plug?= =?UTF-8?q?in=3D"=E2=80=A6"=20attributes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/hudson/util/XStream2.java | 7 ++++++- core/src/test/java/hudson/util/XStream2Test.java | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index f41ea7713f..f772f2a498 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -128,12 +128,17 @@ public class XStream2 extends XStream { } // TODO: possibly recursively scan super class to discover dependencies PluginWrapper p = pm.whichPlugin(clazz); - return p != null ? p.getShortName() + '@' + p.getVersion() : null; + return p != null ? p.getShortName() + '@' + trimVersion(p.getVersion()) : null; } }); return reflectionConverter; } + static String trimVersion(String version) { + // XXX seems like there should be some trick with VersionNumber to do this + return version.replaceFirst(" .+$", ""); + } + private void init() { // list up types that should be marshalled out like a value, without referential integrity tracking. addImmutableType(Result.class); diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java index fca995496d..6804bfec76 100644 --- a/core/src/test/java/hudson/util/XStream2Test.java +++ b/core/src/test/java/hudson/util/XStream2Test.java @@ -311,4 +311,11 @@ public class XStream2Test extends TestCase { assertEquals(1,map.m.size()); assertEquals("def",map.m.get("abc")); } + + public void testTrimVersion() throws Exception { + assertEquals("3.2", XStream2.trimVersion("3.2")); + assertEquals("3.2.1", XStream2.trimVersion("3.2.1")); + assertEquals("3.2-SNAPSHOT", XStream2.trimVersion("3.2-SNAPSHOT (private-09/23/2012 12:26-jhacker)")); + } + }