honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make JarHell task cacheable (#42551)

This commit is contained in:
Mark Vieira 2019-05-24 19:28:22 -07:00
parent 7cabe8acc9
commit 2a0c30c100
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy
View File

@ -107,14 +107,12 @@ class PrecommitTasks {
} }
private static Task configureJarHell(Project project) { private static Task configureJarHell(Project project) {
Task task = project.tasks.create('jarHell', JarHellTask.class) return project.tasks.create('jarHell', JarHellTask) { task ->
task.classpath = project.sourceSets.test.runtimeClasspath task.classpath = project.sourceSets.test.runtimeClasspath
if (project.plugins.hasPlugin(ShadowPlugin)) { if (project.plugins.hasPlugin(ShadowPlugin)) {
task.classpath += project.configurations.bundle task.classpath += project.configurations.bundle
} }
task.dependsOn(project.sourceSets.test.classesTaskName) }
task.javaHome = project.runtimeJavaHome
return task
} }
private static Task configureThirdPartyAudit(Project project) { private static Task configureThirdPartyAudit(Project project) {

25
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellTask.java
View File

@ -21,19 +21,20 @@ package org.elasticsearch.gradle.precommit;
import org.elasticsearch.gradle.LoggedExec; import org.elasticsearch.gradle.LoggedExec;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.Classpath; import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.Input; import org.gradle.api.tasks.CompileClasspath;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import java.io.File;
/** /**
* Runs CheckJarHell on a classpath. * Runs CheckJarHell on a classpath.
*/ */
@CacheableTask
public class JarHellTask extends PrecommitTask { public class JarHellTask extends PrecommitTask {
private FileCollection classpath; private FileCollection classpath;
private Object javaHome;
public JarHellTask() { public JarHellTask() {
setDescription("Runs CheckJarHell on the configured classpath"); setDescription("Runs CheckJarHell on the configured classpath");
} }
@ -42,23 +43,15 @@ public class JarHellTask extends PrecommitTask {
public void runJarHellCheck() { public void runJarHellCheck() {
LoggedExec.javaexec(getProject(), spec -> { LoggedExec.javaexec(getProject(), spec -> {
spec.classpath(getClasspath()); spec.classpath(getClasspath());
spec.executable(getJavaHome() + "/bin/java");
spec.setMain("org.elasticsearch.bootstrap.JarHell"); spec.setMain("org.elasticsearch.bootstrap.JarHell");
}); });
} }
@Input // We use compile classpath normalization here because class implementation changes are irrelevant for the purposes of jar hell.
public Object getJavaHome() { // We only care about the runtime classpath ABI here.
return javaHome; @CompileClasspath
}
public void setJavaHome(Object javaHome) {
this.javaHome = javaHome;
}
@Classpath
public FileCollection getClasspath() { public FileCollection getClasspath() {
return classpath.filter(file -> file.exists()); return classpath.filter(File::exists);
} }
public void setClasspath(FileCollection classpath) { public void setClasspath(FileCollection classpath) {