From 99ed605493f0985b7e0de1530592002af29d3438 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Sat, 12 Oct 2019 21:20:13 +0200
Subject: [PATCH] Update forbiddenapis to v2.7 and Groovy to v2.4.17

---
 dev-tools/maven/pom.xml.template | 2 +-
 lucene/CHANGES.txt               | 4 ++++
 lucene/common-build.xml          | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 6e23b522a50..d61279df9ae 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -161,7 +161,7 @@
         <plugin>
           <groupId>de.thetaphi</groupId>
           <artifactId>forbiddenapis</artifactId>
-          <version>2.6</version>
+          <version>2.7</version>
           <configuration>
             <!--
               This is the default setting, we don't support too new Java versions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index cfef57016b1..8a60f771abc 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -32,6 +32,10 @@ Other
 ---------------------
 (No changes)
 
+Build
+
+* Upgrade forbiddenapis to version 2.7; upgrade Groovy to 2.4.17.  (Uwe Schindler)
+
 ======================= Lucene 8.3.0 =======================
 
 API Changes
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 17172ad6220..022c89224ab 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2418,7 +2418,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.16"
+    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.4.17"
       inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
     <taskdef name="groovy"
       classname="org.codehaus.groovy.ant.Groovy"
@@ -2432,7 +2432,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
   <property name="forbidden-sysout-excludes" value=""/>
   
   <target name="-install-forbidden-apis" unless="forbidden-apis.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="2.6"
+    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="2.7"
       inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
     <taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.ant.AntTask" classpathref="forbidden-apis.classpath"/>
     <property name="forbidden-apis.loaded" value="true"/>