Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 28683 invoked from network); 31 May 2005 22:54:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 May 2005 22:54:57 -0000 Received: (qmail 37697 invoked by uid 500); 31 May 2005 22:54:57 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 37683 invoked by uid 500); 31 May 2005 22:54:57 -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 37670 invoked by uid 99); 31 May 2005 22:54:57 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 31 May 2005 15:54:56 -0700 Received: (qmail 28664 invoked by uid 65534); 31 May 2005 22:54:54 -0000 Message-ID: <20050531225454.28663.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r179302 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Date: Tue, 31 May 2005 22:54:54 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Tue May 31 15:54:53 2005 New Revision: 179302 URL: http://svn.apache.org/viewcvs?rev=3D179302&view=3Drev Log: o Keeping up to date with Maven 2 trunk Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav= en/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/DefaultMavenBuilde= rHelper.java?rev=3D179302&r1=3D179301&r2=3D179302&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con= tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java Tue May 31 15:54:5= 3 2005 @@ -30,7 +30,7 @@ import org.apache.maven.model.Scm; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.model.settings.MavenSettingsBuilder; +import org.apache.maven.settings.MavenSettingsBuilder; =20 import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils;