20294533 Update Ant to 1.9.4 release
authorJiri Kukacka <jiri.kukacka@oracle.com>
Thu, 01 Jan 2015 10:27:03 -0800
changeset 3867 e12ff6f7add3
parent 3865 10347aa825d2
child 3869 eb4c6284602f
20294533 Update Ant to 1.9.4 release 19925502 "gmake test" failures for ant
components/ant/Makefile
components/ant/ant.license
components/ant/ant.p5m
--- a/components/ant/Makefile	Thu Feb 26 10:02:54 2015 -0800
+++ b/components/ant/Makefile	Thu Jan 01 10:27:03 2015 -0800
@@ -26,17 +26,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ant
-COMPONENT_VERSION=	1.9.3
+COMPONENT_VERSION=	1.9.4
 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:ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/ant/source/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ant
 
-TPNO=			16382
+TPNO=			21446
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
--- a/components/ant/ant.license	Thu Feb 26 10:02:54 2015 -0800
+++ b/components/ant/ant.license	Thu Jan 01 10:27:03 2015 -0800
@@ -1,18 +1,18 @@
-File NOTICE:
----------------------------------------------------
+Apache Ant
+Copyright 1999-2014 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	Thu Feb 26 10:02:54 2015 -0800
+++ b/components/ant/ant.p5m	Thu Jan 01 10:27:03 2015 -0800
@@ -229,6 +229,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
@@ -1242,6 +1243,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 +1392,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