diff --git a/build.xml b/build.xml
index c06273c83b1..07c01c21977 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@
 <project name="lucene-solr" default="-projecthelp" basedir=".">
   <import file="lucene/common-build.xml"/>
 
-  <property name="jgit-version" value="4.4.1.201607150455-r"/>
+  <property name="jgit-version" value="4.6.0.201612231935-r"/>
   
   <property name="tests.heap-dump-dir" location="heapdumps"/>
   
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 491292011fc..040f4e0ef5b 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -270,6 +270,9 @@ Build
   Lucene and Solr DOAP RDF files into the Git source repository under
   dev-tools/doap/ and then pulling release dates from those files, rather than
   from JIRA. (Mano Kovacs, hossman, Steve Rowe)
+  
+* LUCENE-7596: Update Groovy to version 2.4.8 to allow building with Java 9
+  build 148+. Also update JGit version for working-copy checks. (Uwe Schindler)
 
 ======================= Lucene 6.3.0 =======================
 
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 42cd140e59d..87d2e0a7387 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2332,7 +2332,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
 
   <!-- GROOVY scripting engine for ANT tasks -->
   <target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.6"
+    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.8"
       inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
     <taskdef name="groovy"
       classname="org.codehaus.groovy.ant.Groovy"