Revert "Work around javadoc bug to provide locale in two separate ways"

This reverts commit b770297.

This workaround for javadoc locale is not necessary in any of the versions we currently use for releases.

Author: ChristopherSchultz

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}"/>