Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #2496 - Standardizing skip message syntax. 

+ Both configuration based and manual skip now have the same
  skip message syntax.

+ Moving configuration based skip evaluation to earlier point
  to eliminate noise that is unrelated to skip message.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-05-02 13:34:30 -05:00
parent 97ace5a45c
commit 4248388a77
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
View File

@ -294,17 +294,21 @@ public abstract class AbstractJettyMojo extends AbstractMojo
public abstract void configureScanner () throws MojoExecutionException;
protected String getSkipMessage(String reason)
{
String projectName = project.getName();
if (StringUtils.isBlank(projectName))
{
projectName = project.getGroupId() + ":" + project.getArtifactId();
}
return "Skipping " + projectName + " : " + reason;
}
public boolean checkPackagingConfiguration() throws MojoExecutionException
public boolean checkPackagingConfiguration()
{
if (!supportedPackagings.contains( project.getPackaging() ))
{
String projectName = project.getName();
if (StringUtils.isBlank(projectName))
{
projectName = project.getGroupId() + ":" + project.getArtifactId();
}
getLog().info("Skipping " + projectName + " : packaging type [" + project.getPackaging() + "] is unsupported");
getLog().info(getSkipMessage("packaging type [" + project.getPackaging() + "] is unsupported"));
return false;
}
return true;
@ -317,24 +321,25 @@ public abstract class AbstractJettyMojo extends AbstractMojo
@Override
public void execute() throws MojoExecutionException, MojoFailureException
{
getLog().info("Configuring Jetty for project: " + this.project.getName());
if (skip)
{
getLog().info("Skipping Jetty start: jetty.skip==true");
return;
}
if (isExcluded(execution.getMojoDescriptor().getGoal()))
{
getLog().info("The goal \""+execution.getMojoDescriptor().getFullGoalName()+
"\" has been made unavailable for this web application by an <excludedGoal> configuration.");
return;
}
configurePluginClasspath();
PluginLog.setLog(getLog());
if (isConfigurationSupported())
{
if (skip)
{
getLog().info(getSkipMessage("jetty.skip==true"));
return;
}
getLog().info("Configuring Jetty for project: " + this.project.getName());
if (isExcluded(execution.getMojoDescriptor().getGoal()))
{
getLog().info("The goal \""+execution.getMojoDescriptor().getFullGoalName()+
"\" has been made unavailable for this web application by an <excludedGoal> configuration.");
return;
}
configurePluginClasspath();
PluginLog.setLog(getLog());
startJetty();
}
}