From 2349f20edf88e86f1fc9c89bac63db7326e7b990 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 26 Jun 2015 16:35:55 +1000 Subject: [PATCH] 470963 Update jetty-maven-plugin mojo annotations for maven 3 --- .../eclipse/jetty/jspc/plugin/JspcMojo.java | 8 ++++---- .../jetty/maven/plugin/AbstractJettyMojo.java | 18 +++++++++--------- .../maven/plugin/JettyEffectiveWebXml.java | 2 +- .../jetty/maven/plugin/JettyRunForkedMojo.java | 12 ++++++------ .../jetty/maven/plugin/JettyRunMojo.java | 8 ++++---- .../maven/plugin/JettyRunWarExplodedMojo.java | 2 +- .../jetty/maven/plugin/JettyRunWarMojo.java | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index f4ec394102f..ac199805d12 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -138,7 +138,7 @@ public class JspcMojo extends AbstractMojo * The artifacts for the project. * * @since jetty-7.6.3 - * @parameter expression="${project.artifacts}" + * @parameter default-value="${project.artifacts}" * @readonly */ private Set projectArtifacts; @@ -147,7 +147,7 @@ public class JspcMojo extends AbstractMojo /** * The maven project. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ @@ -158,7 +158,7 @@ public class JspcMojo extends AbstractMojo /** * The artifacts for the plugin itself. * - * @parameter expression="${plugin.artifacts}" + * @parameter default-value="${plugin.artifacts}" * @readonly */ private List pluginArtifacts; @@ -243,7 +243,7 @@ public class JspcMojo extends AbstractMojo /** * The location of the compiled classes for the webapp * - * @parameter expression="${project.build.outputDirectory}" + * @parameter default-value="${project.build.outputDirectory}" */ private File classesDirectory; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java index 1dce866a03a..22adeb0bacd 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java @@ -117,7 +117,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo * and restart the context if necessary. Ignored if reload * is enabled. Disabled by default. * - * @parameter expression="${jetty.scanIntervalSeconds}" default-value="0" + * @parameter property="jetty.scanIntervalSeconds" default-value="0" * @required */ protected int scanIntervalSeconds; @@ -128,7 +128,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo * if 'manual' then the context can be reloaded by a linefeed in the console * if 'automatic' then traditional reloading on changed files is enabled. * - * @parameter expression="${jetty.reload}" default-value="automatic" + * @parameter property="jetty.reload" default-value="automatic" */ protected String reload; @@ -140,7 +140,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo * that have been set on the command line, by the JVM, or directly * in the POM via systemProperties. Optional. * - * @parameter expression="${jetty.systemPropertiesFile}" + * @parameter property="jetty.systemPropertiesFile" */ protected File systemPropertiesFile; @@ -186,7 +186,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * Use the dump() facility of jetty to print out the server configuration to logging * - * @parameter expression"${dumponStart}" default-value="false" + * @parameter property="dumponStart" default-value="false" */ protected boolean dumpOnStart; @@ -194,7 +194,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * Skip this mojo execution. * - * @parameter expression="${jetty.skip}" default-value="false" + * @parameter property="jetty.skip" default-value="false" */ protected boolean skip; @@ -212,7 +212,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * The maven project. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @readonly */ protected MavenProject project; @@ -221,14 +221,14 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * The artifacts for the project. * - * @parameter expression="${project.artifacts}" + * @parameter default-value="${project.artifacts}" * @readonly */ protected Set projectArtifacts; /** - * @parameter expression="${mojoExecution}" + * @parameter default-value="${mojoExecution}" * @readonly */ protected org.apache.maven.plugin.MojoExecution execution; @@ -237,7 +237,7 @@ public abstract class AbstractJettyMojo extends AbstractMojo /** * The artifacts for the plugin itself. * - * @parameter expression="${plugin.artifacts}" + * @parameter default-value="${plugin.artifacts}" * @readonly */ protected List pluginArtifacts; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java index 7d454444c4e..11e0a8aabe2 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java @@ -42,7 +42,7 @@ public class JettyEffectiveWebXml extends JettyRunMojo /** * The target directory * - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @required * @readonly */ diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java index b6a1e4456e5..d51c44cfb92 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java @@ -79,7 +79,7 @@ public class JettyRunForkedMojo extends JettyRunMojo /** * The target directory * - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @required * @readonly */ @@ -88,34 +88,34 @@ public class JettyRunForkedMojo extends JettyRunMojo /** * The file into which to generate the quickstart web xml for the forked process to use * - * @parameter expression="${project.build.directory}/fork-web.xml" + * @parameter default-value="${project.build.directory}/fork-web.xml" */ protected File forkWebXml; /** * Arbitrary jvm args to pass to the forked process - * @parameter expression="${jetty.jvmArgs}" + * @parameter property="jetty.jvmArgs" */ private String jvmArgs; /** - * @parameter expression="${plugin.artifacts}" + * @parameter default-value="${plugin.artifacts}" * @readonly */ private List pluginArtifacts; /** - * @parameter expression="${plugin}" + * @parameter default-value="${plugin}" * @readonly */ private PluginDescriptor plugin; /** - * @parameter expression="true" default-value="true" + * @parameter default-value="true" */ private boolean waitForChild; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java index 68b3e2168ad..190032d0576 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java @@ -79,7 +79,7 @@ public class JettyRunMojo extends AbstractJettyMojo * The default location of the web.xml file. Will be used * if <webApp><descriptor> is not set. * - * @parameter expression="${maven.war.webxml}" + * @parameter default-value="${maven.war.webxml}" * @readonly */ protected String webXml; @@ -88,7 +88,7 @@ public class JettyRunMojo extends AbstractJettyMojo /** * The directory containing generated classes. * - * @parameter expression="${project.build.outputDirectory}" + * @parameter default-value="${project.build.outputDirectory}" * @required * */ @@ -106,7 +106,7 @@ public class JettyRunMojo extends AbstractJettyMojo /** * The directory containing generated test classes. * - * @parameter expression="${project.build.testOutputDirectory}" + * @parameter default-value="${project.build.testOutputDirectory}" * @required */ protected File testClassesDirectory; @@ -122,7 +122,7 @@ public class JettyRunMojo extends AbstractJettyMojo /** * Root directory for all html/jsp etc files * - * @parameter expression="${maven.war.src}" + * @parameter default-value="${maven.war.src}" * */ protected File webAppSourceDirectory; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java index 66fb19bc80d..16f35dd1af3 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarExplodedMojo.java @@ -52,7 +52,7 @@ public class JettyRunWarExplodedMojo extends AbstractJettyMojo /** * The location of the war file. * - * @parameter expression="${project.build.directory}/${project.build.finalName}" + * @parameter default-value="${project.build.directory}/${project.build.finalName}" * @required */ private File war; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java index e55bee9c8fb..ce24359d52e 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java @@ -50,7 +50,7 @@ public class JettyRunWarMojo extends AbstractJettyMojo /** * The location of the war file. - * @parameter expression="${project.build.directory}/${project.build.finalName}.war" + * @parameter default-value="${project.build.directory}/${project.build.finalName}.war" * @required */ private File war;