jvanzyl     2003/12/28 15:59:14

  Modified:    maven-project/src/java/org/apache/maven/project
                        DefaultProjectBuilder.java
  Log:
  o more backward compat for POMs that don't have an <artifactId/>
  
  Revision  Changes    Path
  1.23      +8 -1      
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
  
  Index: DefaultProjectBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DefaultProjectBuilder.java        28 Dec 2003 23:36:48 -0000      1.22
  +++ DefaultProjectBuilder.java        28 Dec 2003 23:59:14 -0000      1.23
  @@ -112,7 +112,14 @@
   
           if ( mavenFinalName.indexOf( "${" ) >= 0 )
           {
  -            project.setProperty( "maven.final.name", project.getArtifactId() + "-" 
+ project.getVersion() );
  +            if ( project.getArtifactId() != null )
  +            {
  +                project.setProperty( "maven.final.name", project.getArtifactId() + 
"-" + project.getVersion() );
  +            }
  +            else
  +            {
  +                project.setProperty( "maven.final.name", 
Project.standardToLegacyId( project.getId() ) + "-" + project.getVersion() );
  +            }
           }
   
           return project;
  
  
  

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

Reply via email to