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

apache · Mar 8, 2020 · 548026c · 548026c
1 parent c37f13d
commit 548026c
Show file tree

Hide file tree

Showing 13 changed files with 341 additions and 532 deletions.
diff --git a/ReleaseInstructions b/ReleaseInstructions
@@ -126,7 +126,7 @@ Note: This document was adapted from the one created in the context of
 
 10. Sign the distribution files
 
-    There are two aproaches, one uses Ant and a few libraries, the
+    There are two approaches, one uses Ant and a few libraries, the
     other requires you to run gnupg manually. The first version didn't
     work for Stefan when he built the first release candidate for
     1.9.7.

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
@@ -1070,7 +1070,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">
@@ -1185,7 +1185,7 @@
         <include name="optional/junit*.jar"/>
         <include name="optional/hamcrest*.jar"/>
         <include name="README"/>
-        <include name="libraries.properties"/>
+        <include name="ivy.xml"/>
       </fileset>
     </copy>