Skip to content
This repository has been archived by the owner on Dec 18, 2019. It is now read-only.

Commit

Permalink
prepare for actual 1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
jgedarovich committed Apr 1, 2014
1 parent 924b3ec commit 08da6df
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 12 deletions.
45 changes: 35 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,42 @@
<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>
<artifactId>MasterProject</artifactId>
<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:[email protected]/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>
Expand All @@ -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>
9 changes: 9 additions & 0 deletions src/main/java/com/etsy/jenkins/MasterBuildCause.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

4 changes: 2 additions & 2 deletions src/main/java/com/etsy/jenkins/MasterModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()}">
Expand Down

0 comments on commit 08da6df

Please sign in to comment.