Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
fc4efe3b
Commit
fc4efe3b
authored
Jun 02, 2020
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Maven plugin help support
Update `MavenPluginPlugin` to fix HelpMojo support. Closes gh-21556
parent
1f28141f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
MavenPluginPlugin.java
...ngframework/boot/build/mavenplugin/MavenPluginPlugin.java
+5
-4
No files found.
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java
View file @
fc4efe3b
...
@@ -75,7 +75,8 @@ public class MavenPluginPlugin implements Plugin<Project> {
...
@@ -75,7 +75,8 @@ public class MavenPluginPlugin implements Plugin<Project> {
MavenExec
generatePluginDescriptor
=
configurePluginDescriptorGenerationTasks
(
project
,
generateHelpMojo
);
MavenExec
generatePluginDescriptor
=
configurePluginDescriptorGenerationTasks
(
project
,
generateHelpMojo
);
DocumentPluginGoals
documentPluginGoals
=
project
.
getTasks
().
create
(
"documentPluginGoals"
,
DocumentPluginGoals
documentPluginGoals
=
project
.
getTasks
().
create
(
"documentPluginGoals"
,
DocumentPluginGoals
.
class
);
DocumentPluginGoals
.
class
);
documentPluginGoals
.
setPluginXml
(
generatePluginDescriptor
.
getOutputs
().
getFiles
().
getSingleFile
());
File
pluginXml
=
new
File
(
generatePluginDescriptor
.
getOutputs
().
getFiles
().
getSingleFile
(),
"plugin.xml"
);
documentPluginGoals
.
setPluginXml
(
pluginXml
);
documentPluginGoals
.
setOutputDir
(
new
File
(
project
.
getBuildDir
(),
"docs/generated/goals/"
));
documentPluginGoals
.
setOutputDir
(
new
File
(
project
.
getBuildDir
(),
"docs/generated/goals/"
));
documentPluginGoals
.
dependsOn
(
generatePluginDescriptor
);
documentPluginGoals
.
dependsOn
(
generatePluginDescriptor
);
Jar
jar
=
(
Jar
)
project
.
getTasks
().
getByName
(
JavaPlugin
.
JAR_TASK_NAME
);
Jar
jar
=
(
Jar
)
project
.
getTasks
().
getByName
(
JavaPlugin
.
JAR_TASK_NAME
);
...
@@ -130,7 +131,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
...
@@ -130,7 +131,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
FormatHelpMojoSource
.
class
);
FormatHelpMojoSource
.
class
);
copyFormattedHelpMojoSource
.
setGenerator
(
generateHelpMojo
);
copyFormattedHelpMojoSource
.
setGenerator
(
generateHelpMojo
);
copyFormattedHelpMojoSource
.
setOutputDir
(
generatedHelpMojoDir
);
copyFormattedHelpMojoSource
.
setOutputDir
(
generatedHelpMojoDir
);
mainSourceSet
.
getAllJava
().
srcDir
(
generatedHelpMojoDir
);
mainSourceSet
.
java
((
javaSources
)
->
javaSources
.
srcDir
(
generatedHelpMojoDir
)
);
project
.
getTasks
().
getByName
(
mainSourceSet
.
getCompileJavaTaskName
()).
dependsOn
(
copyFormattedHelpMojoSource
);
project
.
getTasks
().
getByName
(
mainSourceSet
.
getCompileJavaTaskName
()).
dependsOn
(
copyFormattedHelpMojoSource
);
Copy
pluginDescriptorInputs
=
createCopyPluginDescriptorInputs
(
project
,
pluginDescriptorDir
,
mainSourceSet
);
Copy
pluginDescriptorInputs
=
createCopyPluginDescriptorInputs
(
project
,
pluginDescriptorDir
,
mainSourceSet
);
pluginDescriptorInputs
.
dependsOn
(
mainSourceSet
.
getClassesTaskName
());
pluginDescriptorInputs
.
dependsOn
(
mainSourceSet
.
getClassesTaskName
());
...
@@ -152,7 +153,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
...
@@ -152,7 +153,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
private
MavenExec
createGeneratePluginDescriptor
(
Project
project
,
File
mavenDir
)
{
private
MavenExec
createGeneratePluginDescriptor
(
Project
project
,
File
mavenDir
)
{
MavenExec
generatePluginDescriptor
=
project
.
getTasks
().
create
(
"generatePluginDescriptor"
,
MavenExec
.
class
);
MavenExec
generatePluginDescriptor
=
project
.
getTasks
().
create
(
"generatePluginDescriptor"
,
MavenExec
.
class
);
generatePluginDescriptor
.
args
(
"org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor"
);
generatePluginDescriptor
.
args
(
"org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor"
);
generatePluginDescriptor
.
getOutputs
().
file
(
new
File
(
mavenDir
,
"target/classes/META-INF/maven/plugin.xml
"
));
generatePluginDescriptor
.
getOutputs
().
dir
(
new
File
(
mavenDir
,
"target/classes/META-INF/maven
"
));
generatePluginDescriptor
.
getInputs
().
dir
(
new
File
(
mavenDir
,
"target/classes/org"
));
generatePluginDescriptor
.
getInputs
().
dir
(
new
File
(
mavenDir
,
"target/classes/org"
));
generatePluginDescriptor
.
setProjectDir
(
mavenDir
);
generatePluginDescriptor
.
setProjectDir
(
mavenDir
);
return
generatePluginDescriptor
;
return
generatePluginDescriptor
;
...
@@ -164,7 +165,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
...
@@ -164,7 +165,7 @@ public class MavenPluginPlugin implements Plugin<Project> {
}
}
private
void
includeHelpMojoInJar
(
Jar
jar
,
JavaExec
generateHelpMojo
)
{
private
void
includeHelpMojoInJar
(
Jar
jar
,
JavaExec
generateHelpMojo
)
{
jar
.
from
(
generateHelpMojo
);
jar
.
from
(
generateHelpMojo
)
.
exclude
(
"**/*.java"
)
;
jar
.
dependsOn
(
generateHelpMojo
);
jar
.
dependsOn
(
generateHelpMojo
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment