From 03720d6c839c8c5209d815e8317d6a1bdea5461f Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Thu, 12 Jan 2017 10:06:18 +0100 Subject: [PATCH] [FIX JENKINS-40750] Remove cc.xml from core --- core/src/main/java/hudson/Functions.java | 27 ++--------- .../resources/hudson/model/View/builds.jelly | 3 -- .../resources/hudson/model/View/cc.xml.jelly | 48 ------------------- 3 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 core/src/main/resources/hudson/model/View/cc.xml.jelly diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 76fdf2f813..279d62295d 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -1556,30 +1556,13 @@ public class Functions { /** * Converts the Hudson build status to CruiseControl build status, * which is either Success, Failure, Exception, or Unknown. + * + * @deprecated This functionality has been moved to ccxml plugin. */ + @Deprecated + @Restricted(DoNotUse.class) + @RestrictedSince("since TODO") public static String toCCStatus(Item i) { - if (i instanceof Job) { - Job j = (Job) i; - switch (j.getIconColor()) { - case ABORTED: - case ABORTED_ANIME: - case RED: - case RED_ANIME: - case YELLOW: - case YELLOW_ANIME: - return "Failure"; - case BLUE: - case BLUE_ANIME: - return "Success"; - case DISABLED: - case DISABLED_ANIME: - case GREY: - case GREY_ANIME: - case NOTBUILT: - case NOTBUILT_ANIME: - return "Unknown"; - } - } return "Unknown"; } diff --git a/core/src/main/resources/hudson/model/View/builds.jelly b/core/src/main/resources/hudson/model/View/builds.jelly index 51c5eebc35..398ccff65f 100644 --- a/core/src/main/resources/hudson/model/View/builds.jelly +++ b/core/src/main/resources/hudson/model/View/builds.jelly @@ -38,9 +38,6 @@ THE SOFTWARE.
-
- ${%Export as plain XML} (${%Recurse in subfolders}) -
diff --git a/core/src/main/resources/hudson/model/View/cc.xml.jelly b/core/src/main/resources/hudson/model/View/cc.xml.jelly deleted file mode 100644 index b83ec111d1..0000000000 --- a/core/src/main/resources/hudson/model/View/cc.xml.jelly +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file