Author: brianf Date: Tue Dec 23 18:54:13 2008 New Revision: 729201 URL: http://svn.apache.org/viewvc?rev=729201&view=rev Log: MENFORCER-30: a couple of small clean ups
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/child/pom.xml maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java?rev=729201&r1=729200&r2=729201&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java Tue Dec 23 18:54:13 2008 @@ -100,16 +100,16 @@ */ public EnforcerRuleUtils( EnforcerRuleHelper helper ) { - // get the various expressions out of the + + this.helper = helper; + // get the various expressions out of the // helper. - - try + try { factory = (ArtifactFactory) helper.getComponent( ArtifactFactory.class ); resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class ); local = (ArtifactRepository) helper.evaluate( "${localRepository}" ); project = (MavenProject) helper.evaluate( "${project}" ); - this.helper = helper; remoteRepositories = project.getRemoteArtifactRepositories(); } catch ( ComponentLookupException e ) @@ -292,6 +292,7 @@ } else { + //MENFORCER-30, handle cases where the value is a property like ${project.parent.groupId} modelGroup = (String) helper.evaluate( modelGroup ); } @@ -301,6 +302,7 @@ } else { + //MENFORCER-30, handle cases where the value is a property like ${project.parent.version} modelVersion = (String) helper.evaluate( modelVersion ); } } Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java?rev=729201&r1=729200&r2=729201&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java Tue Dec 23 18:54:13 2008 @@ -176,7 +176,7 @@ List models = utils.getModelsRecursively( "org.apache.maven.plugins.enforcer.test", "child", "1.0-SNAPSHOT", pom ); - // there should be 1 + // there should be 2 assertEquals( 2, models.size() ); } @@ -203,7 +203,7 @@ List models = utils.getModelsRecursively( "org.apache.maven.plugins.enforcer.test", "aggregate", "1.0-SNAPSHOT", pom ); - // there should be 1 + // there should be 2 assertEquals( 2, models.size() ); } @@ -230,7 +230,7 @@ List models = utils.getModelsRecursively( "org.apache.maven.plugins.enforcer.test", "aggregate", "1.0-SNAPSHOT", pom ); - // there should be 1 + // there should be 2 assertEquals( 2, models.size() ); } Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/child/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/child/pom.xml?rev=729201&r1=729200&r2=729201&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/child/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/child/pom.xml Tue Dec 23 18:54:13 2008 @@ -9,4 +9,5 @@ <groupId>${project.parent.groupId}</groupId> <artifactId>child</artifactId> <version>${project.parent.version}</version> + <description>MENFORCER-30</description> </project> \ No newline at end of file Modified: maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/pom.xml?rev=729201&r1=729200&r2=729201&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/resources/requirePluginVersions/parentExpression/pom.xml Tue Dec 23 18:54:13 2008 @@ -3,4 +3,5 @@ <groupId>org.apache.maven.plugins.enforcer.test</groupId> <artifactId>parentExpression</artifactId> <version>1.0-SNAPSHOT</version> + <description>MENFORCER-30</description> </project> \ No newline at end of file