Skip to content
Permalink
Browse files
[JENKINS-44212] Bump baseline, and use latest parent pom
* Due to latest parent pom disabling test concurrency by default a small
change to tests was needed to make it work
  • Loading branch information
raul-arabaolaza committed May 15, 2017
1 parent 67dc9a1 commit b3f7b762aaef547d505ca03d8c5cd8d6e1474564
Showing with 8 additions and 5 deletions.
  1. +5 −5 pom.xml
  2. +3 −0 src/test/java/hudson/tasks/AntTest.java
10 pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.17</version>
<version>2.28</version>
<relativePath />
</parent>

@@ -28,10 +28,10 @@
</scm>

<properties>
<jenkins.version>1.596.1</jenkins.version>
<jenkins.version>1.609.3</jenkins.version>
<java.level>6</java.level>
</properties>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
@@ -57,7 +57,7 @@
</exclusions>
</dependency>
</dependencies>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
@@ -79,4 +79,4 @@
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>
</project>
@@ -46,6 +46,7 @@
import hudson.tasks.Ant.AntInstallation;
import hudson.tasks.Ant.AntInstallation.DescriptorImpl;
import hudson.tasks.Ant.AntInstaller;
import hudson.tasks._ant.AntTargetNote;
import hudson.tools.InstallSourceProperty;
import hudson.tools.ToolProperty;
import hudson.tools.ToolPropertyDescriptor;
@@ -401,6 +402,8 @@ private FreeStyleProject createSimpleAntProject(String targets, String ops, Stri
FreeStyleProject project = r.createFreeStyleProject();
project.setScm(new ExtractResourceSCM(getClass().getResource("sample-helloworld-ant.zip")));
project.getBuildersList().add(new Ant(targets, antName, ops, buildFile, properties));
//Make sure that state is the expected when running secuentially, other tests change this variable
AntTargetNote.ENABLED = true;
return project;
}

0 comments on commit b3f7b76

Please sign in to comment.