You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by mi...@apache.org on 2004/06/08 19:13:14 UTC

cvs commit: maven-components/maven-project/src/test/resources/projects/recursive-inheritance/a project.xml

michal      2004/06/08 10:13:14

  Modified:    maven-project/src/main/java/org/apache/maven/artifact/downloader
                        ArtifactDownloader.java
                        DefaultArtifactDownloader.java
               maven-project/src/main/java/org/apache/maven/artifact/snapshot
                        DefaultSnapshotResolver.java
               maven-project/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
                        DefaultModelInheritanceAssembler.java
                        MavenProject.java
               maven-project/src/main/resources/org/apache/maven/project
                        super-model.xml
               maven-project/src/test/java/org/apache/maven/project
                        AbstractProjectTestCase.java
                        DefaultProjectBuilderTest.java
                        ProjectBaseDirectoryAlignmentTest.java
                        ProjectReactorTest.java
                        RecursiveProjectInheritanceTest.java
               maven-project/src/test/resources/local-repo/maven-test/poms
                        maven-test-a-1.0.pom
               maven-project/src/test/resources/local-repo/snapshot-test/poms
                        maven-test-snapshot-resolving-1.0.pom
               maven-project/src/test/resources/projects/recursive-inheritance/a
                        project.xml
  Log:
  remote repositories are now defined in maven-model and super-model.xml points to ibiblio
  
  Revision  Changes    Path
  1.4       +1 -1      maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/ArtifactDownloader.java
  
  Index: ArtifactDownloader.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/ArtifactDownloader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  
  
  
  1.9       +1 -1      maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java
  
  Index: DefaultArtifactDownloader.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  
  
  
  1.7       +1 -1      maven-components/maven-project/src/main/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolver.java
  
  Index: DefaultSnapshotResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolver.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  
  
  
  1.18      +0 -0      maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  Index: DefaultMavenProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  
  
  
  1.8       +1 -1      maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java
  
  Index: DefaultModelInheritanceAssembler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  
  
  
  1.10      +1 -1      maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
  
  Index: MavenProject.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  
  
  
  1.3       +0 -0      maven-components/maven-project/src/main/resources/org/apache/maven/project/super-model.xml
  
  Index: super-model.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/main/resources/org/apache/maven/project/super-model.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.9       +0 -0      maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
  
  Index: AbstractProjectTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  
  
  
  1.11      +0 -0      maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
  
  Index: DefaultProjectBuilderTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  
  
  
  1.5       +0 -0      maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
  
  Index: ProjectBaseDirectoryAlignmentTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  
  1.5       +0 -0      maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectReactorTest.java
  
  Index: ProjectReactorTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectReactorTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  
  1.5       +0 -0      maven-components/maven-project/src/test/java/org/apache/maven/project/RecursiveProjectInheritanceTest.java
  
  Index: RecursiveProjectInheritanceTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/RecursiveProjectInheritanceTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  
  1.3       +0 -0      maven-components/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom
  
  Index: maven-test-a-1.0.pom
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.3       +0 -0      maven-components/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom
  
  Index: maven-test-snapshot-resolving-1.0.pom
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.3       +0 -0      maven-components/maven-project/src/test/resources/projects/recursive-inheritance/a/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/resources/projects/recursive-inheritance/a/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3