From b1f5d28f90ca1dc99de775bb2bed46ada48e68f4 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 7 Jun 2013 20:02:49 +0300
Subject: [PATCH] doc improvements based on Jesse's comments

---
 changelog.html                                              | 2 ++
 core/src/main/java/hudson/model/Queue.java                  | 5 +++++
 core/src/main/java/hudson/model/queue/WorkUnit.java         | 6 ++++++
 .../main/java/hudson/maven/AbstractMavenProcessFactory.java | 1 +
 .../src/main/java/hudson/maven/MavenEmbedderRequest.java    | 1 +
 5 files changed, 15 insertions(+)

diff --git a/changelog.html b/changelog.html
index a2d1ff1577..b62d249949 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,8 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17125">issue 17125</a>)
   <li class='rfe'>
     Improved the tracking of queued jobs and their eventual builds in the REST API.
+  <li class='rfe'>
+    Added a new extension point to contribute custom plexus components into Maven for the maven project type.
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 7fdb4369b2..e53da67dc2 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -741,6 +741,8 @@ public class Queue extends ResourceController implements Saveable {
 
     /**
      * Returns the snapshot of all {@link LeftItem}s.
+     *
+     * @since 1.519
      */
     public Collection<LeftItem> getLeftItems() {
         return Collections.unmodifiableCollection(leftItems.asMap().values());
@@ -1444,6 +1446,7 @@ public class Queue extends ResourceController implements Saveable {
          *
          * @return
          *      URL that ends with '/'.
+         * @since 1.519
          */
         @Exported
         public String getUrl() {
@@ -1741,6 +1744,8 @@ public class Queue extends ResourceController implements Saveable {
     /**
      * {@link Item} in the {@link Queue#leftItems} stage. These are items that had left the queue
      * by either began executing or by getting cancelled.
+     *
+     * @since 1.519
      */
     public final static class LeftItem extends Item {
         public final WorkUnitContext outcome;
diff --git a/core/src/main/java/hudson/model/queue/WorkUnit.java b/core/src/main/java/hudson/model/queue/WorkUnit.java
index 000bc02ee6..c9ffb3e8d6 100644
--- a/core/src/main/java/hudson/model/queue/WorkUnit.java
+++ b/core/src/main/java/hudson/model/queue/WorkUnit.java
@@ -27,6 +27,8 @@ import hudson.model.Executor;
 import hudson.model.Queue;
 import hudson.model.Queue.Executable;
 import hudson.model.Queue.Task;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
@@ -76,6 +78,10 @@ public final class WorkUnit {
         return executable;
     }
 
+    /**
+     * This method is only meant to be called internally by {@link Executor}.
+     */
+    @Restricted(NoExternalUse.class)
     public void setExecutable(Executable executable) {
         this.executable = executable;
     }
diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
index 9ea895c7e1..8e7e9d9094 100644
--- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
+++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
@@ -260,6 +260,7 @@ public abstract class AbstractMavenProcessFactory
 
     /**
      * Apply extension plexus modules to the newly launched Maven process.
+     * @since 1.519
      */
     protected abstract void applyPlexusModuleContributor(Channel channel) throws InterruptedException, IOException;
 
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
index 975d860670..b4720e0417 100755
--- a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
@@ -192,6 +192,7 @@ public class MavenEmbedderRequest
 
     /**
      * Default value of {@link #getClassLoader()}
+     * @since 1.519
      */
     public static ClassLoader getDefaultMavenClassLoader() {
         return new MaskingClassLoader( MavenUtil.class.getClassLoader() );
-- 
GitLab