Updated Branches: refs/heads/master eb16f636f -> 65b28c194
fixed IT broken when using plugin-tools 3.x instead of 2.9, with property meaning changed by MPLUGIN-199 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/65b28c19 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/65b28c19 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/65b28c19 Branch: refs/heads/master Commit: 65b28c194e97bd676d1dfffc7accfa8cb5ed797a Parents: eb16f63 Author: Hervé Boutemy <[email protected]> Authored: Sun Feb 9 21:32:17 2014 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Sun Feb 9 21:32:17 2014 +0100 ---------------------------------------------------------------------- .../maven/plugin/coreit/CoreItMojoWithSetters.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/65b28c19/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 4fbdfd9..223246b 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 @@ -41,9 +41,15 @@ public class CoreItMojoWithSetters private String outputDirectoryValue; /** + * @parameter + */ + private String foo; + /* + * was previously * @parameter property="foo" + * private String fooValue; + * with plugin-tools 2.9, but this feature was removed from plugin-tools 3.0: see MPLUGIN-199 */ - private String fooValue; /** * @parameter @@ -66,7 +72,7 @@ public class CoreItMojoWithSetters getLog().info( "setFoo: " + fooValue ); - this.fooValue = fooValue; + this.foo = fooValue; setFooSetterExecuted = true; } @@ -96,12 +102,12 @@ public class CoreItMojoWithSetters File outDir = new File( outputDirectoryValue ); // Test parameter setting - if ( fooValue != null && setFooSetterExecuted ) + if ( foo != null && setFooSetterExecuted ) { getLog().info( "fooValue != null && setFooSetterExecuted" ); - touch( outDir, fooValue ); + touch( outDir, foo ); } if ( bar != null && setBarSetterExecuted )
