[lucene-solr] branch master updated: LUCENE-9479: Forbiddenapis & Gradle: Add commons-io bundled signatures (#1780)

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 6abce32  LUCENE-9479: Forbiddenapis & Gradle: Add commons-io bundled signatures (#1780)
6abce32 is described below

commit 6abce32a3ecf661817ee9742fc4c69117c7e798b
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Tue Aug 25 09:05:06 2020 +0200

    LUCENE-9479: Forbiddenapis & Gradle: Add commons-io bundled signatures (#1780)
---
 gradle/validation/forbidden-apis.gradle | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradle
index 33c1d68..f37bbba 100644
--- a/gradle/validation/forbidden-apis.gradle
+++ b/gradle/validation/forbidden-apis.gradle
@@ -26,8 +26,9 @@ allprojects { prj ->
     // This helper method appends signature files based on a set of true
     // dependencies from a given configuration.
     def dynamicSignatures = { configuration, suffix ->
-      def deps = configuration.resolvedConfiguration.resolvedArtifacts
+      def resolvedMods = configuration.resolvedConfiguration.resolvedArtifacts
           .collect { a -> a.moduleVersion.id }
+      def deps = resolvedMods
           .collect { id -> [
               "${id.group}.${id.name}.all.txt",
               "${id.group}.${id.name}.${suffix}.txt",
@@ -46,6 +47,11 @@ allprojects { prj ->
           logger.debug("Signature file omitted (does not exist): ${sig}")
         }
       }
+      
+      // commons-io is special: forbiddenapis has a versioned bundledSignature.
+      bundledSignatures += resolvedMods
+        .findAll { id -> id.group == 'commons-io' && id.name == 'commons-io' }
+        .collect { id -> "${id.name}-unsafe-${id.version}" as String }
     }
 
     // Configure defaults for sourceSets.main