Let’s use Ivy (properly!) and drop Maven Ant tasks + Commons OpenPGP

apache · Dec 31, 2017 · bf2e2d4 · bf2e2d4
1 parent de21044
commit bf2e2d4
Show file tree

Hide file tree

Showing 12 changed files with 283 additions and 558 deletions.
diff --git a/get-m2.xml → attic/get-m2.xml b/get-m2.xml → attic/get-m2.xml
diff --git a/lib/libraries.properties → attic/libraries.properties b/lib/libraries.properties → attic/libraries.properties
diff --git a/release/signit.xml → attic/signit.xml b/release/signit.xml → attic/signit.xml
diff --git a/build.xml b/build.xml
@@ -32,7 +32,7 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
-  <!-- this is the groupId of ant in the Maven repository -->
+  <!-- this is the groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
   <property name="project.version" value="1.10.2alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
@@ -974,7 +974,7 @@
     <mkdir dir="${dist.etc}"/>
 
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
-    <copy todir="${dist.lib}" file="${lib.dir}/libraries.properties"/>
+    <copy todir="${dist.lib}" file="${basedir}/ivy.xml"/>
 
     <copy todir="${dist.lib}">
       <fileset dir="${src.dir}/etc/poms">
@@ -1092,7 +1092,7 @@
         <include name="optional/junit*.jar"/>
         <include name="optional/hamcrest*.jar"/>
         <include name="README"/>
-        <include name="libraries.properties"/>
+        <include name="ivy.xml"/>
       </fileset>
     </copy>