--- a/components/ant/Makefile Wed Jan 27 12:14:36 2016 -0800
+++ b/components/ant/Makefile Tue Jan 26 04:44:35 2016 -0800
@@ -20,23 +20,23 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= ant
-COMPONENT_VERSION= 1.9.3
+COMPONENT_VERSION= 1.9.6
COMPONENT_PROJECT_URL= http://ant.apache.org/
COMPONENT_SRC_NAME= apache-ant
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-src.tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365
+ sha256:2ad98dd3a4805452e546e0f5b682360370ae11692a2157fff8ec6d177c957123
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/ant/source/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/ant
-TPNO= 16382
+TPNO= 25967
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/justmake.mk
@@ -78,5 +78,7 @@
test: $(TEST_32)
+REQUIRED_PACKAGES += developer/java/junit
+REQUIRED_PACKAGES += developer/parser/antlr-2
REQUIRED_PACKAGES += runtime/perl-512
REQUIRED_PACKAGES += shell/ksh93
--- a/components/ant/ant.license Wed Jan 27 12:14:36 2016 -0800
+++ b/components/ant/ant.license Tue Jan 26 04:44:35 2016 -0800
@@ -1,18 +1,18 @@
-File NOTICE:
----------------------------------------------------
+Apache Ant
+Copyright 1999-2015 The Apache Software Foundation
- Apache Ant
- Copyright 1999-2012 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
- The <sync> task is based on code Copyright (c) 2002, Landmark
- Graphics Corp that has been kindly donated to the Apache Software
- Foundation.
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software
+Foundation.
The following applies to all products licensed under the Apache 2.0 License:
You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
-
+
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also reproduced below.
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,8 @@
See the License for the specific language governing permissions and limitations under the License.
-Apache License
+/*
+ * Apache License
* Version 2.0, January 2004
* http://www.apache.org/licenses/
*
@@ -223,7 +224,7 @@
* limitations under the License.
*/
-W3C� SOFTWARE NOTICE AND LICENSE
+W3C® SOFTWARE NOTICE AND LICENSE
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
This work (and included software, documentation such as READMEs, or other
@@ -291,5 +292,3 @@
David Megginson, [email protected]
2000-05-05
----------------------------------------------------
-
--- a/components/ant/ant.p5m Wed Jan 27 12:14:36 2016 -0800
+++ b/components/ant/ant.p5m Tue Jan 26 04:44:35 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -47,12 +47,14 @@
link path=usr/sfw/bin/complete-ant-cmd.pl target=../../bin/complete-ant-cmd.pl
link path=usr/sfw/bin/runant.pl target=../../bin/runant.pl
link path=usr/sfw/lib/ant target=../../share/lib/ant
+file path=usr/share/doc/ant/CONTRIBUTORS
file path=usr/share/doc/ant/INSTALL
file path=usr/share/doc/ant/KEYS
file path=usr/share/doc/ant/LICENSE
file path=usr/share/doc/ant/NOTICE
file path=usr/share/doc/ant/README
file path=usr/share/doc/ant/WHATSNEW
+file path=usr/share/doc/ant/contributors.xml
file path=usr/share/doc/ant/fetch.xml
file path=usr/share/doc/ant/get-m2.xml
file path=usr/share/doc/ant/manual/Integration/anttool1.gif
@@ -229,6 +231,7 @@
file path=usr/share/doc/ant/manual/Types/filterchain.html
file path=usr/share/doc/ant/manual/Types/filterset.html
file path=usr/share/doc/ant/manual/Types/mapper.html
+file path=usr/share/doc/ant/manual/Types/multirootfileset.html
file path=usr/share/doc/ant/manual/Types/namespace.html
file path=usr/share/doc/ant/manual/Types/patternset.html
file path=usr/share/doc/ant/manual/Types/permissions.html
@@ -1217,6 +1220,8 @@
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.ClassLoaderWithFlag.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractClasspathResource.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AllButFirst.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/AllButLast.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Appendable.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ArchiveResource.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Archives.html
@@ -1242,6 +1247,8 @@
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/LogOutputResource.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/MappedResource.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/MappedResourceCollection.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/MultiRootFileSet.SetType.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/MultiRootFileSet.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/PropertyResource.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ResourceDecorator.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ResourceList.html
@@ -1389,12 +1396,14 @@
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/MergingMapper.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/OutputStreamFunneler.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ProcessUtil.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PropertyOutputStream.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ProxySetup.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReaderInputStream.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectUtil.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectWrapper.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.ReadOnlyTargetFileException.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.ResourceSelectorProvider.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.html
file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RetryHandler.html
@@ -1525,6 +1534,7 @@
file path=usr/share/doc/ant/manual/api/overview-summary.html
file path=usr/share/doc/ant/manual/api/overview-tree.html
file path=usr/share/doc/ant/manual/api/package-list
+file path=usr/share/doc/ant/manual/api/script.js
file path=usr/share/doc/ant/manual/api/serialized-form.html
file path=usr/share/doc/ant/manual/api/stylesheet.css
file path=usr/share/doc/ant/manual/argumentprocessor.html
@@ -1554,7 +1564,6 @@
file path=usr/share/doc/ant/manual/proxy.html
file path=usr/share/doc/ant/manual/running.html
file path=usr/share/doc/ant/manual/runninglist.html
-file path=usr/share/doc/ant/manual/stylesheets/antmanual.css
file path=usr/share/doc/ant/manual/stylesheets/style.css
file path=usr/share/doc/ant/manual/sysclasspath.html
file path=usr/share/doc/ant/manual/targets.html
@@ -1569,6 +1578,7 @@
file path=usr/share/doc/ant/manual/tutorials.html
file path=usr/share/doc/ant/manual/using.html
file path=usr/share/doc/ant/manual/usinglist.html
+file path=usr/share/doc/ant/patch.xml
file path=usr/share/lib/ant/README
file path=usr/share/lib/ant/ant-antlr.jar
file path=usr/share/lib/ant/ant-antlr.pom
@@ -1617,6 +1627,7 @@
file path=usr/share/lib/ant/ant.jar
file path=usr/share/lib/ant/ant.pom
file path=usr/share/lib/ant/changelog.xsl
+file path=usr/share/lib/ant/checkstyle/checkstyle-frames-sortby-check.xsl
file path=usr/share/lib/ant/checkstyle/checkstyle-frames.xsl
file path=usr/share/lib/ant/checkstyle/checkstyle-text.xsl
file path=usr/share/lib/ant/checkstyle/checkstyle-xdoc.xsl
--- a/components/ant/patches/build_xml.patch Wed Jan 27 12:14:36 2016 -0800
+++ b/components/ant/patches/build_xml.patch Tue Jan 26 04:44:35 2016 -0800
@@ -9,13 +9,3 @@
<fileset dir="${basedir}">
<include name="README"/>
<include name="INSTALL"/>
---- apache-ant-1.8.4/build.xml.orig Thu May 29 12:28:28 2014
-+++ apache-ant-1.8.4/build.xml Thu May 29 12:29:31 2014
-@@ -1464,6 +1464,7 @@
- windowtitle="${Name} API"
- doctitle="${Name}"
- failonerror="true"
-+ additionalparam="-Xdoclint:none"
- verbose="${javadoc.verbose}">
-
- <packageset dir="${java.dir}"/>