From a8a532f8c5ab6754a5841b0321483ab159e13bd5 Mon Sep 17 00:00:00 2001 From: Zach Levis Date: Sat, 16 Jan 2021 18:47:07 -0800 Subject: [PATCH] Fix use of a configuration that conflicts with a Gradle default The Gradle sources jar support uses the sourcesElements configuration to produce its sources jar, which conflicts with the javadoc plugin's use --- src/main/java/io/spring/gradle/javadoc/JavadocPlugin.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/spring/gradle/javadoc/JavadocPlugin.java b/src/main/java/io/spring/gradle/javadoc/JavadocPlugin.java index 132815e..7baa49f 100644 --- a/src/main/java/io/spring/gradle/javadoc/JavadocPlugin.java +++ b/src/main/java/io/spring/gradle/javadoc/JavadocPlugin.java @@ -41,13 +41,19 @@ */ public class JavadocPlugin implements Plugin { + /** + * A configuration producing the sources that will be used for the aggregate Javadoc + * task. + */ + public static final String JAVADOC_SOURCES_ELEMENTS_CONFIGURATION_NAME = "javadocSourcesElements"; + @Override public void apply(Project project) { project.getPlugins().withType(JavaPlugin.class).all((javaPlugin) -> withSourcesElements(project)); } private void withSourcesElements(Project project) { - project.getConfigurations().create("sourcesElements", new Action() { + project.getConfigurations().create(JAVADOC_SOURCES_ELEMENTS_CONFIGURATION_NAME, new Action() { @Override public void execute(Configuration config) { config.setCanBeResolved(false);