maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/artifact MavenMetadataSource.java
Date Fri, 08 Apr 2005 01:57:07 GMT
jdcasey     2005/04/07 18:57:06

  Modified:    maven-core-it integration-tests.txt README.txt
               maven-core/src/main/java/org/apache/maven/artifact
                        MavenMetadataSource.java
  Added:       maven-core-it/it0018 goals.txt pom.xml expected-results.txt
                        .cvsignore
  Log:
  Added new IT to express the problems with caching the model before interpolation takes place.
  
  Rolled back the changes to suppress usage of the cached model in MavenMetadataSource. Restored
original functionality, to pre- last revision.
  
  Revision  Changes    Path
  1.1                  maven-components/maven-core-it/it0018/goals.txt
  
  Index: goals.txt
  ===================================================================
  package
  
  
  
  1.1                  maven-components/maven-core-it/it0018/pom.xml
  
  Index: pom.xml
  ===================================================================
  <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>
  
  
  
  1.1                  maven-components/maven-core-it/it0018/expected-results.txt
  
  Index: expected-results.txt
  ===================================================================
  target/classes/org/apache/maven/it0018/Person.class
  
  
  
  1.1                  maven-components/maven-core-it/it0018/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  *~
  *.log
  target
  *.ipr
  *.iws
  dist
  target
  .classpath
  .project
  log.txt
  
  
  
  1.23      +1 -0      maven-components/maven-core-it/integration-tests.txt
  
  Index: integration-tests.txt
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core-it/integration-tests.txt,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- integration-tests.txt	22 Mar 2005 06:40:08 -0000	1.22
  +++ integration-tests.txt	8 Apr 2005 01:57:06 -0000	1.23
  @@ -14,3 +14,4 @@
   it0015
   it0016
   it0017
  +it0018
  \ No newline at end of file
  
  
  
  1.24      +3 -0      maven-components/maven-core-it/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core-it/README.txt,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- README.txt	22 Mar 2005 06:40:08 -0000	1.23
  +++ README.txt	8 Apr 2005 01:57:06 -0000	1.24
  @@ -52,6 +52,9 @@
   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.28      +10 -10    maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
  
  Index: MavenMetadataSource.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MavenMetadataSource.java	7 Apr 2005 21:52:17 -0000	1.27
  +++ MavenMetadataSource.java	8 Apr 2005 01:57:06 -0000	1.28
  @@ -87,15 +87,15 @@
           // 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 )
           {
  
  
  

Mime
View raw message