#17: Replace Maven Ant Tasks - for some reason we have to repeat thin…

…gs in test.xml to make it work

ant-scripts/test.xml

@@ -54,15 +54,24 @@
             <and>
                 <isreference refid="classpath" />
                 <isreference refid="maven-resolver-ant-tasks.classpath" />
-                <isreference refid="resolver.repositories" />
-                <isreference refid="depsFromPom" />
                 <isset property="build.doc.dir" />
             </and>
         </condition>
 
         <fail unless="classpath.set" message="This project cannot be run stand-alone." />
 
-        <resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories">
+        <typedef resource="org/apache/maven/resolver/ant/antlib.xml" uri="antlib:org.apache.maven.resolver.ant" classpathref="maven-resolver-ant-tasks.classpath" />
+
+        <!-- redefine default Maven repo to be used with https -->
+        <resolver:remoterepos id="resolver.repositories.test">
+            <resolver:remoterepo url="https://repo1.maven.org/maven2/" />
+        </resolver:remoterepos>
+
+        <resolver:pom id="xlt.pom" file="pom.xml" />
+
+        <resolver:dependencies id="depsFromPom" pomRef="xlt.pom" />
+
+        <resolver:resolve dependenciesref="depsFromPom" remotereposref="resolver.repositories.test">
             <files refid="test.fileset" scopes="test" />
         </resolver:resolve>
 

build.xml

@@ -509,8 +509,6 @@
         <ant antfile="${test.build.file}" target="test.${action}" inheritall="false" inheritrefs="false">
             <reference refid="classpath" />
             <reference refid="maven-resolver-ant-tasks.classpath" />
-            <reference refid="resolver.repositories" />
-            <reference refid="depsFromPom" />
             <propertyset>
                 <propertyref name="build.doc.dir" />
             </propertyset>