You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/08/28 21:54:00 UTC
svn commit: r570550 - in /maven/components/trunk:
maven-embedder/src/test/java/org/apache/maven/embedder/
maven-embedder/src/test/resources/
maven-project/src/main/java/org/apache/maven/project/
Author: carlos
Date: Tue Aug 28 12:53:59 2007
New Revision: 570550
URL: http://svn.apache.org/viewvc?rev=570550&view=rev
Log:
buildWithDependencies in the embedder shouldn't check for distribution status by default. Add test.
Added:
maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml (with props)
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=570550&r1=570549&r2=570550&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Tue Aug 28 12:53:59 2007
@@ -315,22 +315,10 @@
throws Exception
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors( true )
- .setPomFile( getPomFile().getAbsolutePath() ).setShowErrors( true );
+ .setPomFile( getPomFile().getAbsolutePath() );
MavenExecutionResult result = maven.readProjectWithDependencies( request );
- if ( result.hasExceptions() )
- {
- for ( Iterator i = result.getExceptions().iterator(); i.hasNext(); )
- {
- Exception e = (Exception) i.next();
-
- e.printStackTrace();
- }
-
- fail( "Exception is readProjectWithDependencies() test." );
- }
-
assertNoExceptions( result );
assertEquals( "org.apache.maven", result.getMavenProject().getGroupId() );
@@ -354,14 +342,28 @@
assertNoExceptions( result );
- // Iterator it = result.getMavenProject().getTestClasspathElements().iterator();
- // while(it.hasNext()) {
- // Object object = (Object) it.next();
- // System.out.println(" element=" + object);
- // }
-
// sources, test sources, and the junit jar..
assertEquals( 3, result.getMavenProject().getTestClasspathElements().size() );
+ }
+
+ public void testProjectReadingWithDistributionStatus()
+ throws Exception
+ {
+ File pom = new File( basedir, "src/test/resources/pom-with-distribution-status.xml" );
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors( true )
+ .setPomFile( pom.getAbsolutePath() );
+
+ MavenProject project = maven.readProject( pom );
+
+ assertEquals( "deployed", project.getDistributionManagement().getStatus() );
+
+ MavenExecutionResult result = maven.readProjectWithDependencies( request );
+
+ assertNoExceptions( result );
+
+ assertEquals( "org.apache.maven", result.getMavenProject().getGroupId() );
+
+ assertEquals( "deployed", result.getMavenProject().getDistributionManagement().getStatus() );
}
// ----------------------------------------------------------------------------
Added: maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml?rev=570550&view=auto
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml (added)
+++ maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml Tue Aug 28 12:53:59 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange: maven/components/trunk/maven-embedder/src/test/resources/pom-with-distribution-status.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=570550&r1=570549&r2=570550&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Tue Aug 28 12:53:59 2007
@@ -332,7 +332,7 @@
TransferListener transferListener )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
{
- MavenProject project = build( projectDescriptor, localRepository, profileManager );
+ MavenProject project = build( projectDescriptor, localRepository, profileManager, false );
// ----------------------------------------------------------------------
// Typically when the project builder is being used from maven proper