You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/07 10:40:41 UTC
svn commit: r732286 - in /maven/components/trunk/maven-mercury: pom.xml
src/main/java/org/apache/maven/mercury/MavenDomainModel.java
Author: sisbell
Date: Wed Jan 7 01:40:40 2009
New Revision: 732286
URL: http://svn.apache.org/viewvc?rev=732286&view=rev
Log:
Fix: MNG-3856 - Just needed to replace modelProperty.getValue with modelProperty.getResolvedValue.
Modified:
maven/components/trunk/maven-mercury/pom.xml
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
Modified: maven/components/trunk/maven-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/pom.xml?rev=732286&r1=732285&r2=732286&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/pom.xml (original)
+++ maven/components/trunk/maven-mercury/pom.xml Wed Jan 7 01:40:40 2009
@@ -95,16 +95,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/MavenDependencyProcessorTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
-
</project>
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=732286&r1=732285&r2=732286&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java Wed Jan 7 01:40:40 2009
@@ -145,15 +145,15 @@
{
if ( mp.getUri().equals( ProjectUri.Parent.version ) )
{
- version = mp.getValue();
+ version = mp.getResolvedValue();
}
else if ( mp.getUri().equals( ProjectUri.Parent.artifactId ) )
{
- artifactId = mp.getValue();
+ artifactId = mp.getResolvedValue();
}
else if ( mp.getUri().equals( ProjectUri.Parent.groupId ) )
{
- groupId = mp.getValue();
+ groupId = mp.getResolvedValue();
}
if ( groupId != null && artifactId != null && version != null )
{
@@ -218,31 +218,31 @@
{
if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.groupId ) )
{
- metadata.setGroupId( mp.getValue() );
+ metadata.setGroupId( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.artifactId ) )
{
- metadata.setArtifactId( mp.getValue() );
+ metadata.setArtifactId( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.version ) )
{
- metadata.setVersion( mp.getValue() );
+ metadata.setVersion( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.classifier ) )
{
- metadata.setClassifier( mp.getValue() );
+ metadata.setClassifier( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.scope ) )
{
- metadata.setScope( mp.getValue() );
+ metadata.setScope( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.type ) )
{
- metadata.setType( mp.getValue() );
+ metadata.setType( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.optional ) )
{
- metadata.setOptional( mp.getValue() );
+ metadata.setOptional( mp.getResolvedValue() );
}
}
@@ -265,11 +265,11 @@
{
if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.artifactId ) )
{
- meta.setArtifactId( mp.getValue() );
+ meta.setArtifactId( mp.getResolvedValue() );
}
else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.groupId ) )
{
- meta.setGroupId( mp.getValue() );
+ meta.setGroupId( mp.getResolvedValue() );
}
}