From 48ede6984237752797a239e72bab4950930cf231 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Thu, 16 Jun 2022 22:56:05 +0000 Subject: [PATCH] apply https://github.com/policeman-tools/forbidden-apis/issues/191 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1901995 13f79535-47bb-0310-9956-ffa450edef68 --- build.gradle | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 088a933da0..534efe4575 100644 --- a/build.gradle +++ b/build.gradle @@ -30,16 +30,16 @@ buildscript { dependencies { classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513' - classpath 'de.thetaphi:forbiddenapis:3.3' } } plugins { id 'base' - id "com.dorongold.task-tree" version "2.1.0" - id('org.nosphere.apache.rat') version '0.7.1' + id 'com.dorongold.task-tree' version '2.1.0' + id 'org.nosphere.apache.rat' version '0.7.1' id 'distribution' - id "com.github.spotbugs" version "5.0.8" + id "com.github.spotbugs" version '5.0.8' + id 'de.thetaphi.forbiddenapis' version '3.3' id 'com.github.jk1.dependency-license-report' version '2.0' } @@ -445,12 +445,17 @@ subprojects { signaturesFiles = files('../src/resources/devtools/forbidden-signatures.txt') ignoreFailures = false suppressAnnotations = [ 'org.apache.poi.util.SuppressForbidden' ] - // forbiddenapis bundled signatures max supported version is 14 - // targetCompatibility = (JavaVersion.VERSION_14.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_14) + } + + forbiddenApisTest { + // forbiddenapis bundled signatures max supported version is 17 + // also see https://github.com/policeman-tools/forbidden-apis/issues/191 + targetCompatibility = (JavaVersion.VERSION_17.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_17) } forbiddenApisMain { signaturesFiles += files('../src/resources/devtools/forbidden-signatures-prod.txt') + targetCompatibility = (JavaVersion.VERSION_17.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_17) } task jenkins -- 2.39.5