root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' 

Closes gh-28153
This commit is contained in:
Andy Wilkinson 2021-09-30 17:06:09 +01:00
parent 8f3353a154 9e484e2cdc
commit ea68672594
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java
View File

@ -110,18 +110,19 @@ public class MavenPluginPlugin implements Plugin<Project> {
project.getDependencies() project.getDependencies()
.components((components) -> components.all(MavenRepositoryComponentMetadataRule.class)); .components((components) -> components.all(MavenRepositoryComponentMetadataRule.class));
Copy task = project.getTasks().create("populateIntTestMavenRepository", Copy.class); Copy task = project.getTasks().create("populateIntTestMavenRepository", Copy.class);
task.setDestinationDir(project.getBuildDir()); task.setDestinationDir(new File(project.getBuildDir(), "int-test-maven-repository"));
task.into("int-test-maven-repository", task.with(copyIntTestMavenRepositoryFiles(project, runtimeClasspathMavenRepository));
(copy) -> copyIntTestMavenRepositoryFiles(project, copy, runtimeClasspathMavenRepository));
task.dependsOn(project.getTasks().getByName(MavenRepositoryPlugin.PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME)); task.dependsOn(project.getTasks().getByName(MavenRepositoryPlugin.PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME));
project.getTasks().getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME).dependsOn(task); project.getTasks().getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME).dependsOn(task);
} }
private void copyIntTestMavenRepositoryFiles(Project project, CopySpec copy, private CopySpec copyIntTestMavenRepositoryFiles(Project project,
RuntimeClasspathMavenRepository runtimeClasspathMavenRepository) { RuntimeClasspathMavenRepository runtimeClasspathMavenRepository) {
copy.from(project.getConfigurations().getByName(MavenRepositoryPlugin.MAVEN_REPOSITORY_CONFIGURATION_NAME)); CopySpec copySpec = project.copySpec();
copy.from(new File(project.getBuildDir(), "maven-repository")); copySpec.from(project.getConfigurations().getByName(MavenRepositoryPlugin.MAVEN_REPOSITORY_CONFIGURATION_NAME));
copy.from(runtimeClasspathMavenRepository); copySpec.from(new File(project.getBuildDir(), "maven-repository"));
copySpec.from(runtimeClasspathMavenRepository);
return copySpec;
} }
private void addDocumentPluginGoalsTask(Project project, MavenExec generatePluginDescriptorTask) { private void addDocumentPluginGoalsTask(Project project, MavenExec generatePluginDescriptorTask) {
@ -169,7 +170,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
FormatHelpMojoSourceTask copyFormattedHelpMojoSourceTask = createCopyFormattedHelpMojoSourceTask(project, FormatHelpMojoSourceTask copyFormattedHelpMojoSourceTask = createCopyFormattedHelpMojoSourceTask(project,
generateHelpMojoTask, generatedHelpMojoDir); generateHelpMojoTask, generatedHelpMojoDir);
project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(copyFormattedHelpMojoSourceTask); 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); Copy pluginDescriptorInputs = createCopyPluginDescriptorInputs(project, pluginDescriptorDir, mainSourceSet);
pluginDescriptorInputs.dependsOn(mainSourceSet.getClassesTaskName()); pluginDescriptorInputs.dependsOn(mainSourceSet.getClassesTaskName());
MavenExec task = createGeneratePluginDescriptorTask(project, pluginDescriptorDir); MavenExec task = createGeneratePluginDescriptorTask(project, pluginDescriptorDir);

8
spring-boot-project/spring-boot-docs/build.gradle
View File

@ -25,6 +25,14 @@ javadoc {
enabled = false enabled = false
} }
javadocJar {
enabled = false
}
sourcesJar {
enabled = false
}
plugins.withType(EclipsePlugin) { plugins.withType(EclipsePlugin) {
extensions.getByType(org.gradle.plugins.ide.eclipse.model.EclipseModel).classpath { classpath -> extensions.getByType(org.gradle.plugins.ide.eclipse.model.EclipseModel).classpath { classpath ->
classpath.plusConfigurations.add(configurations.getByName(sourceSets.main.runtimeClasspathConfigurationName)) classpath.plusConfigurations.add(configurations.getByName(sourceSets.main.runtimeClasspathConfigurationName))