From b13945df09db7502dced00a4a603c5290c9964b8 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Wed, 23 Sep 2020 14:56:46 +0200
Subject: [PATCH] Upgrade forbiddenapis to version 3.1 (backport)

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

diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index ee05b5d7f771..36c3cc8b582f 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>3.0.1</version>
+          <version>3.1</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 4eaf923c787c..7d1b9bd32dfb 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -125,6 +125,10 @@ Other
 * LUCENE-9512: Move LockFactory stress test to be a unit/integration
   test. (Uwe Schindler, Dawid Weiss, Robert Muir)
 
+Build
+
+* Upgrade forbiddenapis to version 3.1.  (Uwe Schindler)
+
 ======================= Lucene 8.6.2 =======================
 
 Bug Fixes
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index fc2442a69438..cfc0ec98f1b7 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -2448,7 +2448,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="3.0.1"
+    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="3.1"
       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"/>