Skip to content

Commit f183ac1

Browse files
uschindleralpar-t
authored andcommitted
Update forbiddenapis to v2.7 (#47969)
1 parent 745699f commit f183ac1

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ dependencies {
117117
compile 'org.apache.rat:apache-rat:0.11'
118118
compile "org.elasticsearch:jna:4.5.1"
119119
compile 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
120-
compile 'de.thetaphi:forbiddenapis:2.6'
120+
compile 'de.thetaphi:forbiddenapis:2.7'
121121
compile 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12'
122122
testCompile "junit:junit:${props.getProperty('junit')}"
123123
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"

buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class PrecommitTasks {
4343
public static TaskProvider create(Project project, boolean includeDependencyLicenses) {
4444
project.configurations.create("forbiddenApisCliJar")
4545
project.dependencies {
46-
forbiddenApisCliJar('de.thetaphi:forbiddenapis:2.6')
46+
forbiddenApisCliJar('de.thetaphi:forbiddenapis:2.7')
4747
}
4848

4949
Configuration jarHellConfig = project.configurations.create("jarHell")
@@ -149,13 +149,16 @@ class PrecommitTasks {
149149
doFirst {
150150
// we need to defer this configuration since we don't know the runtime java version until execution time
151151
targetCompatibility = project.runtimeJavaVersion.getMajorVersion()
152-
if (project.runtimeJavaVersion > JavaVersion.VERSION_11) {
152+
/*
153+
TODO: Reenable once Gradle supports Java 13 or later!
154+
if (project.runtimeJavaVersion > JavaVersion.VERSION_13) {
153155
project.logger.info(
154-
"Forbidden APIs does not support java version past 11. Will use the signatures from 11 for ",
156+
"Forbidden APIs does not support java version past 13. Will use the signatures from 13 for ",
155157
project.runtimeJavaVersion
156158
)
157-
targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
159+
targetCompatibility = JavaVersion.VERSION_13.getMajorVersion()
158160
}
161+
*/
159162
}
160163
bundledSignatures = [
161164
"jdk-unsafe", "jdk-deprecated", "jdk-non-portable", "jdk-system-out"

buildSrc/src/testKit/thirdPartyAudit/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repositories {
2323
configurations.create("forbiddenApisCliJar")
2424

2525
dependencies {
26-
forbiddenApisCliJar 'de.thetaphi:forbiddenapis:2.6'
26+
forbiddenApisCliJar 'de.thetaphi:forbiddenapis:2.7'
2727
compileOnly "org.${project.properties.compileOnlyGroup}:${project.properties.compileOnlyVersion}"
2828
compile "org.${project.properties.compileGroup}:${project.properties.compileVersion}"
2929
}

0 commit comments

Comments
 (0)