From 08da6dfe1e48ccb09393c26510eb2307d2bff797 Mon Sep 17 00:00:00 2001
From: jgedarovich <jgedarovich@etsy.com>
Date: Tue, 1 Apr 2014 18:47:26 +0000
Subject: [PATCH] prepare for actual 1.0 release

---
 pom.xml                                       | 45 ++++++++++++++-----
 .../com/etsy/jenkins/MasterBuildCause.java    |  9 ++++
 .../java/com/etsy/jenkins/MasterModule.java   |  4 +-
 .../jenkins/MasterBuild/latestBuildList.jelly |  1 +
 .../jenkins/MasterBuild/latestBuildRow.jelly  |  3 ++
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index e796001..511d1ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.427</version><!-- which version of Hudson is this plugin built against? -->
-    <relativePath>../pom.xml</relativePath>
+    <version>1.515</version><!-- which version of Hudson is this plugin built against? -->
   </parent>
 
   <groupId>com.etsy.jenkins</groupId>
@@ -12,14 +11,34 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
+  <name>Jenkins Master Project Plugin</name>
+   <description>
+        This plugin provides a new project type. In this new project type you can select a list of sub-projects which should be executed in one logical master project.
+  </description>
+  <scm>
+    <connection>scm:git:ssh://github.com/etsy/jenkins-master-project.git</connection>
+    <developerConnection>scm:git:git@github.com/etsy/jenkins-master-project.git</developerConnection>
+    <url>https://github.com/etsy/jenkins-master-project.git</url>
+</scm>
+<!--<url>https://wiki.jenkins-ci.org/display/JENKINS/</url>-->
+  <developers>
+    <developer>
+      <id>jgedarovich</id>
+      <name>Jimbo</name>
+    </developer>
+  </developers>
   <repositories>
     <repository>
       <id>jenkins-public</id>
       <url>http://repo.jenkins-ci.org/public/</url>
     </repository>
   </repositories>
-
-  <!-- get every artifact through the public Jenkins plugin repository -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repo.jenkins-ci.org</id>
+      <url>http://repo.jenkins-ci.org/public/</url>
+    </pluginRepository>
+  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
@@ -40,14 +59,20 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>2.0</version>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>1.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.sonatype.sisu</groupId>
+      <artifactId>sisu-guice</artifactId>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-assisted-inject</artifactId>
-      <version>2.0</version>
+        <groupId>org.sonatype.sisu.inject</groupId>
+        <artifactId>guice-assistedinject</artifactId>
+        <version>3.1.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/etsy/jenkins/MasterBuildCause.java b/src/main/java/com/etsy/jenkins/MasterBuildCause.java
index 28dc73c..32f9492 100644
--- a/src/main/java/com/etsy/jenkins/MasterBuildCause.java
+++ b/src/main/java/com/etsy/jenkins/MasterBuildCause.java
@@ -20,5 +20,14 @@ public MasterBuildCause(Run<?,?> master, int rebuildNumber) {
   public int getRebuildNumber() {
     return rebuildNumber;
   }
+    public boolean equals(Object rhs) {
+
+        if(rhs instanceof MasterBuildCause) {
+            return super.equals(rhs) 
+                && this.rebuildNumber == ((MasterBuildCause)rhs).getRebuildNumber();
+        } else {
+            return false;
+        }
+    } 
 }
 
diff --git a/src/main/java/com/etsy/jenkins/MasterModule.java b/src/main/java/com/etsy/jenkins/MasterModule.java
index 7d7fa5a..0ee02b6 100644
--- a/src/main/java/com/etsy/jenkins/MasterModule.java
+++ b/src/main/java/com/etsy/jenkins/MasterModule.java
@@ -28,8 +28,8 @@ protected void configure() {
             FactoryProvider.newFactory(
                 RebuildWatcher.Factory.class, RebuildWatcher.class));
     bindConstant().annotatedWith(MasterProject.PingTime.class).to(7000L);
-
-    ExecutorService executor = Executors.newFixedThreadPool(25);
+    //Thread pool size; should be >= number of build slaves
+    ExecutorService executor = Executors.newFixedThreadPool(150);
     bind(ExecutorService.class)
         .toInstance(executor);
     bind(Executor.class)
diff --git a/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildList.jelly b/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildList.jelly
index a82a33a..2f16b9c 100644
--- a/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildList.jelly
+++ b/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildList.jelly
@@ -46,6 +46,7 @@
       <th>${%Build}</th>
       <th initialSortDir="up">${%Date}</th>
       <th>${%Status}</th>
+      <th>${%Duration}</th>
       <th><st:nbsp/></th> <!-- Artifacts -->
       <th><st:nbsp/></th> <!-- Changes -->
       <th><st:nbsp/></th> <!-- Test Report -->
diff --git a/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildRow.jelly b/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildRow.jelly
index 22dad91..4c72509 100644
--- a/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildRow.jelly
+++ b/src/main/resources/com/etsy/jenkins/MasterBuild/latestBuildRow.jelly
@@ -20,6 +20,9 @@
   <td>
     <t:buildStatusSummary build="${b}" />
   </td>
+  <td>
+    ${b.durationString}
+  </td>
   <td width="30px"> <!-- Build Artifacts -->
     <j:choose>
       <j:when test="${b.getHasArtifacts()}">