Remove the jakarta-oro regex engine because:.
- it is retired since 2010-09-01 [1] and the use of regex feature from java is encouraged [2].
- Ant also considers that the Java's built-in regex package is likely the best choice going forward. [3]
- Built-in regex package is available in Java since 1.4 (Feb 2002) [4].
This has been discussed in [5] and the consensus was to upgrade and simplify our framework.
According to my testing, the doc generated with the built-in parser or the oro parser are identical. (tested on Ubuntu 18.10, OpenJDK 1.8.0)
[1]: https://attic.apache.org/projects/jakarta-oro.html
[2]: http://jakarta.apache.org/oro/
[3]: https://ant.apache.org/manual/Types/regexp.html#implementation
[4]: https://en.wikipedia.org/wiki/Java_version_history#J2SE_1.4
[5]: https://lists.apache.org/thread.html/305487e28daff15b4f16e876b8fe56ba3ca95fd39853cf26b7170d1d@%3Cdocs.httpd.apache.org%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/docs-build/trunk@1853689 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.bat b/build.bat
index e2008fa..4444a86 100644
--- a/build.bat
+++ b/build.bat
@@ -46,9 +46,6 @@
rem set classpath
set CLASSPATH=lib
-rem set regexp engine
-set REGEXP=-Dant.regexp.regexpimpl=org.apache.tools.ant.util.regexp.JakartaOroRegexp
-
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_ANT_HOME=%~dp0.
@@ -98,7 +95,7 @@
echo.
:runAnt
-"%_JAVACMD%" %ANT_OPTS% -Xbootclasspath/p:"%LOCALCLASSPATH%" -classpath "%LOCALCLASSPATH%" %REGEXP% "-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -Xbootclasspath/p:"%LOCALCLASSPATH%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
:end
set LOCALCLASSPATH=
diff --git a/build.sh b/build.sh
index 0c551e4..eab06f6 100755
--- a/build.sh
+++ b/build.sh
@@ -34,9 +34,6 @@
# lower down logger verbosity
ANT_ARGS="-logger org.apache.tools.ant.NoBannerLogger $ANT_ARGS"
-# set regexp engine
-ANT_ARGS="-Dant.regexp.regexpimpl=org.apache.tools.ant.util.regexp.JakartaOroRegexp $ANT_ARGS"
-
# raise heap/stack size...
ANT_OPTS="-Xss1024k -Xmx256m -mx256m"
diff --git a/lib/LICENSE b/lib/LICENSE
index 2dbe97f..a0ac298 100644
--- a/lib/LICENSE
+++ b/lib/LICENSE
@@ -2,7 +2,7 @@
allmodules.pl, DocUtil.pm, metafile.pl, ant.jar, ant-bootstrap.jar,
-ant-apache-oro.jar, ant-launcher.jar, ant-nodeps.jar, ant-trax.jar,
+ant-launcher.jar, ant-nodeps.jar, ant-trax.jar,
xercesImpl.jar, xml-apis.jar, ../build.xml, ../deps.xml, ../prereq.xml,
(derived from ant 1.5.3: lcp.bat, ../build.sh, ../build.bat):
@@ -235,63 +235,6 @@
*/
-jakarta-oro.jar:
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their
- * name, without prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-
xalan.jar:
/*
diff --git a/lib/README b/lib/README
index d7736d4..75bc062 100644
--- a/lib/README
+++ b/lib/README
@@ -7,7 +7,6 @@
Description: maintenance script for mod/allmodules.xml*
ant.jar
-ant-apache-oro.jar
ant-bootstrap.jar
ant-launcher.jar
ant-nodeps.jar
@@ -26,10 +25,6 @@
metafile.pl
Description: maintenance script for *.xml.meta files
-jakarta-oro.jar
- Description: Regex engine (and more), Version 2.0.8
- URL: http://jakarta.apache.org/oro/
-
xalan.jar
serializer.jar
Description: xalan (xslt processor), version 2.7.1 + patch
