Merge pull request #288 from abayer/use-new-git-version

Moving to git plugin 2.4.1 and enabling test for JENKINS-29326
jenkinsci · Jan 4, 2016 · e0e457d · e0e457d
2 parents 7b4e1f0 + 1be577d
commit e0e457d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/GitStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/GitStepTest.java
@@ -168,8 +168,6 @@ public class GitStepTest {
         assertFalse(iterator.hasNext());
     }
 
-    // TODO: Remove this Ignore after git plugin 2.4.1 is released.
-    @Ignore("This test is currently disabled until the fix for JENKINS-29326 is released in the git plugin 2.4.1 or later.")
     @Issue("JENKINS-29326")
     @Test
     public void identicalGitSCMs() throws Exception {

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>git</artifactId>
-                <version>2.3</version>
+                <version>2.4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>