Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: MNG-3856 - Just needed to replace modelProperty.getValue with modelProperty.getResolvedValue. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732286 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-01-07 09:40:40 +00:00
parent 70583e8717
commit e52473272d
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-mercury/pom.xml
View File

@ -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>

24
maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
View File

@ -145,15 +145,15 @@ public ArtifactBasicMetadata getParentMetadata()
{
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 @@ private ArtifactBasicMetadata transformContainerToMetadata( ModelContainer conta
{
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 @@ else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.optional ) )
{
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() );
}
}