diff --git a/manual/Tasks/perforce.html b/manual/Tasks/perforce.html index 2d84df00b..04be0e279 100644 --- a/manual/Tasks/perforce.html +++ b/manual/Tasks/perforce.html @@ -44,7 +44,7 @@ However, the addition of new p4 commands is a pretty simple task (see the source Although it is possible to use these commands on the desktop, they were primarily intended to be used by automated build systems.

-

Note: These tasks require the oro regular +

Note: These tasks require the oro regular expression package. See library dependencies for the precise version required. You will also need the Perforce client executable (p4 or p4.exe but not p4win.exe) in your path. diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html index bdad77c18..d84de62e4 100644 --- a/manual/Types/mapper.html +++ b/manual/Types/mapper.html @@ -374,7 +374,7 @@ of org.apache.tools.ant.util.regexp.RegexpMatcher that hides the specifics of the library. Since Ant 1.8.0 Ant requires Java 1.4 to run, so the implementation based on the java.util.regex package will always be available. - You can still use Jakarta ORO or Jakarta Regex instead if your + You can still use the now retired Jakarta ORO or Jakarta Regex instead if your provide the corresponding jar in your CLASSPATH.

For information about using the java.util.regex package, -jakarta-regexp -and jakarta-ORO, +jakarta-regexp +and jakarta-ORO, See installation dependencies concerning the supporting libraries.

@@ -91,7 +91,9 @@ both Unix and Windows platforms before you rely on it.

  • JDK 1.4 uses '\n', '\r\n', '\u0085', '\u2028', '\u2029' as a default but is configured in the wrapper to use only '\n' (UNIX_LINE)
    • -We strongly recommend that you use Jakarta Oro. +We used to recommend that you use Jakarta ORO but since its + development has been retired Java's built-in regex package is likely + the best choice going forward.

    Usage

    The following tasks and types use the Regexp type : diff --git a/manual/install.html b/manual/install.html index 04c974c6e..3bb805aa8 100644 --- a/manual/install.html +++ b/manual/install.html @@ -842,14 +842,14 @@ Installing Ant / Optional Tasks section above.

    jakarta-regexp-1.3.jar regexp type with mappers (if you do not wish to use java.util.regex) - http://jakarta.apache.org/regexp/ + http://attic.apache.org/projects/jakarta-regexp.html jakarta-oro-2.0.8.jar regexp type with mappers (if you do not wish to use java.util.regex) and the Perforce tasks
    To use the FTP task, you need jakarta-oro 2.0.8 or later, and commons-net - http://jakarta.apache.org/oro/ + http://attic.apache.org/projects/jakarta-oro.html junit.jar