Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 5 additions & 28 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,29 +69,14 @@ allprojects {
}

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
}
}

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'
}

/*****************************************************************************
Expand All @@ -103,12 +88,8 @@ repositories {
}

dependencies {
if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) {
// eclipse is confused if this is set explicitly
compile sourceSets.minimumRuntime.output
}

compile localGroovy()
compile gradleApi()

compile 'commons-codec:commons-codec:1.12'
compile 'org.apache.commons:commons-compress:1.19'
Expand All @@ -132,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()
}

/*****************************************************************************
Expand Down Expand Up @@ -173,8 +151,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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
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;
Expand Down Expand Up @@ -66,7 +65,6 @@ public void execute(Task task) {
}
}

@Internal
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that slipped through in the extra sourceSet before as gradles validateProperties task didn't catch it. by moving this to the main sourceSet now we need to fix it here to have :buildSrc:validateProperties pass

public void setSpoolOutput(boolean spoolOutput) {
final OutputStream out;
if (spoolOutput) {
Expand Down