This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 81c2009ca5 Revert "Work around javadoc bug to provide locale in two
separate ways"
81c2009ca5 is described below
commit 81c2009ca56520fbaed716677e5cb6b929b7b0e4
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Wed Apr 9 09:47:57 2025 -0400
Revert "Work around javadoc bug to provide locale in two separate ways"
This reverts commit b770297e6cd96220e253079aee26fa2ff5b85aeb.
This workaround for javadoc locale is not necessary in any of the versions
we currently use for releases.
---
build.xml | 41 -----------------------------------------
1 file changed, 41 deletions(-)
diff --git a/build.xml b/build.xml
index ca0d2828bf..14400e858a 100644
--- a/build.xml
+++ b/build.xml
@@ -2241,33 +2241,6 @@
<target name="javadoc" depends="dist-source,download-compile"
description="Create the Tomcat javadoc" >
- <!-- Due to https://bugs.openjdk.org/browse/JDK-8222793
- we will need to provide the locale to the javadoc
- command in two ways: via "locale" attribute
- (which becomes "-locale [locale]" on the command-line)
- and also via "<arg>-Juser.language</arg>" and one for country.
-
- In order to simplify things for users, we will pick-apart the
- javadoc.locale property into its separate components, here.
- -->
- <loadresource property="javadoc.language">
- <concat>${javadoc.locale}</concat>
- <filterchain>
- <replaceregex pattern="_.*" replace="" />
- </filterchain>
- </loadresource>
- <loadresource property="javadoc.country">
- <concat>${javadoc.locale}</concat>
- <filterchain>
- <replaceregex pattern="[^_]*" replace="" />
- <replaceregex pattern="^\$.*" replace="" />
- </filterchain>
- </loadresource>
-
- <!-- Establish some defaults in case the above didn't work or resulted in
empty properties -->
- <property name="javadoc.language" value="en" />
- <property name="javadoc.country" value="" />
-
<javadoc packagenames="jakarta.annotation.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/annotationapi"
@@ -2288,8 +2261,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2316,8 +2287,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2343,8 +2312,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2370,8 +2337,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2397,8 +2362,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2423,8 +2386,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -2449,8 +2410,6 @@
maxmemory="512m"
failonerror="${javadoc.failonerror}"
failonwarning="${javadoc.failonwarning}">
- <arg value="-J-Duser.language=${javadoc.language}" />
- <arg value="-J-Duser.country=${javadoc.country}" />
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
