Merge branch '2.4.x' into 2.5.x

Closes gh-28152
spring-projects · Sep 30, 2021 · 9e484e2 · 9e484e2
2 parents fcb6f55 + 3824512
commit 9e484e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java
@@ -110,18 +110,19 @@ private void addPopulateIntTestMavenRepositoryTask(Project project) {
 		project.getDependencies()
 				.components((components) -> components.all(MavenRepositoryComponentMetadataRule.class));
 		Copy task = project.getTasks().create("populateIntTestMavenRepository", Copy.class);
-		task.setDestinationDir(project.getBuildDir());
-		task.into("int-test-maven-repository",
-				(copy) -> copyIntTestMavenRepositoryFiles(project, copy, runtimeClasspathMavenRepository));
+		task.setDestinationDir(new File(project.getBuildDir(), "int-test-maven-repository"));
+		task.with(copyIntTestMavenRepositoryFiles(project, runtimeClasspathMavenRepository));
 		task.dependsOn(project.getTasks().getByName(MavenRepositoryPlugin.PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME));
 		project.getTasks().getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME).dependsOn(task);
 	}
 
-	private void copyIntTestMavenRepositoryFiles(Project project, CopySpec copy,
+	private CopySpec copyIntTestMavenRepositoryFiles(Project project,
 			RuntimeClasspathMavenRepository runtimeClasspathMavenRepository) {
-		copy.from(project.getConfigurations().getByName(MavenRepositoryPlugin.MAVEN_REPOSITORY_CONFIGURATION_NAME));
-		copy.from(new File(project.getBuildDir(), "maven-repository"));
-		copy.from(runtimeClasspathMavenRepository);
+		CopySpec copySpec = project.copySpec();
+		copySpec.from(project.getConfigurations().getByName(MavenRepositoryPlugin.MAVEN_REPOSITORY_CONFIGURATION_NAME));
+		copySpec.from(new File(project.getBuildDir(), "maven-repository"));
+		copySpec.from(runtimeClasspathMavenRepository);
+		return copySpec;
 	}
 
 	private void addDocumentPluginGoalsTask(Project project, MavenExec generatePluginDescriptorTask) {
@@ -169,7 +170,7 @@ private MavenExec addGeneratePluginDescriptorTask(Project project, Jar jarTask,
 		FormatHelpMojoSourceTask copyFormattedHelpMojoSourceTask = createCopyFormattedHelpMojoSourceTask(project,
 				generateHelpMojoTask, generatedHelpMojoDir);
 		project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(copyFormattedHelpMojoSourceTask);
-		mainSourceSet.java((javaSources) -> javaSources.srcDir(generatedHelpMojoDir));
+		mainSourceSet.java((javaSources) -> javaSources.srcDir(copyFormattedHelpMojoSourceTask));
 		Copy pluginDescriptorInputs = createCopyPluginDescriptorInputs(project, pluginDescriptorDir, mainSourceSet);
 		pluginDescriptorInputs.dependsOn(mainSourceSet.getClassesTaskName());
 		MavenExec task = createGeneratePluginDescriptorTask(project, pluginDescriptorDir);

diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -25,6 +25,14 @@ javadoc {
 	enabled = false
 }
 
+javadocJar {
+	enabled = false
+}
+
+sourcesJar {
+	enabled = false
+}
+
 plugins.withType(EclipsePlugin) {
 	extensions.getByType(org.gradle.plugins.ide.eclipse.model.EclipseModel).classpath { classpath ->
 		classpath.plusConfigurations.add(configurations.getByName(sourceSets.main.runtimeClasspathConfigurationName))