[FIXED JENKINS-23263] JUnit reporter moved to a plugin.

jenkinsci · Aug 11, 2014 · 16197ea · uschindler · Aug 22, 2014 · uschindler
1 parent ec22212
commit 16197ea
Show file tree

Hide file tree

Showing 471 changed files with 41 additions and 45,006 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,7 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class="major rfe">
+    Moved JUnit reporting functionality to a plugin.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-23263">issue 23263</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -298,7 +298,8 @@ private void fix(Attributes atts, List<PluginWrapper.Dependency> optionalDepende
         new DetachedPlugin("matrix-auth","1.535.*","1.0.2"),
         new DetachedPlugin("windows-slaves","1.547.*","1.0"),
         new DetachedPlugin("antisamy-markup-formatter","1.553.*","1.0"),
-        new DetachedPlugin("matrix-project","1.561.*","1.0")
+        new DetachedPlugin("matrix-project","1.561.*","1.0"),
+        new DetachedPlugin("junit","1.577.*","1.0")
     );
 
     /**

diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -54,8 +54,6 @@
 import hudson.tasks.Builder;
 import hudson.tasks.Fingerprinter.FingerprintAction;
 import hudson.tasks.Publisher;
-import hudson.tasks.test.AbstractTestResultAction;
-import hudson.tasks.test.AggregatedTestResultAction;
 import hudson.util.*;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
@@ -1041,15 +1039,23 @@ public final VariableResolver<String> getBuildVariableResolver() {
     /**
      * @deprecated Use {@link #getAction(Class)} on {@link AbstractTestResultAction}.
      */
-    public AbstractTestResultAction getTestResultAction() {
-        return getAction(AbstractTestResultAction.class);
+    public Action getTestResultAction() {
+        try {
+            return getAction(Jenkins.getInstance().getPluginManager().uberClassLoader.loadClass("hudson.tasks.test.AbstractTestResultAction").asSubclass(Action.class));
+        } catch (ClassNotFoundException x) {
+            return null;
+        }
     }
 
     /**
      * @deprecated Use {@link #getAction(Class)} on {@link AggregatedTestResultAction}.
      */
-    public AggregatedTestResultAction getAggregatedTestResultAction() {
-        return getAction(AggregatedTestResultAction.class);
+    public Action getAggregatedTestResultAction() {
+        try {
+            return getAction(Jenkins.getInstance().getPluginManager().uberClassLoader.loadClass("hudson.tasks.test.AggregatedTestResultAction").asSubclass(Action.class));
+        } catch (ClassNotFoundException x) {
+            return null;
+        }
     }
 
     /**

diff --git a/core/src/main/java/hudson/model/Action.java b/core/src/main/java/hudson/model/Action.java
@@ -24,7 +24,6 @@
 package hudson.model;
 
 import hudson.Functions;
-import hudson.tasks.test.TestResultProjectAction;
 
 /**
  * Object that contributes additional information, behaviors, and UIs to {@link ModelObject}
@@ -46,7 +45,7 @@
  * it will be displayed as a floating box on the top page of
  * the target {@link ModelObject}. (For example, this is how
  * the JUnit test result trend shows up in the project top page.
- * See {@link TestResultProjectAction}.)
+ * See {@code TestResultProjectAction}.)
  *
  * <p>
  * On the target {@link ModelObject} page, actions are rendered as an item in the side panel

diff --git a/core/src/main/java/hudson/model/CheckPoint.java b/core/src/main/java/hudson/model/CheckPoint.java
@@ -26,7 +26,6 @@
 import hudson.tasks.BuildStep;
 import hudson.tasks.Recorder;
 import hudson.tasks.Builder;
-import hudson.tasks.junit.JUnitResultArchiver;
 import hudson.scm.SCM;
 import javax.annotation.Nonnull;
 
@@ -57,7 +56,7 @@
  *
  * <h2>Example</h2>
  * <p>
- * {@link JUnitResultArchiver} provides a good example of how a {@link Recorder} can
+ * {@code JUnitResultArchiver} provides a good example of how a {@link Recorder} can
  * depend on its earlier result.
  *
  * @author Kohsuke Kawaguchi
@@ -127,9 +126,9 @@ public void report() {
      *
      * <ol>
      * <li>Build #1, #2, and #3 happens around the same time
-     * <li>Build #3 waits for check point {@link JUnitResultArchiver}
+     * <li>Build #3 waits for check point {@code JUnitResultArchiver}
      * <li>Build #2 aborts before getting to that check point
-     * <li>Build #1 finally checks in {@link JUnitResultArchiver}
+     * <li>Build #1 finally checks in {@code JUnitResultArchiver}
      * </ol>
      *
      * <p>