File tree Expand file tree Collapse file tree 4 files changed +13
-11
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ import org.gradle.api.artifacts.ModuleDependency
3838import org.gradle.api.artifacts.ModuleVersionIdentifier
3939import org.gradle.api.artifacts.ProjectDependency
4040import org.gradle.api.artifacts.ResolvedArtifact
41- import org.gradle.api.artifacts.SelfResolvingDependency
4241import org.gradle.api.artifacts.dsl.RepositoryHandler
4342import org.gradle.api.execution.TaskExecutionGraph
4443import org.gradle.api.plugins.JavaPlugin
@@ -212,6 +211,7 @@ class BuildPlugin implements Plugin<Project> {
212211 project. rootProject. ext. minimumRuntimeVersion = minimumRuntimeVersion
213212 project. rootProject. ext. inFipsJvm = inFipsJvm
214213 project. rootProject. ext. gradleJavaVersion = JavaVersion . toVersion(gradleJavaVersion)
214+ project. rootProject. ext. java9Home = findJavaHome(" 9" )
215215 }
216216
217217 project. targetCompatibility = project. rootProject. ext. minimumRuntimeVersion
@@ -225,6 +225,7 @@ class BuildPlugin implements Plugin<Project> {
225225 project. ext. javaVersions = project. rootProject. ext. javaVersions
226226 project. ext. inFipsJvm = project. rootProject. ext. inFipsJvm
227227 project. ext. gradleJavaVersion = project. rootProject. ext. gradleJavaVersion
228+ project. ext. java9Home = project. rootProject. ext. java9Home
228229 }
229230
230231 private static String getPaddedMajorVersion (JavaVersion compilerJavaVersionEnum ) {
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ class PrecommitTasks {
100100
101101 private static Task configureForbiddenApisCli (Project project ) {
102102 Task forbiddenApisCli = project. tasks. create(' forbiddenApis' )
103- project. sourceSets. forEach { sourceSet ->
103+ project. sourceSets. all { sourceSet ->
104104 forbiddenApisCli. dependsOn(
105105 project. tasks. create(sourceSet. getTaskName(' forbiddenApis' , null ), ForbiddenApisCliTask ) {
106106 ExportElasticsearchBuildResourcesTask buildResources = project. tasks. getByName(' buildResources' )
Original file line number Diff line number Diff line change @@ -46,12 +46,13 @@ if (!isEclipse && !isIdea) {
4646 targetCompatibility = 9
4747 }
4848
49- /* Enable this when forbiddenapis was updated to 2.6.
50- * See: https://github.com/elastic/elasticsearch/issues/29292
5149 forbiddenApisJava9 {
52- targetCompatibility = 9
50+ if (project. runtimeJavaVersion < JavaVersion . VERSION_1_9 ) {
51+ targetCompatibility = JavaVersion . VERSION_1_9
52+ javaHome = project. java9Home
53+ }
54+ replaceSignatureFiles ' jdk-signatures'
5355 }
54- */
5556
5657 jar {
5758 metaInf {
Original file line number Diff line number Diff line change @@ -58,13 +58,13 @@ if (!isEclipse && !isIdea) {
5858 sourceCompatibility = 9
5959 targetCompatibility = 9
6060 }
61-
62- /* Enable this when forbiddenapis was updated to 2.6.
63- * See: https://github.com/elastic/elasticsearch/issues/29292
61+
6462 forbiddenApisJava9 {
65- targetCompatibility = 9
63+ if (project. runtimeJavaVersion < JavaVersion . VERSION_1_9 ) {
64+ targetCompatibility = JavaVersion . VERSION_1_9
65+ javaHome = project. java9Home
66+ }
6667 }
67- */
6868
6969 jar {
7070 metaInf {
You can’t perform that action at this time.
0 commit comments