From eab4bb6a30563a21321e5ab62afaa348247169d6 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 5 Mar 2013 16:34:41 -0800
Subject: [PATCH] Integrated json-lib 2.4

I had to tweak UpdateSite code because JSONObject.fromObject(String)
became more strict and no longer allows extra garbage after the closing
'}'
---
 core/pom.xml                                    | 2 +-
 core/src/main/java/hudson/model/UpdateSite.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index e19432da08..b91143b56b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -199,7 +199,7 @@ THE SOFTWARE.
     <dependency><!-- until we get this version through Stapler -->
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>json-lib</artifactId>
-      <version>2.1-rev7</version>
+      <version>2.4-jenkins-1</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 147bf3f3b7..77bc130c3f 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -171,7 +171,11 @@ public class UpdateSite {
                         String uncleanJson = IOUtils.toString(is,"UTF-8");
                         int jsonStart = uncleanJson.indexOf("{\"");
                         if (jsonStart >= 0) {
-                            return updateData(uncleanJson.substring(jsonStart), signatureCheck);
+                            uncleanJson = uncleanJson.substring(jsonStart);
+                            int end = uncleanJson.lastIndexOf('}');
+                            if (end>0)
+                                uncleanJson = uncleanJson.substring(0,end+1);
+                            return updateData(uncleanJson, signatureCheck);
                         } else {
                             throw new IOException("Could not find json in content of " +
                             		"update center from url: "+src.toExternalForm());
-- 
GitLab