Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-08 01:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new IT to express the problems with caching the model before interpolation takes place.

Browse Source 
Rolled back the changes to suppress usage of the cached model in MavenMetadataSource. Restored original functionality, to pre- last revision.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163848 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-04-08 01:57:06 +00:00
parent 34f9e44721
commit 56969982a1
7 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core-it/README.txt
View File

@ -52,6 +52,9 @@ it0015: Test marmalade-driven mojo support. This will compile supporting java
it0016: Test a WAR generation
it0017: Test an EJB generation
it0018: Ensure that managed dependencies for dependency POMs are calculated
correctly when resolved.
-------------------------------------------------------------------------------
- generated sources

1
maven-core-it/integration-tests.txt
View File

@ -14,3 +14,4 @@ it0013
it0015
it0016
it0017
it0018

10
maven-core-it/it0018/.cvsignore Normal file
View File

@ -0,0 +1,10 @@
*~
*.log
target
*.ipr
*.iws
dist
target
.classpath
.project
log.txt

1
maven-core-it/it0018/expected-results.txt Normal file
View File

@ -0,0 +1 @@
target/classes/org/apache/maven/it0018/Person.class

1
maven-core-it/it0018/goals.txt Normal file
View File

@ -0,0 +1 @@
package

15
maven-core-it/it0018/pom.xml Normal file
View File

@ -0,0 +1,15 @@
<model>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0018</artifactId>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-el-commons</artifactId>
<version>1.0-alpha-2</version>
</dependency>
</dependencies>
</model>

18
maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
View File

@ -87,15 +87,15 @@ public Set retrieve( Artifact artifact, ArtifactRepository localRepository, List
// resolved. See note in DefaultMavenProjectBuilder, line 170 for
// further discussion.
// if ( mavenProjectBuilder != null )
// {
// Model model = mavenProjectBuilder.getCachedModel( artifact.getGroupId(), artifact.getArtifactId(),
// artifact.getVersion() );
// if ( model != null )
// {
// dependencies = model.getDependencies();
// }
// }
if ( mavenProjectBuilder != null )
{
Model model = mavenProjectBuilder.getCachedModel( artifact.getGroupId(), artifact.getArtifactId(),
artifact.getVersion() );
if ( model != null )
{
dependencies = model.getDependencies();
}
}
if ( dependencies == null )
{