jvanzyl     2004/02/01 17:53:17

  Modified:    maven-model-xpp3/src/java/org/apache/maven/model
                        DefaultModelUnmarshaller.java
  Log:
  
  
  Revision  Changes    Path
  1.11      +1 -13     
maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java
  
  Index: DefaultModelUnmarshaller.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultModelUnmarshaller.java     6 Jan 2004 08:25:22 -0000       1.10
  +++ DefaultModelUnmarshaller.java     2 Feb 2004 01:53:17 -0000       1.11
  @@ -51,9 +51,6 @@
                   }
                   else if ( parser.getName().equals( "pomVersion" ) )
                   {
  -                    // TODO: localization, logging?
  -                    // TODO: warning here, or in model? what about location of 
version differences? Separate implementations of this class?
  -                    System.err.println( "DEPRECATED: please use <modelVersion> 
instead of <pomVersion>" );
                       project.setModelVersion( parser.nextText() );
                   }
                   else if ( parser.getName().equals( "modelVersion" ) )
  @@ -62,8 +59,6 @@
                   }
                   else if ( parser.getName().equals( "id" ) )
                   {
  -                    // TODO: localization, logging?
  -                    System.err.println( "DEPRECATED: please use <artifactId> 
instead of <id>" );
                       project.setArtifactId( parser.nextText() );
                   }
                   else if ( parser.getName().equals( "groupId" ) )
  @@ -84,8 +79,6 @@
                   }
                   else if ( parser.getName().equals( "currentVersion" ) )
                   {
  -                    // TODO: localization, logging?
  -                    System.err.println( "DEPRECATED: please use <version> instead 
of <currentVersion>" );
                       project.setVersion( parser.nextText() );
                   }
                   else if ( parser.getName().equals( "inceptionYear" ) )
  @@ -434,11 +427,6 @@
                                   }
                                   else if ( parser.getName().equals( "jar" ) )
                                   {
  -// TODO: localization? logging?
  -                                    String msg = "You should be using <artifact> 
tag " +
  -                                        "instead of <jar> for Dependency: " +
  -                                        d.getId();
  -                                    System.err.println( msg );
                                       d.setArtifact( parser.nextText() );
                                   }
                                   else if ( parser.getName().equals( "properties" ) )
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to