Merge pull request #236 from jglick/SCM-Job

[JENKINS-23365] Work in a general Job
jenkinsci · Jun 16, 2014 · d83ff37 · d83ff37
2 parents 05630e8 + 268eec4
commit d83ff37
Show file tree

Hide file tree

Showing 36 changed files with 351 additions and 231 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.509</version>
+    <version>1.568</version>
   </parent>
 
   <licenses>
@@ -259,6 +259,16 @@
       <artifactId>scm-api</artifactId>
       <version>0.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>matrix-project</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>1.8</version>
+    </dependency>
 
 
     <dependency>
@@ -302,8 +312,8 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>multiple-scms</artifactId>
-      <version>0.2</version>
-      <optional>true</optional>
+      <version>0.4-beta-1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/git/GitChangeLogParser.java b/src/main/java/hudson/plugins/git/GitChangeLogParser.java
@@ -1,21 +1,17 @@
 package hudson.plugins.git;
 
-import hudson.model.AbstractBuild;
+import hudson.model.Run;
 import hudson.scm.ChangeLogParser;
+import hudson.scm.RepositoryBrowser;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.LineIterator;
 import org.xml.sax.SAXException;
 
 import javax.annotation.Nonnull;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -39,7 +35,7 @@ public List<GitChangeSet> parse(@Nonnull List<String> changelog) {
         return parse(changelog.iterator());
     }
 
-    public GitChangeSetList parse(AbstractBuild build, File changelogFile)
+    @Override public GitChangeSetList parse(Run build, RepositoryBrowser<?> browser, File changelogFile)
         throws IOException, SAXException {
 
         Set<GitChangeSet> r = new LinkedHashSet<GitChangeSet>();
@@ -48,7 +44,7 @@ public GitChangeSetList parse(AbstractBuild build, File changelogFile)
         LineIterator lineIterator = null;
         try {
         	lineIterator = FileUtils.lineIterator(changelogFile);
-        	return new GitChangeSetList(build, parse(lineIterator));
+        	return new GitChangeSetList(build, browser, parse(lineIterator));
         } finally {
         	LineIterator.closeQuietly(lineIterator);
         }

diff --git a/src/main/java/hudson/plugins/git/GitChangeSet.java b/src/main/java/hudson/plugins/git/GitChangeSet.java
@@ -368,7 +368,7 @@ public String getComment() {
     public String getCommentAnnotated() {
         MarkupText markup = new MarkupText(getComment());
         for (ChangeLogAnnotator a : ChangeLogAnnotator.all())
-            a.annotate(getParent().build,this,markup);
+            a.annotate(getParent().getRun(), this, markup);
 
         return markup.toString(false);
     }

diff --git a/src/main/java/hudson/plugins/git/GitChangeSetList.java b/src/main/java/hudson/plugins/git/GitChangeSetList.java
@@ -1,7 +1,8 @@
 package hudson.plugins.git;
 
-import hudson.model.AbstractBuild;
+import hudson.model.Run;
 import hudson.scm.ChangeLogSet;
+import hudson.scm.RepositoryBrowser;
 import org.kohsuke.stapler.export.Exported;
 
 import java.util.Collections;
@@ -16,8 +17,8 @@
 public class GitChangeSetList extends ChangeLogSet<GitChangeSet> {
     private final List<GitChangeSet> changeSets;
 
-    /*package*/ GitChangeSetList(AbstractBuild build, List<GitChangeSet> logs) {
-        super(build);
+    /*package*/ GitChangeSetList(Run build, RepositoryBrowser<?> browser, List<GitChangeSet> logs) {
+        super(build, browser);
         Collections.reverse(logs);  // put new things first
         this.changeSets = Collections.unmodifiableList(logs);
         for (GitChangeSet log : logs)

diff --git a/src/main/java/hudson/plugins/git/GitPublisher.java b/src/main/java/hudson/plugins/git/GitPublisher.java
@@ -198,7 +198,7 @@ public boolean perform(AbstractBuild<?, ?> build,
         else {
             EnvVars environment = build.getEnvironment(listener);
 
-            final GitClient git  = gitSCM.createClient(listener,environment,build);
+            final GitClient git  = gitSCM.createClient(listener, environment, build, build.getWorkspace());
 
             // If we're pushing the merge back...
             if (pushMerge) {