Merge branch 'JENKINS-25011'

jenkinsci · Aug 30, 2015 · 54fd9a0 · 54fd9a0
2 parents d8ef35e + 5f47225
commit 54fd9a0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -9,7 +8,7 @@
   </parent>
 
   <artifactId>promoted-builds</artifactId>
-  <version>2.22-SNAPSHOT</version>
+  <version>2.23-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>Jenkins promoted builds plugin</name>

diff --git a/src/main/java/hudson/plugins/promoted_builds/LastBuildPromotionStatusColumn.java b/src/main/java/hudson/plugins/promoted_builds/LastBuildPromotionStatusColumn.java
@@ -15,7 +15,7 @@
 
 /**
  * Provides a last build promotion summary column for {@link ListView}s.
- * @since TODO
+ * @since 2.22
  */
 public class LastBuildPromotionStatusColumn extends ListViewColumn {
 

diff --git a/src/main/java/hudson/plugins/promoted_builds/PromotionStatusColumn.java b/src/main/java/hudson/plugins/promoted_builds/PromotionStatusColumn.java
@@ -11,6 +11,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Show promotion statuses of the project.
+ * @see LastBuildPromotionStatusColumn
+ * @since 2.22
+ */
 public class PromotionStatusColumn extends ListViewColumn {
 
     @DataBoundConstructor

diff --git a/...main/java/hudson/plugins/promoted_builds/parameters/PromotedBuildParameterDefinition.java b/...main/java/hudson/plugins/promoted_builds/parameters/PromotedBuildParameterDefinition.java
@@ -155,7 +155,7 @@ public List getBuilds() {
      * @param base Base item for the relative addressing
      * @return List of {@link AbstractBuild}s, which have been promoted.
      *         May return an empty list if {@link Jenkins} instance is not ready
-     * @since TODO
+     * @since 2.22
      */
     @Nonnull
     public List<Run<?,?>> getRuns(@CheckForNull Item base) {

diff --git a/src/main/java/hudson/plugins/promoted_builds/util/ItemPathResolver.java b/src/main/java/hudson/plugins/promoted_builds/util/ItemPathResolver.java
@@ -42,7 +42,7 @@
  * Implements an engine, which allows to resolve {@link Item}s by their paths.
  * The engine supports both relative and absolute addressing.
  * @author Oleg Nenashev
- * @since TODO
+ * @since 2.22
  */
 public class ItemPathResolver {