You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/02/09 18:14:51 UTC
[2/2] git commit: updated maven-plugin-plugin to latest,
replacing expression with property
updated maven-plugin-plugin to latest, replacing expression with
property
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/3ec96527
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3ec96527
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3ec96527
Branch: refs/heads/master
Commit: 3ec96527512d2e7628562eedb45a2477ea14dfeb
Parents: 23280cb
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Feb 9 18:13:56 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Feb 9 18:14:40 2014 +0100
----------------------------------------------------------------------
.../apache/maven/plugin/coreit/CheckMojo.java | 2 +-
.../plugin/coreit/CheckThreadSafetyMojo.java | 2 +-
.../plugin/coreit/DumpRepoLayoutsMojo.java | 2 +-
.../coreit/AggregatorDependenciesMojo.java | 2 +-
.../apache/maven/plugin/coreit/AttachMojo.java | 6 ++--
.../maven/plugin/coreit/AttachPomMojo.java | 2 +-
.../maven/plugin/coreit/DeployFileMojo.java | 12 +++----
.../apache/maven/plugin/coreit/DeployMojo.java | 2 +-
.../plugin/coreit/InstallArtifactsMojo.java | 4 +--
.../maven/plugin/coreit/InstallCustomMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/SetMojo.java | 2 +-
.../maven/plugin/coreit/AbstractLoadMojo.java | 4 +--
.../plugin/coreit/AssignmentCompatibleMojo.java | 2 +-
.../maven/plugin/coreit/InstanceofMojo.java | 4 +--
.../plugin/coreit/LoadDependenciesMojo.java | 2 +-
.../apache/maven/plugin/coreit/LoadMojo.java | 4 +--
.../maven/plugin/coreit/AppendConfigMojo.java | 6 ++--
.../maven/plugin/coreit/CliConfigMojo.java | 14 ++++-----
.../apache/maven/plugin/coreit/ConfigMojo.java | 32 +++++++++----------
.../maven/plugin/coreit/CustomConfigMojo.java | 6 ++--
.../maven/plugin/coreit/RequiredConfigMojo.java | 4 +--
.../apache/maven/plugin/coreit/CatchMojo.java | 2 +-
.../apache/maven/plugin/coreit/ThrowMojo.java | 2 +-
.../maven/plugin/coreit/AggregateTestMojo.java | 2 +-
.../apache/maven/plugin/coreit/CompileMojo.java | 4 +--
.../apache/maven/plugin/coreit/RuntimeMojo.java | 4 +--
.../apache/maven/plugin/coreit/TestMojo.java | 4 +--
.../plugin/coreit/AbstractDependencyMojo.java | 2 +-
.../maven/plugin/coreit/AggregateTestMojo.java | 6 ++--
.../apache/maven/plugin/coreit/CompileMojo.java | 8 ++---
.../maven/plugin/coreit/CompileRuntimeMojo.java | 14 ++++-----
.../plugin/coreit/ResolveOneDependencyMojo.java | 4 +--
.../apache/maven/plugin/coreit/RuntimeMojo.java | 8 ++---
.../apache/maven/plugin/coreit/TestMojo.java | 10 +++---
.../coreit/MojoExecutionExceptionMojo.java | 2 +-
.../plugin/coreit/MojoFailureExceptionMojo.java | 6 ++--
.../apache/maven/plugin/coreit/EvalMojo.java | 4 +--
.../plugin/coreit/ForkGoalAggregatorMojo.java | 4 +--
.../maven/plugin/coreit/ForkGoalMojo.java | 4 +--
.../coreit/ForkLifecycleAggregatorMojo.java | 4 +--
.../maven/plugin/coreit/ForkLifecycleMojo.java | 4 +--
.../apache/maven/plugin/coreit/TouchMojo.java | 4 +--
.../maven/plugin/coreit/AbstractLogMojo.java | 2 +-
.../maven/plugin/coreit/LogSeparatorMojo.java | 2 +-
.../maven/plugin/coreit/LogStringMojo.java | 2 +-
.../plugin/coreit/PathInterpolationMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/ItMojo.java | 2 +-
.../maven/plugin/coreit/NoProjectMojo.java | 4 +--
.../apache/maven/plugin/coreit/TouchMojo.java | 2 +-
.../apache/maven/plugin/coreit/AppendMojo.java | 2 +-
.../maven/plugin/coreit/PackagingMojo.java | 4 +--
.../coreit/PluginParamInterpolationMojo.java | 2 +-
.../coreit/PropertyInterpolationMojo.java | 2 +-
.../PropertyInterpolationVerifierMojo.java | 33 ++++++++++++--------
.../plugin/coreit/CoreItMojoWithSetters.java | 2 +-
.../maven/plugin/coreit/SettingsReadItMojo.java | 2 +-
.../org/apache/maven/plugin/coreit/ItMojo.java | 2 +-
.../maven/plugin/coreit/GenerateMojo.java | 2 +-
.../apache/maven/plugin/coreit/ListMojo.java | 4 +--
.../apache/maven/plugin/coreit/CoreItMojo.java | 10 +++---
.../maven/plugin/coreit/FindToolMojo.java | 8 ++---
.../apache/maven/plugin/coreit/CoreItMojo.java | 12 +++----
.../maven/plugin/coreit/UsesPropertiesMojo.java | 4 +--
.../maven/plugin/coreit/DumpAuthMojo.java | 2 +-
.../maven/plugin/coreit/DumpVersionMojo.java | 8 ++---
.../maven/plugin/coreit/LoadResourceMojo.java | 6 ++--
.../maven/plugin/coreit/LookupWagonMojo.java | 2 +-
core-it-support/core-it-plugins/pom.xml | 4 +--
68 files changed, 176 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
index 36b38ef..77332db 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
@@ -69,7 +69,7 @@ public class CheckMojo
/**
* The path to the properties file to create.
*
- * @parameter expression="${collections.outputFile}"
+ * @parameter property="collections.outputFile"
*/
private File outputFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
index d4e1025..f459eb4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
@@ -70,7 +70,7 @@ public class CheckThreadSafetyMojo
/**
* The path to the properties file to create.
*
- * @parameter expression="${collections.outputFile}"
+ * @parameter property="collections.outputFile"
*/
private File outputFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DumpRepoLayoutsMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DumpRepoLayoutsMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DumpRepoLayoutsMojo.java
index 1346df3..7aa7fb3 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DumpRepoLayoutsMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DumpRepoLayoutsMojo.java
@@ -69,7 +69,7 @@ public class DumpRepoLayoutsMojo
/**
* The path to the properties file used to dump the repository layouts.
*
- * @parameter expression="${collections.layoutsFile}"
+ * @parameter property="collections.layoutsFile"
*/
private File layoutsFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
index 461d49a..7a9c620 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
@@ -38,7 +38,7 @@ public class AggregatorDependenciesMojo
/**
* The path to the touch file, relative to the project's base directory.
*
- * @parameter expression="${aggregator.touchFile}" default-value="${project.build.directory}/touch.txt"
+ * @parameter property="aggregator.touchFile" default-value="${project.build.directory}/touch.txt"
*/
private File touchFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
index d820c4a..7a69e18 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
@@ -59,7 +59,7 @@ public class AttachMojo
/**
* The path to the file to attach, relative to the project base directory. The plugin will not validate this path.
*
- * @parameter expression="${artifact.attachedFile}"
+ * @parameter property="artifact.attachedFile"
* @required
*/
private String attachedFile;
@@ -67,7 +67,7 @@ public class AttachMojo
/**
* The type of the artifact to attach.
*
- * @parameter expression="${artifact.artifactType}"
+ * @parameter property="artifact.artifactType"
*/
private String artifactType;
@@ -75,7 +75,7 @@ public class AttachMojo
* The classifier for the attached artifact. If unspecified, the default classifier for the specified artifact type
* is used.
*
- * @parameter expression="${artifact.artifactClassifier}"
+ * @parameter property="artifact.artifactClassifier"
*/
private String artifactClassifier;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
index 0da3adb..b3ecc0a 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
@@ -54,7 +54,7 @@ public class AttachPomMojo
* The path to the POM file to attach to the main artifact, relative to the project base directory. The plugin will
* not validate this path.
*
- * @parameter expression="${artifact.pomFile}" default-value="${project.file.path}"
+ * @parameter property="artifact.pomFile" default-value="${project.file.path}"
* @required
*/
private String pomFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
index 6b13279..baad6a4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
@@ -47,42 +47,42 @@ public class DeployFileMojo
/**
* The file of the artifact to deploy.
*
- * @parameter expression="${file}"
+ * @parameter property="file"
*/
private File file;
/**
* The group id of the artifact.
*
- * @parameter expression="${groupId}"
+ * @parameter property="groupId"
*/
private String groupId;
/**
* The artifact id of the artifact.
*
- * @parameter expression="${artifactId}"
+ * @parameter property="artifactId"
*/
private String artifactId;
/**
* The version of the artifact.
*
- * @parameter expression="${version}"
+ * @parameter property="version"
*/
private String version;
/**
* The URL of the repository to deploy to.
*
- * @parameter expression="${repositoryUrl}"
+ * @parameter property="repositoryUrl"
*/
private String repositoryUrl;
/**
* The ID of the repository to deploy to.
*
- * @parameter expression="${repositoryId}"
+ * @parameter property="repositoryId"
*/
private String repositoryId;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
index 07ccac4..b91c3bc 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
@@ -42,7 +42,7 @@ public class DeployMojo
/**
* The distribution repository.
*
- * @parameter expression="${project.distributionManagementArtifactRepository}"
+ * @parameter default-value="${project.distributionManagementArtifactRepository}"
* @readonly
* @required
*/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java
index eff8f5e..f6b21a1 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java
@@ -47,7 +47,7 @@ public class InstallArtifactsMojo
/**
* @readonly
- * @parameter expression="${project.runtimeArtifacts}"
+ * @parameter default-value="${project.runtimeArtifacts}"
*/
private List artifacts;
@@ -66,7 +66,7 @@ public class InstallArtifactsMojo
* and place the bin scripts.
*
* @required
- * @parameter expression="${assembleDirectory}" default-value="${project.build.directory}/appassembler"
+ * @parameter property="assembleDirectory" default-value="${project.build.directory}/appassembler"
*/
private File assembleDirectory;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
index f1dd101..6d822b7 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
@@ -44,7 +44,7 @@ public class InstallCustomMojo
/**
* The base directory of the local repository to install to.
*
- * @parameter expression="${install.localRepoDir}"
+ * @parameter property="install.localRepoDir"
*/
private File localRepoDir;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
index df56ea8..05dc4a6 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
@@ -54,7 +54,7 @@ public class SetMojo
* The path to the file to set as the main artifact, relative to the project base directory. The plugin will not
* validate this path.
*
- * @parameter expression="${artifact.mainFile}"
+ * @parameter property="artifact.mainFile"
* @required
*/
private String mainFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
index 0f41c12..4c1e1e0 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
@@ -51,7 +51,7 @@ public abstract class AbstractLoadMojo
* comma separated list of all public methods declared directly in that class, in alphabetic order and possibly with
* duplicates to account for overloaded methods.
*
- * @parameter expression="${clsldr.classNames}"
+ * @parameter property="clsldr.classNames"
*/
protected String classNames;
@@ -61,7 +61,7 @@ public abstract class AbstractLoadMojo
* the URL to the resource. In addition, the keys <code>ARP.count</code>, <code>ARP.0</code>, <code>ARP.1</code>
* etc. will enumerate all URLs matching the resource name.
*
- * @parameter expression="${clsldr.resourcePaths}"
+ * @parameter property="clsldr.resourcePaths"
*/
protected String resourcePaths;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AssignmentCompatibleMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AssignmentCompatibleMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AssignmentCompatibleMojo.java
index 0099774..3a2c306 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AssignmentCompatibleMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AssignmentCompatibleMojo.java
@@ -42,7 +42,7 @@ public class AssignmentCompatibleMojo
/**
* The path to the properties file used to track the results of the assignment compatibility tests.
*
- * @parameter expression="${clsldr.assigncompatPropertiesFile}"
+ * @parameter property="clsldr.assigncompatPropertiesFile"
*/
private File assigncompatPropertiesFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
index ba1186c..dda908d 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
@@ -47,7 +47,7 @@ public class InstanceofMojo
/**
* The path to the properties file used to track the results of the instanceof tests.
*
- * @parameter expression="${clsldr.instanceofPropertiesFile}"
+ * @parameter property="clsldr.instanceofPropertiesFile"
*/
private File instanceofPropertiesFile;
@@ -55,7 +55,7 @@ public class InstanceofMojo
* The qualified name of the type to which the objects should be assignment-compatible. This type will be loaded
* from the plugin class loader, just like as if it was imported in the plugin source code.
*
- * @parameter expression="${clsldr.className}"
+ * @parameter property="clsldr.className"
*/
private String className;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
index bcebe0b..a714952 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
@@ -54,7 +54,7 @@ public class LoadDependenciesMojo
* The path to the properties file used to track the results of the class/resource loading via the project class
* loader.
*
- * @parameter expression="${clsldr.projectClassLoaderOutput}"
+ * @parameter property="clsldr.projectClassLoaderOutput"
*/
private File projectClassLoaderOutput;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
index e62864f..a793cc5 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
@@ -40,7 +40,7 @@ public class LoadMojo
* The path to the properties file used to track the results of the class/resource loading via the plugin class
* loader.
*
- * @parameter expression="${clsldr.pluginClassLoaderOutput}"
+ * @parameter property="clsldr.pluginClassLoaderOutput"
*/
private File pluginClassLoaderOutput;
@@ -48,7 +48,7 @@ public class LoadMojo
* The path to the properties file used to track the results of the class/resource loading via the thread's context
* class loader.
*
- * @parameter expression="${clsldr.contextClassLoaderOutput}"
+ * @parameter property="clsldr.contextClassLoaderOutput"
*/
private File contextClassLoaderOutput;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
index ea63ff3..c8b1694 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
@@ -53,7 +53,7 @@ public class AppendConfigMojo
* The path to the properties file into which to save the mojo configuration. <em>Note:</em> This intentionally uses
* another parameter name for the output file than {@link ConfigMojo}.
*
- * @parameter expression="${config.outputFile}"
+ * @parameter property="config.outputFile"
*/
private File outputFile;
@@ -68,14 +68,14 @@ public class AppendConfigMojo
/**
* A simple parameter of type {@link java.lang.String}.
*
- * @parameter expression="${config.stringParam}"
+ * @parameter property="config.stringParam"
*/
private String stringParam;
/**
* A simple parameter of type {@link java.io.File}.
*
- * @parameter expression="${config.fileParam}"
+ * @parameter property="config.fileParam"
*/
private File fileParam;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
index 60275e1..0988254 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
@@ -52,49 +52,49 @@ public class CliConfigMojo
/**
* The path to the properties file into which to save the mojo configuration.
*
- * @parameter expression="${config.propertiesFile}"
+ * @parameter property="config.propertiesFile"
*/
private File propertiesFile;
/**
* A simple parameter of type {@link java.lang.String}.
*
- * @parameter expression="${config.stringParam}"
+ * @parameter property="config.stringParam"
*/
private String stringParam;
/**
* A simple parameter of type {@link java.io.File}.
*
- * @parameter expression="${config.fileParam}"
+ * @parameter property="config.fileParam"
*/
private File fileParam;
/**
* An array parameter of component type {@link java.lang.String}.
*
- * @parameter expression="${config.stringParams}"
+ * @parameter property="config.stringParams"
*/
private String[] stringParams;
/**
* An array parameter of component type {@link java.io.File}.
*
- * @parameter expression="${config.fileParams}"
+ * @parameter property="config.fileParams"
*/
private File[] fileParams;
/**
* A collection parameter of type {@link java.util.List}.
*
- * @parameter expression="${config.listParam}"
+ * @parameter property="config.listParam"
*/
private List listParam;
/**
* A collection parameter of type {@link java.util.Set}.
*
- * @parameter expression="${config.setParam}"
+ * @parameter property="config.setParam"
*/
private Set setParam;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
index 380eeb6..268d258 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
@@ -56,7 +56,7 @@ public class ConfigMojo
/**
* The path to the properties file into which to save the mojo configuration.
*
- * @parameter expression="${config.propertiesFile}"
+ * @parameter property="config.propertiesFile"
*/
private File propertiesFile;
@@ -84,105 +84,105 @@ public class ConfigMojo
/**
* A parameter that combines all of the annotations.
*
- * @parameter alias="fullyAnnotatedParam" expression="${config.aliasDefaultExpressionParam}" default-value="test"
+ * @parameter alias="fullyAnnotatedParam" property="config.aliasDefaultExpressionParam" default-value="test"
*/
private String aliasDefaultExpressionParam;
/**
* A simple parameter of type {@link java.lang.Boolean}.
*
- * @parameter expression="${config.booleanParam}"
+ * @parameter property="config.booleanParam"
*/
private Boolean booleanParam;
/**
* A simple parameter of type {@link java.lang.Boolean#TYPE}.
*
- * @parameter expression="${config.primitiveBooleanParam}"
+ * @parameter property="config.primitiveBooleanParam"
*/
private boolean primitiveBooleanParam;
/**
* A simple parameter of type {@link java.lang.Byte}.
*
- * @parameter expression="${config.byteParam}"
+ * @parameter property="config.byteParam"
*/
private Byte byteParam;
/**
* A simple parameter of type {@link java.lang.Short}.
*
- * @parameter expression="${config.shortParam}"
+ * @parameter property="config.shortParam"
*/
private Short shortParam;
/**
* A simple parameter of type {@link java.lang.Integer}.
*
- * @parameter expression="${config.intergerParam}"
+ * @parameter property="config.intergerParam"
*/
private Integer integerParam;
/**
* A simple parameter of type {@link java.lang.Integer#TYPE}.
*
- * @parameter expression="${config.primitiveIntegerParam}"
+ * @parameter property="config.primitiveIntegerParam"
*/
private int primitiveIntegerParam;
/**
* A simple parameter of type {@link java.lang.Long}.
*
- * @parameter expression="${config.longParam}"
+ * @parameter property="config.longParam"
*/
private Long longParam;
/**
* A simple parameter of type {@link java.lang.Float}.
*
- * @parameter expression="${config.floatParam}"
+ * @parameter property="config.floatParam"
*/
private Float floatParam;
/**
* A simple parameter of type {@link java.lang.Double}.
*
- * @parameter expression="${config.doubleParam}"
+ * @parameter property="config.doubleParam"
*/
private Double doubleParam;
/**
* A simple parameter of type {@link java.lang.Character}.
*
- * @parameter expression="${config.characterParam}"
+ * @parameter property="config.characterParam"
*/
private Character characterParam;
/**
* A simple parameter of type {@link java.lang.String}.
*
- * @parameter expression="${config.stringParam}"
+ * @parameter property="config.stringParam"
*/
private String stringParam;
/**
* A simple parameter of type {@link java.io.File}.
*
- * @parameter expression="${config.fileParam}"
+ * @parameter property="config.fileParam"
*/
private File fileParam;
/**
* A simple parameter of type {@link java.util.Date}.
*
- * @parameter expression="${config.dateParam}"
+ * @parameter property="config.dateParam"
*/
private Date dateParam;
/**
* A simple parameter of type {@link java.net.URL}.
*
- * @parameter expression="${config.urlParam}"
+ * @parameter property="config.urlParam"
*/
private URL urlParam;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
index 888e12f..a304b0a 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
@@ -53,7 +53,7 @@ public class CustomConfigMojo
/**
* The path to the properties file into which to save the mojo configuration.
*
- * @parameter expression="${config.propertiesFile}"
+ * @parameter property="config.propertiesFile"
*/
private File propertiesFile;
@@ -75,14 +75,14 @@ public class CustomConfigMojo
/**
* A simple parameter of type {@link java.lang.String}.
*
- * @parameter expression="${config.stringParam}"
+ * @parameter property="config.stringParam"
*/
private String stringParam;
/**
* A simple parameter of type {@link java.io.File}.
*
- * @parameter expression="${config.fileParam}"
+ * @parameter property="config.fileParam"
*/
private File fileParam;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
index 7c63612..7081f62 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
@@ -48,14 +48,14 @@ public class RequiredConfigMojo
/**
* The path to the properties file into which to save the mojo configuration.
*
- * @parameter expression="${config.propertiesFile}"
+ * @parameter property="config.propertiesFile"
*/
private File propertiesFile;
/**
* A required parameter to be set via plugin configuration in POM or system property from CLI.
*
- * @parameter expression="${config.requiredParam}"
+ * @parameter property="config.requiredParam"
* @required
*/
private String requiredParam;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
index 6a5f9b4..15ac122 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
@@ -38,7 +38,7 @@ public class CatchMojo
{
/**
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
* @readonly
*/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
index 2876121..685b9a7 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
@@ -35,7 +35,7 @@ public class ThrowMojo
public static final String THROWN_PARAMETER = "throw-parameter";
/**
- * @parameter expression="${value}" default-value="thrown"
+ * @parameter property="value" default-value="thrown"
*/
private String value;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
index 3526682..c407718 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
@@ -48,7 +48,7 @@ public class AggregateTestMojo
* disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
* do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 287c555..170d4ca 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -41,7 +41,7 @@ public class CompileMojo
* disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
* that do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -50,7 +50,7 @@ public class CompileMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.compileArtifacts}"
+ * @parameter property="depres.compileArtifacts"
*/
private String compileArtifacts;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
index fd3841e..e4e247d 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
@@ -41,7 +41,7 @@ public class RuntimeMojo
* disk. Unlike the runtime artifacts, the collection of project artifacts additionally contains those artifacts
* that do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -50,7 +50,7 @@ public class RuntimeMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.runtimeArtifacts}"
+ * @parameter property="depres.runtimeArtifacts"
*/
private String runtimeArtifacts;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 8eb4792..5a3057f 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -41,7 +41,7 @@ public class TestMojo
* disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
* do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -50,7 +50,7 @@ public class TestMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.testArtifacts}"
+ * @parameter property="depres.testArtifacts"
*/
private String testArtifacts;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
index 040c880..566c1d4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
@@ -63,7 +63,7 @@ public abstract class AbstractDependencyMojo
* as directory separator. For non-positive values, the full/absolute path is returned, using the platform-specific
* separator.
*
- * @parameter expression="${depres.significantPathLevels}"
+ * @parameter property="depres.significantPathLevels"
*/
private int significantPathLevels;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
index 9dc3c74..1b42d54 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
@@ -48,7 +48,7 @@ public class AggregateTestMojo
* disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
* do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -57,7 +57,7 @@ public class AggregateTestMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.testClassPath}"
+ * @parameter property="depres.testClassPath"
*/
private String testClassPath;
@@ -66,7 +66,7 @@ public class AggregateTestMojo
* directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of the
* JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.testClassPathChecksums}"
+ * @parameter property="depres.testClassPathChecksums"
*/
private String testClassPathChecksums;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 76470ac..6d81bdb 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -43,7 +43,7 @@ public class CompileMojo
* disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
* that do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -52,7 +52,7 @@ public class CompileMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.compileArtifacts}"
+ * @parameter property="depres.compileArtifacts"
*/
private String compileArtifacts;
@@ -61,7 +61,7 @@ public class CompileMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.compileClassPath}"
+ * @parameter property="depres.compileClassPath"
*/
private String compileClassPath;
@@ -70,7 +70,7 @@ public class CompileMojo
* base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
* the JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.compileClassPathChecksums}"
+ * @parameter property="depres.compileClassPathChecksums"
*/
private String compileClassPathChecksums;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
index 960c289..229e62e 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
@@ -43,7 +43,7 @@ public class CompileRuntimeMojo
* disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
* that do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -52,7 +52,7 @@ public class CompileRuntimeMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.compileArtifacts}"
+ * @parameter property="depres.compileArtifacts"
*/
private String compileArtifacts;
@@ -61,7 +61,7 @@ public class CompileRuntimeMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.compileClassPath}"
+ * @parameter property="depres.compileClassPath"
*/
private String compileClassPath;
@@ -70,7 +70,7 @@ public class CompileRuntimeMojo
* base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
* the JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.compileClassPathChecksums}"
+ * @parameter property="depres.compileClassPathChecksums"
*/
private String compileClassPathChecksums;
@@ -79,7 +79,7 @@ public class CompileRuntimeMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.runtimeArtifacts}"
+ * @parameter property="depres.runtimeArtifacts"
*/
private String runtimeArtifacts;
@@ -88,7 +88,7 @@ public class CompileRuntimeMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.runtimeClassPath}"
+ * @parameter property="depres.runtimeClassPath"
*/
private String runtimeClassPath;
@@ -97,7 +97,7 @@ public class CompileRuntimeMojo
* base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
* the JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.runtimeClassPathChecksums}"
+ * @parameter property="depres.runtimeClassPathChecksums"
*/
private String runtimeClassPathChecksums;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
index 694f4a5..5375856 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
@@ -92,7 +92,7 @@ public class ResolveOneDependencyMojo
private String scope;
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
*/
MavenProject project;
@@ -112,7 +112,7 @@ public class ResolveOneDependencyMojo
/**
* The Maven session.
*
- * @parameter expression="${session}"
+ * @parameter default-value="${session}"
* @readonly
* @required
*/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
index a6c3cca..0343267 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
@@ -43,7 +43,7 @@ public class RuntimeMojo
* disk. Unlike the runtime artifacts, the collection of project artifacts additionally contains those artifacts
* that do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -52,7 +52,7 @@ public class RuntimeMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.runtimeArtifacts}"
+ * @parameter property="depres.runtimeArtifacts"
*/
private String runtimeArtifacts;
@@ -61,7 +61,7 @@ public class RuntimeMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.runtimeClassPath}"
+ * @parameter property="depres.runtimeClassPath"
*/
private String runtimeClassPath;
@@ -70,7 +70,7 @@ public class RuntimeMojo
* base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
* the JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.runtimeClassPathChecksums}"
+ * @parameter property="depres.runtimeClassPathChecksums"
*/
private String runtimeClassPathChecksums;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 8f15a06..9af4a35 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -43,7 +43,7 @@ public class TestMojo
* disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
* do not contribute to the class path.
*
- * @parameter expression="${depres.projectArtifacts}"
+ * @parameter property="depres.projectArtifacts"
*/
private String projectArtifacts;
@@ -53,7 +53,7 @@ public class TestMojo
* written to disk. Unlike the test artifacts, the collection of direct project artifacts additionally contains
* those artifacts that do not contribute to the class path.
*
- * @parameter expression="${depres.dependencyArtifacts}"
+ * @parameter property="depres.dependencyArtifacts"
*/
private String dependencyArtifacts;
@@ -62,7 +62,7 @@ public class TestMojo
* UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
* disk.
*
- * @parameter expression="${depres.testArtifacts}"
+ * @parameter property="depres.testArtifacts"
*/
private String testArtifacts;
@@ -71,7 +71,7 @@ public class TestMojo
* this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
* will not be written to disk.
*
- * @parameter expression="${depres.testClassPath}"
+ * @parameter property="depres.testClassPath"
*/
private String testClassPath;
@@ -80,7 +80,7 @@ public class TestMojo
* directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of the
* JAR. If not specified, the class path checksums will not be calculated.
*
- * @parameter expression="${depres.testClassPathChecksums}"
+ * @parameter property="depres.testClassPathChecksums"
*/
private String testClassPathChecksums;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java
index 33e1e37..e0014f4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoExecutionExceptionMojo.java
@@ -30,7 +30,7 @@ public class MojoExecutionExceptionMojo
extends AbstractMojo
{
/**
- * @parameter expression="${error.message}" default-value="Planned MojoExecutionException."
+ * @parameter property="error.message" default-value="Planned MojoExecutionException."
* @required
*/
private String message;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
index 3cdb3d9..307d54b 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
@@ -33,7 +33,7 @@ public class MojoFailureExceptionMojo
* Message used in {@link MojoFailureException#MojoFailureException(String)}, unless longMessage
* is supplied; then, this becomes the short message in {@link MojoFailureException#MojoFailureException(Object, String, String)}.
*
- * @parameter expression="${error.message}" default-value="Planned MojoExecutionException."
+ * @parameter property="error.message" default-value="Planned MojoExecutionException."
* @required
*/
private String message;
@@ -41,13 +41,13 @@ public class MojoFailureExceptionMojo
/**
* If supplied, The form {@link MojoFailureException#MojoFailureException(Object, String, String)} will be used.
*
- * @parameter expression="${error.longMessage}"
+ * @parameter property="error.longMessage"
* @required
*/
private String longMessage;
/**
- * @parameter expression="${error.source}"
+ * @parameter property="error.source"
*/
private String source;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
index 6aee51c..ac69865 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
@@ -77,7 +77,7 @@ public class EvalMojo
* parameter {@link #expressions} an similar named properties key will be used to save the expression value. If an
* expression evaluated to <code>null</code>, there will be no corresponding key in the properties file.
*
- * @parameter expression="${expression.outputFile}"
+ * @parameter property="expression.outputFile"
*/
private File outputFile;
@@ -91,7 +91,7 @@ public class EvalMojo
/**
* The comma separated set of expressions to evaluate.
*
- * @parameter expression="${expression.expressions}"
+ * @parameter property="expression.expressions"
*/
private String expressionList;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java
index e7a3272..1683339 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalAggregatorMojo.java
@@ -36,12 +36,12 @@ public class ForkGoalAggregatorMojo
extends AbstractMojo
{
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
*/
private MavenProject project;
/**
- * @parameter expression="${reactorProjects}"
+ * @parameter default-value="${reactorProjects}"
*/
private List reactorProjects;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalMojo.java
index dd7b096..2af4cc2 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkGoalMojo.java
@@ -32,12 +32,12 @@ public class ForkGoalMojo
extends AbstractMojo
{
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
*/
private MavenProject project;
/**
- * @parameter expression="${executedProject}"
+ * @parameter default-value="${executedProject}"
*/
private MavenProject executedProject;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleAggregatorMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleAggregatorMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleAggregatorMojo.java
index a01e72e..24fc3b3 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleAggregatorMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleAggregatorMojo.java
@@ -37,12 +37,12 @@ public class ForkLifecycleAggregatorMojo
{
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
*/
private MavenProject project;
/**
- * @parameter expression="${reactorProjects}"
+ * @parameter default-value="${reactorProjects}"
*/
private List reactorProjects;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleMojo.java
index af0a9e1..217da54 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleMojo.java
@@ -34,12 +34,12 @@ public class ForkLifecycleMojo
extends AbstractMojo
{
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
*/
private MavenProject project;
/**
- * @parameter expression="${executedProject}"
+ * @parameter default-value="${executedProject}"
*/
private MavenProject executedProject;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 2cf0acf..5401d48 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -40,12 +40,12 @@ public class TouchMojo
static final String FINAL_NAME = "coreitified";
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
*/
private MavenProject project;
/**
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private File outputDirectory;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
index aa29158..d4472b7 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
@@ -50,7 +50,7 @@ public abstract class AbstractLogMojo
/**
* The path to the output file, relative to the project's base directory.
*
- * @parameter expression="${log.logFile}"
+ * @parameter property="log.logFile"
*/
private File logFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
index 200867a..dcf5f83 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
@@ -37,7 +37,7 @@ public class LogSeparatorMojo
/**
* The length of the separator line.
*
- * @parameter expression="${log.length}" default-value="80"
+ * @parameter property="log.length" default-value="80"
*/
private int length;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
index 8f060e2..0f67b56 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
@@ -37,7 +37,7 @@ public class LogStringMojo
/**
* The string to append to the log file.
*
- * @parameter expression="${log.string}"
+ * @parameter property="log.string"
*/
private String string;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java
index dc86b3f..1b95cd4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java
@@ -36,7 +36,7 @@ public class PathInterpolationMojo
/** @component */
private ModelInterpolator modelInterpolator;
- /** @parameter expression="${project}" */
+ /** @parameter default-value="${project}" */
private MavenProject project;
public void execute()
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index c25d9d2..ad7016b 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
@@ -43,7 +43,7 @@ public class ItMojo
/**
* The path to the output file.
*
- * @parameter expression="${touch.outputFile}" default-value="target/comp.properties"
+ * @parameter property="touch.outputFile" default-value="target/comp.properties"
*/
private File outputFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
index ba37d9e..de0dc49 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
@@ -38,13 +38,13 @@ public class NoProjectMojo
extends AbstractMojo
{
/**
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private String outputDirectory;
/**
- * @parameter expression="target/test-basedir-alignment"
+ * @parameter default-value="target/test-basedir-alignment"
*/
private File basedirAlignmentDirectory;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 744784f..4912802 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -41,7 +41,7 @@ public class TouchMojo
/**
* The path to the output file.
*
- * @parameter expression="${touch.outputFile}" default-value="target/touch.txt"
+ * @parameter property="touch.outputFile" default-value="target/touch.txt"
*/
private File outputFile;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
index debdde0..0302ec3 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/AppendMojo.java
@@ -38,7 +38,7 @@ public class AppendMojo
{
/**
- * @parameter expression="${append.message}"
+ * @parameter property="append.message"
*/
private String message;
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
index 56f09ea..197b7f4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
@@ -37,13 +37,13 @@ public class PackagingMojo
{
/**
- * @parameter expression="${project.build.finalName}"
+ * @parameter default-value="${project.build.finalName}"
* @required
*/
private String finalName;
/**
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
* @readonly
*/
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
index 8fc980a..63e6cab 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
@@ -36,7 +36,7 @@ public class PluginParamInterpolationMojo
/** @parameter */
private String myDirectory;
- /** @parameter expression="${project}" */
+ /** @parameter default-value="${project}" */
private MavenProject project;
public void execute()
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
index 2452291..5221fb5 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
@@ -34,7 +34,7 @@ public class PropertyInterpolationMojo
extends AbstractMojo
{
- /** @parameter expression="${project}" */
+ /** @parameter default-value="${project}" */
private MavenProject project;
public void execute()