From c3f86551a97f6b984d6d100588a70615277d40b4 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Thu, 21 Dec 2017 19:12:47 +0100
Subject: [PATCH] assertLogNotContaining missing in Ant 1.7; sync ivy.xml and
 pom.xml

---
 ivy.xml              |  7 +++++--
 project-template.pom | 21 ++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 79d4b56..cc8dcbc 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -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>
diff --git a/project-template.pom b/project-template.pom
index fafceca..0f860e1 100644
--- a/project-template.pom
+++ b/project-template.pom
@@ -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>