--- lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:09:05.493250593 +0200
+++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 12:22:01.033446015 +0200
@@ -88,7 +88,7 @@
     <property name="icu4j.resolved" value="true"/>
   </target>
 
-  <target name="unicode-data" depends="-resolve-icu4j,resolve-groovy">
+  <target name="unicode-data" depends="-resolve-icu4j">
     <groovy classpathref="icu4j.classpath" src="src/tools/groovy/generate-unicode-data.groovy"/>
     <fixcrlf file="${unicode-props-file}" encoding="UTF-8"/>
   </target>
--- lucene-8.5.0/build.xml	2020-04-06 11:43:38.337014365 +0200
+++ lucene-8.5.0/build.xml	2020-04-06 12:21:53.785406802 +0200
@@ -538,7 +538,7 @@
   </target>
 
   <!-- Override common-build.xml definition to check for the jar already being up-to-date -->
-  <target name="jar-core" depends="resolve-groovy,check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate">
+  <target name="jar-core" depends="check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate">
     <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
--- lucene-8.5.0/common-build.xml	2020-04-06 12:09:05.497250615 +0200
+++ lucene-8.5.0/common-build.xml	2020-04-06 12:20:32.720968275 +0200
@@ -625,12 +625,10 @@
     </jarify>
   </target>
   
-  <target name="-jar-core" depends="-mrjar-check" unless="has-mrjar-patched-files">
+  <target name="jar-core" depends="compile-core">
     <jarify/>
   </target>
   
-  <target name="jar-core" depends="-mrjar-core,-jar-core"/>
-
   <!-- Packaging targets: -->
   
   <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/>
@@ -1534,8 +1498,8 @@
     </taskdef>
   </target>
 
-  <target name="test" depends="clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/>
-  <target name="beast" depends="install-ant-contrib,clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/>
+  <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/>
+  <target name="beast" depends="install-ant-contrib,clover,compile-test,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/>
 
   <target name="test-nocompile" depends="-clover.disable,install-junit4-taskdef,-init-totals,-test,-check-totals"
           description="Only runs unit tests.  Jars are not downloaded; compilation is not updated; and Clover is not enabled."/>
@@ -1595,7 +1559,7 @@
   </target>
 
   <!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) -->
-  <target name="-beast" depends="resolve-groovy,install-ant-contrib">
+  <target name="-beast" depends="install-ant-contrib">
     <fail message="The Beast only works inside of individual modules (where 'junit.classpath' is defined)">
       <condition>
         <not><isreference refid="junit.classpath"/></not>
@@ -1606,7 +1570,7 @@
     <fail message="Fail baby fail" if="groovy.error"/>
   </target>
 
-  <target name="-check-totals" if="tests.totals.toplevel" depends="resolve-groovy">
+  <target name="-check-totals" if="tests.totals.toplevel">
     <!-- We are concluding a test pass at the outermost level. Sum up all executed tests. -->
     <groovy><![CDATA[
       import org.apache.tools.ant.BuildException;
@@ -1630,7 +1594,7 @@
   </target>
 
   <!-- The groovy dependency is wanted: this is done early before any test or any other submodule is ran, to prevent permgen errors! -->
-  <target name="-init-totals" unless="tests.totals.tmpfile" depends="resolve-groovy">
+  <target name="-init-totals" unless="tests.totals.tmpfile">
     <mkdir dir="${build.dir}" />
     <tempfile property="tests.totals.tmpfile"
               destdir="${build.dir}"
@@ -2505,7 +2459,7 @@
     </forbidden-apis>
   </target>
 
-  <target name="resolve-markdown" unless="markdown.loaded" depends="resolve-groovy">
+  <target name="resolve-markdown" unless="markdown.loaded">
     <property name="flexmark.version" value="0.42.6"/>
     <ivy:cachepath transitive="true" resolveId="flexmark" pathid="markdown.classpath">
       <ivy:dependency org="com.vladsch.flexmark" name="flexmark" rev="${flexmark.version}" conf="default" />
--- lucene-8.5.0/core/build.xml	2020-04-06 12:09:05.497250615 +0200
+++ lucene-8.5.0/core/build.xml	2020-04-06 12:22:08.761487819 +0200
@@ -222,7 +222,7 @@
     </or>
   </condition>
   
-  <target name="test-lock-factory" depends="resolve-groovy,compile-core" unless="-ignore-test-lock-factory"
+  <target name="test-lock-factory" depends="compile-core" unless="-ignore-test-lock-factory"
     description="Run LockStressTest with multiple JVMs">
     <property name="lockverifyserver.host" value="127.0.0.1"/>
     <property name="lockverify.delay" value="1"/>
--- lucene-8.5.0/demo/build.xml	2020-04-06 12:09:05.497250615 +0200
+++ lucene-8.5.0/demo/build.xml	2020-04-06 12:36:38.322189334 +0200
@@ -56,7 +56,7 @@
   <!-- we don't check for sysout in demo, because the demo is there to use sysout :-) -->
   <target name="-check-forbidden-sysout"/>
 
-  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,jar-expressions,common.compile-core" />
+  <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,common.compile-core" />
 
   <target name="jar-core" depends="compile-core">
     <jarify>
--- lucene-8.5.0/module-build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/module-build.xml	2020-04-06 12:45:38.953110299 +0200
@@ -604,6 +582,28 @@
     <property name="misc-javadocs.uptodate" value="true"/>
   </target>
 
+  <property name="monitor.jar" value="${common.dir}/build/monitor/lucene-monitor-${version}.jar"/>
+  <target name="check-monitor-uptodate" unless="monitor.uptodate">
+    <module-uptodate name="monitor" jarfile="${monitor.jar}" property="monitor.uptodate"/>
+  </target>
+  <target name="jar-monitor" unless="monitor.uptodate" depends="check-monitor-uptodate">
+    <ant dir="${common.dir}/monitor" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="monitor.uptodate" value="true"/>
+  </target>
+
+  <property name="monitor-javadoc.jar" value="${common.dir}/build/monitor/lucene-monitor-${version}-javadoc.jar"/>
+  <target name="check-monitor-javadocs-uptodate" unless="monitor-javadocs.uptodate">
+    <module-uptodate name="monitor" jarfile="${monitor-javadoc.jar}" property="monitor-javadocs.uptodate"/>
+  </target>
+  <target name="javadocs-monitor" unless="monitor-javadocs.uptodate" depends="check-monitor-javadocs-uptodate">
+    <ant dir="${common.dir}/monitor" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="monitor-javadocs.uptodate" value="true"/>
+  </target>
+
   <property name="sandbox.jar" value="${common.dir}/build/sandbox/lucene-sandbox-${version}.jar"/>
   <target name="check-sandbox-uptodate" unless="sandbox.uptodate">
     <module-uptodate name="sandbox" jarfile="${sandbox.jar}" property="sandbox.uptodate"/>
--- lucene-8.5.0/queries/build.xml	2020-04-06 12:09:05.501250635 +0200
+++ lucene-8.5.0/queries/build.xml	2020-04-06 12:37:44.478546763 +0200
@@ -47,5 +47,5 @@
 	</jarify>
   </target>
 
-  <target name="compile-core" depends="jar-expressions,common.compile-core" />
+  <target name="compile-core" depends="common.compile-core" />
 </project>
--- lucene-8.5.0/suggest/build.xml	2020-04-06 12:09:05.501250635 +0200
+++ lucene-8.5.0/suggest/build.xml	2020-04-06 12:36:24.810116329 +0200
@@ -42,7 +42,7 @@
     </invoke-module-javadoc>
   </target>
 
-  <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
+  <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
 
   <target name="jar-core" depends="compile-core">
     <jarify>
