Remove minimumRuntime sourceSet from build-tools (7.x backport) (#58472)
* Remove minimumRuntime sourceSet from build-tools * remove license change in loggedexec task
This commit is contained in:
parent
909649dd15
commit
4f1da31158
|
@ -68,33 +68,14 @@ if (JavaVersion.current() < JavaVersion.VERSION_11) {
|
|||
}
|
||||
|
||||
sourceSets {
|
||||
// We have a few classes that need to be compiled for older java versions
|
||||
minimumRuntime {}
|
||||
|
||||
integTest {
|
||||
compileClasspath += sourceSets["main"].output + configurations["testRuntimeClasspath"]
|
||||
runtimeClasspath += output + compileClasspath
|
||||
}
|
||||
}
|
||||
|
||||
configurations {
|
||||
reaper
|
||||
}
|
||||
|
||||
compileMinimumRuntimeJava {
|
||||
targetCompatibility = 8
|
||||
sourceCompatibility = 8
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
from sourceSets.minimumRuntime.output
|
||||
}
|
||||
|
||||
javadoc {
|
||||
source sourceSets.minimumRuntime.allSource
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -106,10 +87,6 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) {
|
||||
// eclipse is confused if this is set explicitly
|
||||
api sourceSets.minimumRuntime.output
|
||||
}
|
||||
|
||||
api localGroovy()
|
||||
|
||||
|
@ -136,11 +113,8 @@ dependencies {
|
|||
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
|
||||
testImplementation 'org.mockito:mockito-core:1.9.5'
|
||||
integTestImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
|
||||
exclude module:"groovy"
|
||||
exclude module: "groovy"
|
||||
}
|
||||
minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}"
|
||||
minimumRuntimeCompile localGroovy()
|
||||
minimumRuntimeCompile gradleApi()
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -182,8 +156,7 @@ if (project != rootProject) {
|
|||
// build-tools is not ready for primetime with these...
|
||||
tasks.named("dependencyLicenses").configure { it.enabled = false }
|
||||
dependenciesInfo.enabled = false
|
||||
disableTasks('forbiddenApisMain', 'forbiddenApisMinimumRuntime',
|
||||
'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
|
||||
disableTasks('forbiddenApisMain', 'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
|
||||
jarHell.enabled = false
|
||||
thirdPartyAudit.enabled = false
|
||||
if (org.elasticsearch.gradle.info.BuildParams.inFipsJvm) {
|
||||
|
|
|
@ -7,7 +7,6 @@ import org.gradle.api.Task;
|
|||
import org.gradle.api.logging.Logger;
|
||||
import org.gradle.api.logging.Logging;
|
||||
import org.gradle.api.tasks.Exec;
|
||||
import org.gradle.api.tasks.Internal;
|
||||
import org.gradle.process.BaseExecSpec;
|
||||
import org.gradle.process.ExecOperations;
|
||||
import org.gradle.process.ExecResult;
|
||||
|
@ -66,7 +65,6 @@ public class LoggedExec extends Exec {
|
|||
}
|
||||
}
|
||||
|
||||
@Internal
|
||||
public void setSpoolOutput(boolean spoolOutput) {
|
||||
final OutputStream out;
|
||||
if (spoolOutput) {
|
Loading…
Reference in New Issue