@@ -69,29 +69,14 @@ allprojects {
6969}
7070
7171sourceSets {
72- // We have a few classes that need to be compiled for older java versions
73- minimumRuntime {}
74-
7572 integTest {
7673 compileClasspath + = sourceSets[" main" ]. output + configurations[" testRuntimeClasspath" ]
7774 runtimeClasspath + = output + compileClasspath
7875 }
7976}
8077
81- compileMinimumRuntimeJava {
82- targetCompatibility = 8
83- sourceCompatibility = 8
84- tasks. withType(JavaCompile ). configureEach {
85- options. encoding = ' UTF-8'
86- }
87- }
88-
89- jar {
90- from sourceSets. minimumRuntime. output
91- }
92-
93- javadoc {
94- source sourceSets. minimumRuntime. allSource
78+ tasks. withType(JavaCompile ). configureEach {
79+ options. encoding = ' UTF-8'
9580}
9681
9782/* ****************************************************************************
@@ -103,12 +88,8 @@ repositories {
10388}
10489
10590dependencies {
106- if (project. ext. has(" isEclipse" ) == false || project. ext. isEclipse == false ) {
107- // eclipse is confused if this is set explicitly
108- compile sourceSets. minimumRuntime. output
109- }
110-
11191 compile localGroovy()
92+ compile gradleApi()
11293
11394 compile ' commons-codec:commons-codec:1.12'
11495 compile ' org.apache.commons:commons-compress:1.19'
@@ -132,11 +113,8 @@ dependencies {
132113 testImplementation ' com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
133114 testImplementation ' org.mockito:mockito-core:1.9.5'
134115 integTestImplementation(' org.spockframework:spock-core:1.3-groovy-2.5' ) {
135- exclude module :" groovy"
116+ exclude module : " groovy"
136117 }
137- minimumRuntimeCompile " junit:junit:${ props.getProperty('junit')} "
138- minimumRuntimeCompile localGroovy()
139- minimumRuntimeCompile gradleApi()
140118}
141119
142120/* ****************************************************************************
@@ -173,8 +151,7 @@ if (project != rootProject) {
173151 // build-tools is not ready for primetime with these...
174152 tasks. named(" dependencyLicenses" ). configure { it. enabled = false }
175153 dependenciesInfo. enabled = false
176- disableTasks(' forbiddenApisMain' , ' forbiddenApisMinimumRuntime' ,
177- ' forbiddenApisTest' , ' forbiddenApisIntegTest' , ' forbiddenApisTestFixtures' )
154+ disableTasks(' forbiddenApisMain' , ' forbiddenApisTest' , ' forbiddenApisIntegTest' , ' forbiddenApisTestFixtures' )
178155 jarHell. enabled = false
179156 thirdPartyAudit. enabled = false
180157 if (org.elasticsearch.gradle.info.BuildParams . inFipsJvm) {
0 commit comments