Author: dennisl
Date: Tue Jun 17 09:11:00 2008
New Revision: 668726
URL: http://svn.apache.org/viewvc?rev=668726&view=rev
Log:
o Read and validate POM elements in a consistent order.
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java?rev=668726&r1=668725&r2=668726&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundleCreateMojo.java
Tue Jun 17 09:11:00 2008
@@ -75,7 +75,7 @@
if ( project.getPackaging().equals( "pom" ) )
{
- throw new MojoExecutionException( "Packaging cannot be POM when
creating an upload bundle." );
+ throw new MojoExecutionException( "Packaging cannot be 'pom' when
creating an upload bundle." );
}
//
----------------------------------------------------------------------
@@ -86,25 +86,27 @@
// packaging
// name
// version
- // url
// description
- // dependencies
+ // url
// licenses
+ // dependencies
//
----------------------------------------------------------------------
- validate( project.getName(), "project.name" );
+ // We don't have to validate groupId, artifactId or version here - it
is done by maven-artifact
- validate( project.getUrl(), "project.url" );
+ validate( project.getName(), "project.name" );
validate( project.getDescription(), "project.description" );
+ validate( project.getUrl(), "project.url" );
+
if ( project.getLicenses().isEmpty() )
{
throw new MojoExecutionException( "At least one license must be
defined." );
}
//
----------------------------------------------------------------------
- //
+ // Create the bundle archive
//
----------------------------------------------------------------------
File pom = new File( basedir, POM );
Modified:
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=668726&r1=668725&r2=668726&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
Tue Jun 17 09:11:00 2008
@@ -201,6 +201,11 @@
try
{
+ if ( model.getPackaging() == null )
+ {
+ model.setPackaging( "jar" );
+ rewrite = true;
+ }
if ( model.getName() == null )
{
getLog().info( "Project name is missing, please type the
project name [" + artifactId + "]:" );
@@ -211,23 +216,18 @@
}
rewrite = true;
}
- if ( model.getUrl() == null )
- {
- getLog().info( "Project Url is missing, please type the
project URL:" );
- model.setUrl( inputHandler.readLine() );
- rewrite = true;
- }
- if ( model.getPackaging() == null )
- {
- model.setPackaging( "jar" );
- rewrite = true;
- }
if ( model.getDescription() == null )
{
getLog().info( "Project Description is missing, please type
the project Description:" );
model.setDescription( inputHandler.readLine() );
rewrite = true;
}
+ if ( model.getUrl() == null )
+ {
+ getLog().info( "Project Url is missing, please type the
project URL:" );
+ model.setUrl( inputHandler.readLine() );
+ rewrite = true;
+ }
List licenses = model.getLicenses();
if ( licenses.isEmpty() )
