Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 57361 invoked from network); 14 Oct 2005 19:09:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Oct 2005 19:09:19 -0000 Received: (qmail 93399 invoked by uid 500); 14 Oct 2005 19:09:16 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 93353 invoked by uid 500); 14 Oct 2005 19:09:16 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 93319 invoked by uid 99); 14 Oct 2005 19:09:16 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 14 Oct 2005 12:09:15 -0700 Received: (qmail 57231 invoked by uid 65534); 14 Oct 2005 19:08:55 -0000 Message-ID: <20051014190855.57230.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r321187 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Date: Fri, 14 Oct 2005 19:08:55 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Oct 14 12:08:53 2005 New Revision: 321187 URL: http://svn.apache.org/viewcvs?rev=321187&view=rev Log: Fix groupId/artifactId initialization Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=321187&r1=321186&r2=321187&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Fri Oct 14 12:08:53 2005 @@ -101,25 +101,33 @@ // GroupId // ---------------------------------------------------------------------- - if ( StringUtils.isEmpty( mavenProject.getGroupId() ) ) + if ( !StringUtils.isEmpty( mavenProject.getGroupId() ) ) { continuumProject.setGroupId( mavenProject.getGroupId() ); } + else + { + throw new MavenBuilderHelperException( "Missing 'groupId' element in the POM." ); + } // ---------------------------------------------------------------------- // artifactId // ---------------------------------------------------------------------- - if ( StringUtils.isEmpty( mavenProject.getArtifactId() ) ) + if ( !StringUtils.isEmpty( mavenProject.getArtifactId() ) ) { continuumProject.setArtifactId( mavenProject.getArtifactId() ); } + else + { + throw new MavenBuilderHelperException( "Missing 'artifactId' element in the POM." ); + } // ---------------------------------------------------------------------- // Project Url // ---------------------------------------------------------------------- - if ( StringUtils.isEmpty( mavenProject.getUrl() ) ) + if ( !StringUtils.isEmpty( mavenProject.getUrl() ) ) { continuumProject.setUrl( mavenProject.getUrl() ); }