Skip to content

Update forbiddenapis to v2.7 #47969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2019
Merged

Update forbiddenapis to v2.7 #47969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ dependencies {
compile 'org.apache.rat:apache-rat:0.11'
compile "org.elasticsearch:jna:4.5.1"
compile 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
compile 'de.thetaphi:forbiddenapis:2.6'
compile 'de.thetaphi:forbiddenapis:2.7'
compile 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12'
testCompile "junit:junit:${props.getProperty('junit')}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
Expand Down
11 changes: 7 additions & 4 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class PrecommitTasks {
public static TaskProvider create(Project project, boolean includeDependencyLicenses) {
project.configurations.create("forbiddenApisCliJar")
project.dependencies {
forbiddenApisCliJar('de.thetaphi:forbiddenapis:2.6')
forbiddenApisCliJar('de.thetaphi:forbiddenapis:2.7')
}

Configuration jarHellConfig = project.configurations.create("jarHell")
Expand Down Expand Up @@ -149,13 +149,16 @@ class PrecommitTasks {
doFirst {
// we need to defer this configuration since we don't know the runtime java version until execution time
targetCompatibility = project.runtimeJavaVersion.getMajorVersion()
if (project.runtimeJavaVersion > JavaVersion.VERSION_11) {
/*
TODO: Reenable once Gradle supports Java 13 or later!
if (project.runtimeJavaVersion > JavaVersion.VERSION_13) {
project.logger.info(
"Forbidden APIs does not support java version past 11. Will use the signatures from 11 for ",
"Forbidden APIs does not support java version past 13. Will use the signatures from 13 for ",
project.runtimeJavaVersion
)
targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
targetCompatibility = JavaVersion.VERSION_13.getMajorVersion()
}
*/
}
bundledSignatures = [
"jdk-unsafe", "jdk-deprecated", "jdk-non-portable", "jdk-system-out"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/testKit/thirdPartyAudit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repositories {
configurations.create("forbiddenApisCliJar")

dependencies {
forbiddenApisCliJar 'de.thetaphi:forbiddenapis:2.6'
forbiddenApisCliJar 'de.thetaphi:forbiddenapis:2.7'
compileOnly "org.${project.properties.compileOnlyGroup}:${project.properties.compileOnlyVersion}"
compile "org.${project.properties.compileGroup}:${project.properties.compileVersion}"
}
Expand Down