natas_hw
/
ant-antlibs-antunit
mirror of https://github.com/apache/ant-antlibs-antunit
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assertLogNotContaining missing in Ant 1.7; sync ivy.xml and pom.xml

This commit is contained in:
Gintas Grigelionis 2017-12-21 19:12:47 +01:00
parent 7a6103ee50
commit c3f86551a9
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ivy.xml
View File

@ -35,7 +35,8 @@
</info>
<configurations>
<conf name="default" description="full antlib with all dependencies"/>
<conf name="test" description="dependencies used for junit testing the antlib" visibility="private" />
<conf name="provided" description="Ant must be present at runtime"/>
<conf name="test" description="dependencies used for JUnit tests of the antlib" transitive="false" visibility="private"/>
</configurations>
<publications xmlns:e="urn:ant.apache.org:ivy-extras">
<artifact name="${artifact.name}" type="pom" ext="pom"/>
@ -56,6 +57,8 @@
e:classifier="ivy"/>
</publications>
<dependencies>
<dependency org="junit" name="junit" rev="4.11" conf="default"/>
<dependency org="junit" name="junit" rev="4.12" conf="default"/>
<dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="provided->default"/>
<dependency org="org.apache.ant" name="ant-testutil" rev="1.8.1" conf="test->default"/>
</dependencies>
</ivy-module>

21
project-template.pom
View File

@ -86,23 +86,22 @@
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.4</version>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.7.1</version>
<scope>runtime</scope>
<version>1.8.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
<version>1.8.1</version>
<scope>test</scope>
</dependency>
<!--
<dependency> <groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId> <version>1.7.1</version>
<scope>test</scope> </dependency>
-->
</dependencies>
</project>