Updated Branches: refs/heads/master 23280cb8a -> 3ec965275
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/PropertyInterpolationVerifierMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java index 6ce6429..3e4a2bd 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java @@ -32,38 +32,45 @@ import org.apache.maven.project.MavenProject; * @goal verify-property * @phase validate */ -public class PropertyInterpolationVerifierMojo extends AbstractMojo { +public class PropertyInterpolationVerifierMojo + extends AbstractMojo +{ /** - * @parameter expression="${project}" + * @parameter default-value="${project}" */ private MavenProject project; /** - * @parameter expression="${properties}" + * @parameter property="properties" */ private Properties properties; - - public void execute() throws MojoExecutionException, MojoFailureException { + public void execute() + throws MojoExecutionException, MojoFailureException + { Model model = project.getModel(); - if (properties == null) { + if ( properties == null ) + { return; } Enumeration e = properties.propertyNames(); - while (e.hasMoreElements()) { + while ( e.hasMoreElements() ) + { String name = (String) e.nextElement(); - String value = properties.getProperty(name); - if(!value.equals(model.getProperties().getProperty(name))) { - throw new MojoExecutionException("Properties do not match: Name = " + name + ", Value = " + value); + String value = properties.getProperty( name ); + if ( !value.equals( model.getProperties().getProperty( name ) ) ) + { + throw new MojoExecutionException( "Properties do not match: Name = " + name + ", Value = " + value ); } - if(value.indexOf("${") > -1) { - throw new MojoExecutionException("Unresolved value: Name = " + name + ", Value = " + value); + if ( value.indexOf( "${" ) > -1 ) + { + throw new MojoExecutionException( "Unresolved value: Name = " + name + ", Value = " + value ); } - getLog().info("Property match: Name = " + name + ", Value = " + value); + getLog().info( "Property match: Name = " + name + ", Value = " + value ); } } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java b/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java index 082a09c..4fbdfd9 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-setter/src/main/java/org/apache/maven/plugin/coreit/CoreItMojoWithSetters.java @@ -35,7 +35,7 @@ public class CoreItMojoWithSetters extends AbstractMojo { /** - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @required */ private String outputDirectoryValue; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-settings/src/main/java/org/apache/maven/plugin/coreit/SettingsReadItMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-settings/src/main/java/org/apache/maven/plugin/coreit/SettingsReadItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-settings/src/main/java/org/apache/maven/plugin/coreit/SettingsReadItMojo.java index 92bf57d..936d215 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-settings/src/main/java/org/apache/maven/plugin/coreit/SettingsReadItMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-settings/src/main/java/org/apache/maven/plugin/coreit/SettingsReadItMojo.java @@ -38,7 +38,7 @@ public class SettingsReadItMojo extends AbstractMojo { /** - * @parameter expression="${settings}" + * @parameter default-value="${settings}" * @required * @readonly */ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java index 69602f6..5d535f9 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java @@ -45,7 +45,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-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java index f6e7878..8126288 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java @@ -70,7 +70,7 @@ public class GenerateMojo /** * The reports configured for the current build. * - * @parameter expression="${reports}" + * @parameter default-value="${reports}" * @required * @readonly */ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java index 419367e..4b980cb 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java @@ -49,14 +49,14 @@ public class ListMojo * <code>reports</code> that gives the total count of reports. The keys <code>reports.0</code>, * <code>reports.1</code> etc. will be used to denote the qualified class names of the reports. * - * @parameter expression="${site.properties}" default-value="target/reports.properties" + * @parameter property="site.properties" default-value="target/reports.properties" */ private File reportsFile; /** * The reports configured for the current build. * - * @parameter expression="${reports}" + * @parameter default-value="${reports}" * @required * @readonly */ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java index 9c1a9bd..fc04fc4 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java @@ -52,7 +52,7 @@ public class CoreItMojo /** * The current Maven session holding the selected toolchain. * - * @parameter expression="${session}" + * @parameter default-value="${session}" * @required * @readonly */ @@ -61,28 +61,28 @@ public class CoreItMojo /** * The path to the output file for the properties. * - * @parameter expression="${toolchain.outputFile}" default-value="${project.build.directory}/toolchains.properties" + * @parameter property="toolchain.outputFile" default-value="${project.build.directory}/toolchains.properties" */ private File outputFile; /** * The type identifier of the toolchain, e.g. "jdk". * - * @parameter expression="${toolchain.type}" + * @parameter property="toolchain.type" */ private String type; /** * The name of the tool, e.g. "javac". * - * @parameter expression="${toolchain.tool}" + * @parameter property="toolchain.tool" */ private String tool; /** * The zero-based index of the toolchain to select and store in the build context. * - * @parameter expression="${toolchain.selected}" + * @parameter property="toolchain.selected" */ private int selected; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java index e72ac73..06fec9f 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java @@ -50,7 +50,7 @@ public class FindToolMojo /** * The current Maven session holding the selected toolchain. * - * @parameter expression="${session}" + * @parameter default-value="${session}" * @required * @readonly */ @@ -59,21 +59,21 @@ public class FindToolMojo /** * The path to the output file for the properties. * - * @parameter expression="${toolchain.outputFile}" default-value="${project.build.directory}/tool.properties" + * @parameter property="toolchain.outputFile" default-value="${project.build.directory}/tool.properties" */ private File outputFile; /** * The type identifier of the toolchain, e.g. "jdk". * - * @parameter expression="${toolchain.type}" + * @parameter property="toolchain.type" */ private String type; /** * The name of the tool, e.g. "javac". * - * @parameter expression="${toolchain.tool}" + * @parameter property="toolchain.tool" */ private String tool; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java index d2ff813..3d84794 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java @@ -40,24 +40,24 @@ public class CoreItMojo extends AbstractMojo { /** - * @parameter expression="${project}" + * @parameter default-value="${project}" */ private MavenProject project; /** - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @required */ private String outputDirectory; /** Test setting of plugin-artifacts on the PluginDescriptor instance. - * @parameter expression="${plugin.artifactMap}" + * @parameter default-value="${plugin.artifactMap}" * @required */ private Map pluginArtifacts; /** - * @parameter expression="target/test-basedir-alignment" + * @parameter default-value="target/test-basedir-alignment" */ private File basedirAlignmentDirectory; @@ -72,12 +72,12 @@ public class CoreItMojo private String goalItem = "bar"; /** - * @parameter expression="${artifactToFile}" + * @parameter property="artifactToFile" */ private String artifactToFile; /** - * @parameter expression="${fail}" + * @parameter property="fail" */ private boolean fail = false; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java index f002a14..258f079 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java @@ -34,12 +34,12 @@ public class UsesPropertiesMojo extends AbstractMojo { /** - * @parameter expression="${basedir}" + * @parameter default-value="${basedir}" */ private File basedir; /** - * @parameter expression="${project.properties}" + * @parameter default-value="${project.properties}" */ private Properties properties; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java index aff6fe2..cdeeb1b 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java @@ -62,7 +62,7 @@ public class DumpAuthMojo /** * The path to the properties file used to dump the auth infos. * - * @parameter expression="${wagon.propertiesFile}" + * @parameter property="wagon.propertiesFile" */ private File propertiesFile; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java index 49538f4..7b02347 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java @@ -60,28 +60,28 @@ public class DumpVersionMojo /** * The path to the properties file used to dump the auth infos. * - * @parameter expression="${wagon.propertiesFile}" + * @parameter property="wagon.propertiesFile" */ private File propertiesFile; /** * The role hint for the provider of interest. * - * @parameter expression="${wagon.providerHint}" + * @parameter property="wagon.providerHint" */ private String providerHint; /** * The group id for the provider of interest. * - * @parameter expression="${wagon.providerGroupId}" + * @parameter property="wagon.providerGroupId" */ private String providerGroupId; /** * The artifact id for the provider of interest. * - * @parameter expression="${wagon.providerArtifactId}" + * @parameter property="wagon.providerArtifactId" */ private String providerArtifactId; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java index 6eeb8df..00e8987 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java @@ -58,7 +58,7 @@ public class LoadResourceMojo /** * The path to the properties file used to track the results of the resource loading via the wagon's class loader. * - * @parameter expression="${wagon.wagonClassLoaderOutput}" + * @parameter property="wagon.wagonClassLoaderOutput" */ private File wagonClassLoaderOutput; @@ -66,14 +66,14 @@ public class LoadResourceMojo * The role hint for the wagon provider to load. The class loader of this provider will be used to load the * resources. * - * @parameter expression="${wagon.wagonProtocol}" + * @parameter property="wagon.wagonProtocol" */ private String wagonProtocol; /** * The repository to load the wagon for, if applicable. * - * @parameter expression="${wagon.repositoryId}" + * @parameter property="wagon.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-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java index 606cd8b..850e534 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java @@ -56,7 +56,7 @@ public class LookupWagonMojo /** * The path to the properties file used to track the results of the wagon lookups. * - * @parameter expression="${wagon.outputFile}" + * @parameter property="wagon.outputFile" */ private File outputFile; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3ec96527/core-it-support/core-it-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/pom.xml b/core-it-support/core-it-plugins/pom.xml index 54ce6a8..cc13a6e 100644 --- a/core-it-support/core-it-plugins/pom.xml +++ b/core-it-support/core-it-plugins/pom.xml @@ -108,7 +108,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>2.9</version> + <version>3.2</version> </plugin> </plugins> </pluginManagement> @@ -119,7 +119,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.1</version> + <version>3.2</version> </plugin> </plugins> </reporting>
