maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/project Project.java
Date Tue, 31 Dec 2002 08:28:20 GMT
jvanzyl     2002/12/31 00:28:20

  Modified:    src/java/org/apache/maven/jelly/tags/maven ReactorTag.java
               src/java/org/apache/maven/project Project.java
  Log:
  o fixing project verification in the reactor.
  
  Revision  Changes    Path
  1.2       +10 -4     jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
  
  Index: ReactorTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReactorTag.java	31 Dec 2002 07:01:20 -0000	1.1
  +++ ReactorTag.java	31 Dec 2002 08:28:19 -0000	1.2
  @@ -106,6 +106,9 @@
       /** Banner to display when each project is processed. */
       private String banner;
   
  +    /** Do we want to verifiy deps. By default, yes. */
  +    private boolean verifyDependencies = true;
  +
       /**
        * Post processing flag. If this is set then we will hold on to the
        * processed projects, otherwise they will be dumped.
  @@ -175,7 +178,11 @@
                   System.out.println( "| " + getBanner() + " " + project.getName() );
                   System.out.println( "+----------------------------------------" );
   
  -                project.verifyDependencies();
  +                if ( verifyDependencies )
  +                {
  +                    project.verifyDependencies();
  +                }
  +
                   project.setGoalNames( getGoals() );
   
                   getMavenContext().getMavenSession().attainGoals( project );
  @@ -196,7 +203,6 @@
                       continue;
                   }
   
  -                e.printStackTrace();
                   e.fillInStackTrace();
   
                   throw e;
  
  
  
  1.52      +3 -2      jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Project.java	31 Dec 2002 07:54:17 -0000	1.51
  +++ Project.java	31 Dec 2002 08:28:19 -0000	1.52
  @@ -1062,6 +1062,7 @@
           getContext().setAntProject( AntProjectBuilder.build( this ) );
           buildArtifactList();
           buildDependencyClasspath();
  +        dependencyVerifier = new DependencyVerifier( this );
           initializeDriver();
   
           initialized = true;
  @@ -1106,7 +1107,7 @@
       public void verifyDependencies()
          throws RepoConfigException, UnsatisfiedDependencyException
       {
  -        dependencyVerifier = new DependencyVerifier( this );
  +        dependencyVerifier.verify();
       }
   
       public DependencyVerifier getDependencyVerifier()
  
  
  

Mime
View raw message