[ant] branch master updated: package only the exact jars in lib/optional of source distribution

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new d11a653  package only the exact jars in lib/optional of source distribution
d11a653 is described below

commit d11a6536dd696e775e225b231bdf2eaf8e7a75ae
Author: Jaikiran Pai <ja...@apache.org>
AuthorDate: Wed Oct 13 09:18:19 2021 +0530

    package only the exact jars in lib/optional of source distribution
---
 build.xml                | 6 ++++--
 lib/libraries.properties | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 35ba766..fe0efac 100644
--- a/build.xml
+++ b/build.xml
@@ -1189,8 +1189,10 @@
 
     <copy todir="${src.dist.lib}">
       <fileset dir="${lib.dir}">
-        <include name="optional/junit*.jar"/>
-        <include name="optional/hamcrest*.jar"/>
+        <include name="optional/junit-3.8.2.jar"/>
+        <include name="optional/junit-4.13.1.jar"/>
+        <include name="optional/hamcrest-core-1.3.jar"/>
+        <include name="optional/hamcrest-library-1.3.jar"/>
         <include name="README"/>
         <include name="libraries.properties"/>
       </fileset>
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 9cfc168..ec53652 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -44,6 +44,9 @@ commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
 js.version=20.1.0
 js-scriptengine.version=${js.version}
+# Note - When updating the hamcrest versions here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct hamcrest jars
+# into the source distribution
 hamcrest-core.version=1.3
 hamcrest-library.version=${hamcrest-core.version}
 jai-core.version=1.1.3
@@ -55,6 +58,9 @@ jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
 jdepend.version=2.9.1
 jruby.version=1.6.8
+# Note - When updating the junit.version here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct junit 4.x jar
+# into the source distribution
 junit.version=4.13.1
 rhino.version=1.7.11
 junit-platform-launcher.version=1.2.0