Commit 242174c5 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 1.9.10

parent ccd26be1
......@@ -125,6 +125,7 @@ Erik Hatcher
Erik Langenbach
Erik Meade
Ernst de Haan
Francesco Steccanella
Frank Harnack
Frank Somers
Frank Zeyda
......@@ -134,6 +135,7 @@ Frederic Lavigne
Gary S. Weaver
Gautam Guliani
Gene-Sung Chung
George Bateman
Georges-Etienne Legendre
Gero Vermaas
Gerrit Riessen
......@@ -161,6 +163,7 @@ Issa Gorissen
Ivan Ivanov
J Bleijenbergh
Jack J. Woehr
Jaikiran Pai
James Duncan Davidson
Jan Cumps
Jan Matèrne
......@@ -213,6 +216,7 @@ Kevin Z Grey
Kim Hansen
Kirk Wylie
Kristian Rosenvold
Kui Liu
Kyle Adams
Lajos Veres
Larry Shatzer
......@@ -232,6 +236,7 @@ Mariusz Nowostawski
Mark A. Ziesemer
Mark DeLaFranier
Mark Hecker
Mark Niggemann
Mark R. Diggory
Mark Salter
Markus Kahl
......@@ -320,6 +325,7 @@ Ray Waldin
Reinhard Pointner
Remie Bolte
René Krell
Reudismam Rolim
Richard Evans
Richard Steele
Rick Beton
......
Apache Ant
Copyright 1999-2017 The Apache Software Foundation
Copyright 1999-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
......
This diff is collapsed.
......@@ -16,33 +16,38 @@
# limitations under the License.
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
cygwin=false
darwin=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
CYGWIN*)
cygwin=true
;;
Darwin*)
darwin=true
if [ -z "$JAVA_HOME" ]; then
if [ -x '/usr/libexec/java_home' ]; then
JAVA_HOME=`/usr/libexec/java_home`
elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi
fi
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
if $cygwin; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# You will need to specify JAVA_HOME if compiling with 1.2 or later.
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
if [ -n "$JAVA_HOME" ]; then
if [ -f "$JAVA_HOME/lib/tools.jar" ]; then
CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
fi
if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
if [ -f "$JAVA_HOME/lib/classes.zip" ]; then
CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/classes.zip
fi
else
......@@ -55,20 +60,20 @@ fi
# IBM's JDK on AIX uses strange locations for the executables:
# JAVA_HOME/jre/sh for java and rmid
# JAVA_HOME/sh for javac and rmic
if [ -z "$JAVAC" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/sh/javac" ] ; then
JAVAC=${JAVA_HOME}/sh/javac;
if [ -z "$JAVAC" ]; then
if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/sh/javac" ]; then
JAVAC=${JAVA_HOME}/sh/javac
else
JAVAC=${JAVA_HOME}/bin/javac;
JAVAC=${JAVA_HOME}/bin/javac
fi
else
JAVAC=javac
fi
fi
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
if [ -z "$JAVACMD" ]; then
if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
......@@ -78,7 +83,7 @@ if [ -z "$JAVACMD" ] ; then
fi
fi
if [ ! -x "$JAVACMD" ] ; then
if [ ! -x "$JAVACMD" ]; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
exit
......@@ -89,22 +94,21 @@ export ANT_HOME
echo ... Bootstrapping Ant Distribution
if [ -d "bootstrap" ] ; then
if [ -d "bootstrap" ]; then
rm -r bootstrap
fi
if [ -d "build" ] ; then
if [ -d "build" ]; then
rm -r build
fi
DIRLIBS=lib/optional/*.jar
for i in ${DIRLIBS}
do
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
if [ "$i" != "${DIRLIBS}" ] ; then
CLASSPATH=$CLASSPATH:"$i"
fi
for i in ${DIRLIBS}; do
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
if [ "$i" != "${DIRLIBS}" ]; then
CLASSPATH=$CLASSPATH:"$i"
fi
done
TOOLS=src/main/org/apache/tools
......@@ -126,14 +130,14 @@ mkdir -p bin
echo ... Compiling Ant Classes
"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
${TOOLS}/ant/property/*.java \
${TOOLS}/ant/types/*.java \
${TOOLS}/ant/types/resources/*.java \
${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \
${TOOLS}/ant/taskdefs/compilers/*.java \
${TOOLS}/ant/taskdefs/condition/*.java
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
${TOOLS}/ant/property/*.java \
${TOOLS}/ant/types/*.java \
${TOOLS}/ant/types/resources/*.java \
${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \
${TOOLS}/ant/taskdefs/compilers/*.java \
${TOOLS}/ant/taskdefs/condition/*.java
ret=$?
if [ $ret != 0 ]; then
echo ... Failed compiling Ant classes !
......@@ -143,9 +147,9 @@ fi
echo ... Copying Required Files
cp src/main/org/apache/tools/ant/taskdefs/defaults.properties \
${CLASSDIR}/org/apache/tools/ant/taskdefs
${CLASSDIR}/org/apache/tools/ant/taskdefs
cp src/main/org/apache/tools/ant/types/defaults.properties \
${CLASSDIR}/org/apache/tools/ant/types
${CLASSDIR}/org/apache/tools/ant/types
cp src/script/antRun bin
chmod +x bin/antRun
......@@ -158,7 +162,6 @@ if [ $ret != 0 ]; then
exit $ret
fi
echo ... Cleaning Up Build Directories
rm -rf ${CLASSDIR}
......
......@@ -16,37 +16,44 @@
# limitations under the License.
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
cygwin=false
darwin=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
if [ -z "$JAVA_HOME" ] ; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
CYGWIN*)
cygwin=true
;;
Darwin*)
darwin=true
if [ -z "$JAVA_HOME" ]; then
if [ -x '/usr/libexec/java_home' ]; then
JAVA_HOME=`/usr/libexec/java_home`
elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
fi
fi
;;
esac
REALANTHOME=$ANT_HOME
if [ -z "$PWD" ]; then
ANT_HOME=./bootstrap
ANT_HOME=./bootstrap
else
ANT_HOME="$PWD"/bootstrap
ANT_HOME="$PWD"/bootstrap
fi
export ANT_HOME
if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun; then
/bin/sh ./bootstrap.sh
fi
if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun ; then
if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/bin/antRun; then
echo Bootstrap FAILED
exit 1
fi
if [ "$REALANTHOME" != "" ] ; then
if [ "$REALANTHOME" != "" ]; then
if $cygwin; then
REALANTHOME=`cygpath --windows "$REALANTHOME"`
REALANTHOME=`cygpath --windows "$REALANTHOME"`
fi
ANT_INSTALL="-Dant.install=$REALANTHOME"
else
......@@ -54,4 +61,3 @@ else
fi
bootstrap/bin/ant -nouserlib -lib lib/optional "$ANT_INSTALL" $*
This diff is collapsed.
......@@ -523,6 +523,10 @@
<first>Ernst</first>
<last>de Haan</last>
</name>
<name>
<first>Francesco</first>
<last>Steccanella</last>
</name>
<name>
<first>Frank</first>
<last>Harnack</last>
......@@ -560,6 +564,10 @@
<first>Gene-Sung</first>
<last>Chung</last>
</name>
<name>
<first>George</first>
<last>Bateman</last>
</name>
<name>
<first>Georges-Etienne</first>
<last>Legendre</last>
......@@ -669,6 +677,10 @@
<middle>J.</middle>
<last>Woehr</last>
</name>
<name>
<first>Jaikiran</first>
<last>Pai</last>
</name>
<name>
<first>James</first>
<middle>Duncan</middle>
......@@ -879,6 +891,10 @@
<first>Kristian</first>
<last>Rosenvold</last>
</name>
<name>
<first>Kui</first>
<last>Liu</last>
</name>
<name>
<first>Kyle</first>
<last>Adams</last>
......@@ -955,6 +971,10 @@
<middle>R.</middle>
<last>Diggory</last>
</name>
<name>
<first>Mark</first>
<last>Niggemann</last>
</name>
<name>
<first>Mark</first>
<middle>A.</middle>
......@@ -1293,6 +1313,10 @@
<first>René</first>
<last>Krell</last>
</name>
<name>
<first>Reudismam</first>
<last>Rolim</last>
</name>
<name>
<first>Richard</first>
<last>Evans</last>
......
This diff is collapsed.
......@@ -13,53 +13,60 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#this file declares the libraries for use in
#a given release of the components
# This file declares the libraries for use in a given release of the components
#if you change this, change the checksum to match
m2.version=2.0.4
m2.url=http\://repo1.maven.org/maven2
m2.artifact-name=maven-artifact-ant
m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar
# If you change this, change the checksum to match
m2.version=2.1.3
m2.url=https://archive.apache.org/dist/maven/ant-tasks
m2.artifact-name=maven-ant-tasks
m2.jar.name=${m2.artifact-name}-${m2.version}.jar
#this is the URL of the antlib library, that is pulled down for everything else.
m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name}
m2.antlib.url=${m2.url}/${m2.version}/binaries/${m2.jar.name}
#this is the sha1 checksum of the artifact
m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc
# Repository to use by default for fetching dependencies.
m2.repo=http://repo1.maven.org/maven2/
#versions of different libraries. Please keep in alphabetical order, except
#when a specific dependency forces them to be out-of-order
# Versions of different libraries. Please keep in alphabetical order, except
# when a specific dependency forces them to be out-of-order
ivy.version=2.4.0
activation.version=1.1.1
ant-antunit.version=1.3
antlr.version=2.7.7
bcel.version=5.1
bsf.version=2.4.0
bsh.version=2.0b4
bsh-core.version=${bsh.version}
commons-net.version=1.4.1
# Later versions are built with Java 6
commons-net.version=2.2
commons-logging.version=1.1
commons-logging-api.version=${commons-logging.version}
hamcrest-core.version=1.3
hamcrest-library.version=${hamcrest-core.version}
jai-core.version=1.1.3
jai-codec.version=1.1.3
jakarta-regexp.version=1.4
# Later versions of Tomcat provide a jspc task
jasper-compiler.version=4.1.36
jasper-runtime.version=${jasper-compiler.version}
# Later versions are built with Java 7
javax.mail-api.version=1.5.6
jdepend.version=2.9.1
jruby.version=0.9.8
junit.version=4.11
jsch.version=0.1.50
jython.version=2.1
#log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
# Later versions are built with Java 7
jruby.version=1.6.8
junit.version