Skip to content

Commit

Permalink
[JENKINS-33874] Move to 1.609.3 (because of JENKINS-28840)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Rodriguez committed May 18, 2016
1 parent 8e4ca0f commit daf453d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.8</version>
<version>2.9</version>
</parent>

<licenses>
Expand All @@ -22,7 +22,7 @@
<url>http://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin</url>

<properties>
<jenkins.version>1.609</jenkins.version>
<jenkins.version>1.609.3</jenkins.version>
<java.level>6</java.level>
<!-- Use the same configuration than before. -->
<concurrency>2</concurrency>
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/hudson/plugins/git/AbstractGitProject.java
View file
Expand Up @@ -27,7 +27,6 @@
import hudson.matrix.MatrixBuild;
import hudson.matrix.MatrixProject;
import hudson.model.AbstractBuild;
import hudson.model.Cause;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.Node;
Expand Down Expand Up @@ -205,7 +204,7 @@ protected FreeStyleProject setupProject(List<UserRemoteConfig> repos, List<Branc
}

protected FreeStyleBuild build(final FreeStyleProject project, final Result expectedResult, final String... expectedNewlyCommittedFiles) throws Exception {
final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final FreeStyleBuild build = project.scheduleBuild2(0).get();
for (final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
}
Expand All @@ -216,7 +215,7 @@ protected FreeStyleBuild build(final FreeStyleProject project, final Result expe
}

protected FreeStyleBuild build(final FreeStyleProject project, final String parentDir, final Result expectedResult, final String... expectedNewlyCommittedFiles) throws Exception {
final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final FreeStyleBuild build = project.scheduleBuild2(0).get();
for (final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(build.getWorkspace().child(parentDir).child(expectedNewlyCommittedFile).exists());
}
Expand All @@ -227,7 +226,7 @@ protected FreeStyleBuild build(final FreeStyleProject project, final String pare
}

protected MatrixBuild build(final MatrixProject project, final Result expectedResult, final String... expectedNewlyCommittedFiles) throws Exception {
final MatrixBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final MatrixBuild build = project.scheduleBuild2(0).get();
for (final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
}
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/hudson/plugins/git/AbstractGitTestCase.java
View file
Expand Up @@ -9,7 +9,6 @@
import hudson.model.Result;
import hudson.model.TaskListener;
import hudson.model.AbstractBuild;
import hudson.model.Cause;
import hudson.model.FreeStyleProject;
import hudson.model.Node;
import hudson.plugins.git.extensions.GitSCMExtension;
Expand Down Expand Up @@ -220,7 +219,7 @@ protected FreeStyleProject setupSimpleProject(String branchString) throws Except
}

protected FreeStyleBuild build(final FreeStyleProject project, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final FreeStyleBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getLog());
for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
Expand All @@ -232,7 +231,7 @@ protected FreeStyleBuild build(final FreeStyleProject project, final Result expe
}

protected FreeStyleBuild build(final FreeStyleProject project, final String parentDir, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
final FreeStyleBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final FreeStyleBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getLog());
for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(build.getWorkspace().child(parentDir).child(expectedNewlyCommittedFile).exists());
Expand All @@ -244,7 +243,7 @@ protected FreeStyleBuild build(final FreeStyleProject project, final String pare
}

protected MatrixBuild build(final MatrixProject project, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
final MatrixBuild build = project.scheduleBuild2(0, new Cause.UserCause()).get();
final MatrixBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getLog());
for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
assertTrue(expectedNewlyCommittedFile + " file not found in workspace", build.getWorkspace().child(expectedNewlyCommittedFile).exists());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/hudson/plugins/git/RevisionParameterActionTest.java
View file
Expand Up @@ -192,7 +192,7 @@ public void testProvidingRevision() throws Exception {
commitNewFile(commitFile2);

// create second build and set revision parameter using r1
FreeStyleBuild b2 = p1.scheduleBuild2(0, new Cause.UserCause(),
FreeStyleBuild b2 = p1.scheduleBuild2(0, new Cause.UserIdCause(),
Collections.singletonList(new RevisionParameterAction(r1))).get();

// Check revision built for b2 matches the r1 revision
Expand Down

0 comments on commit daf453d

Please sign in to comment.