You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/08/25 05:08:35 UTC
svn commit: r239981 - in /maven/components/trunk: maven-core-it/
maven-core-it/it0059/ maven-core-it/it0059/src/
maven-core-it/it0059/src/main/ maven-core-it/it0059/src/main/java/
maven-core-it/it0059/src/main/java/org/ maven-core-it/it0059/src/main/ja...
Author: jdcasey
Date: Wed Aug 24 20:08:10 2005
New Revision: 239981
URL: http://svn.apache.org/viewcvs?rev=239981&view=rev
Log:
Resolving: MNG-666
If a v3 POM is encountered (or any POM where modelVersion is != '4.0.0'), an InvalidModelException is thrown.
This exception extends ProjectBuildingException, to enable piggybacking on the same catch() clause.
When the MavenMetadataSource catches InvalidModelException, it returns a ResolutionGroup with the pomArtifact and empty collections for the pom dependency artifacts and the repository list with which to resolve the empty artifacts set.
Also, added it0059 to test builds where a dependency POM is a v3 pom (missing <modelVersion/>).
Added:
maven/components/trunk/maven-core-it/it0059/
maven/components/trunk/maven-core-it/it0059/expected-results.txt (with props)
maven/components/trunk/maven-core-it/it0059/goals.txt (with props)
maven/components/trunk/maven-core-it/it0059/pom.xml (with props)
maven/components/trunk/maven-core-it/it0059/src/
maven/components/trunk/maven-core-it/it0059/src/main/
maven/components/trunk/maven-core-it/it0059/src/main/java/
maven/components/trunk/maven-core-it/it0059/src/main/java/org/
maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java (with props)
maven/components/trunk/maven-core-it/it0059/src/main/resources/
maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties (with props)
maven/components/trunk/maven-core-it/it0059/src/test/
maven/components/trunk/maven-core-it/it0059/src/test/java/
maven/components/trunk/maven-core-it/it0059/src/test/java/org/
maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/
maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java (with props)
maven/components/trunk/maven-core-it/it0059/test-repo/
maven/components/trunk/maven-core-it/it0059/test-repo/test/
maven/components/trunk/maven-core-it/it0059/test-repo/test/test/
maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/
maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.jar (with props)
maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom (with props)
maven/components/trunk/maven-core-it/it0059/verifier.properties (with props)
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java (with props)
Modified:
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/trunk/maven-core-it/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=239981&r1=239980&r2=239981&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Wed Aug 24 20:08:10 2005
@@ -164,6 +164,9 @@
it0058: Verify that profiles from settings.xml do not pollute module lists
across projects in a reactorized build.
+it0059: Verify that maven-1 POMs will be ignored but not stop the resolution
+ process.
+
-------------------------------------------------------------------------------
- generated sources
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=239981&r1=239980&r2=239981&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Wed Aug 24 20:08:10 2005
@@ -1,3 +1,4 @@
+it0059
it0058
it0057
it0056
Added: maven/components/trunk/maven-core-it/it0059/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/expected-results.txt?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0059/expected-results.txt Wed Aug 24 20:08:10 2005
@@ -0,0 +1 @@
+target/maven-core-it0059-1.0.jar
Propchange: maven/components/trunk/maven-core-it/it0059/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/goals.txt?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0059/goals.txt Wed Aug 24 20:08:10 2005
@@ -0,0 +1 @@
+package
Propchange: maven/components/trunk/maven-core-it/it0059/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/pom.xml?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0059/pom.xml Wed Aug 24 20:08:10 2005
@@ -0,0 +1,22 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it0059</artifactId>
+ <version>1.0</version>
+
+ <repositories>
+ <repository>
+ <id>test</id>
+ <url>file:test-repo</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0059/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java (added)
+++ maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java Wed Aug 24 20:08:10 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+public class Person
+{
+ private String name;
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties (added)
+++ maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties Wed Aug 24 20:08:10 2005
@@ -0,0 +1 @@
+name = jason
Propchange: maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java (added)
+++ maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java Wed Aug 24 20:08:10 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+import junit.framework.TestCase;
+
+public class PersonTest
+ extends TestCase
+{
+ public void testPerson()
+ {
+ Person person = new Person();
+
+ person.setName( "foo" );
+
+ assertEquals( "foo", person.getName() );
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.jar
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.jar?rev=239981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom (added)
+++ maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom Wed Aug 24 20:08:10 2005
@@ -0,0 +1,5 @@
+<project>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/test-repo/test/test/3.8.1/test-3.8.1.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0059/verifier.properties
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0059/verifier.properties?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0059/verifier.properties (added)
+++ maven/components/trunk/maven-core-it/it0059/verifier.properties Wed Aug 24 20:08:10 2005
@@ -0,0 +1 @@
+failOnErrorOutput=false
Propchange: maven/components/trunk/maven-core-it/it0059/verifier.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0059/verifier.properties
------------------------------------------------------------------------------
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/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=239981&r1=239980&r2=239981&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 Wed Aug 24 20:08:10 2005
@@ -72,6 +72,9 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -854,11 +857,11 @@
private Model readModel( File file )
throws ProjectBuildingException
{
- FileReader reader = null;
+ Reader reader = null;
try
{
reader = new FileReader( file );
- return modelReader.read( reader );
+ return readModel( reader );
}
catch ( FileNotFoundException e )
{
@@ -879,6 +882,24 @@
IOUtil.close( reader );
}
}
+
+ private Model readModel( Reader reader ) throws IOException, XmlPullParserException, InvalidModelException
+ {
+ StringWriter sw = new StringWriter();
+
+ IOUtil.copy( reader, sw );
+
+ String modelSource = sw.toString();
+
+ if ( modelSource.indexOf( "<modelVersion>4.0.0" ) < 0 )
+ {
+ throw new InvalidModelException( "Invalid POM (not v4.0.0 modelVersion)" );
+ }
+
+ StringReader sReader = new StringReader( modelSource );
+
+ return modelReader.read( sReader );
+ }
private Model readModel( URL url )
throws ProjectBuildingException
@@ -887,7 +908,7 @@
try
{
reader = new InputStreamReader( url.openStream() );
- return modelReader.read( reader );
+ return readModel( reader );
}
catch ( IOException e )
{
Added: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java?rev=239981&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java (added)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java Wed Aug 24 20:08:10 2005
@@ -0,0 +1,17 @@
+package org.apache.maven.project;
+
+public class InvalidModelException
+ extends ProjectBuildingException
+{
+
+ public InvalidModelException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ public InvalidModelException( String message )
+ {
+ super( message );
+ }
+
+}
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidModelException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=239981&r1=239980&r2=239981&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Aug 24 20:08:10 2005
@@ -31,12 +31,14 @@
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Relocation;
+import org.apache.maven.project.InvalidModelException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -83,42 +85,56 @@
{
project = mavenProjectBuilder.buildFromRepository( pomArtifact, remoteRepositories, localRepository );
}
+ catch ( InvalidModelException e )
+ {
+ getLogger().warn( "POM for: \'" + pomArtifact.getId() + "\' does not appear to be valid. Its will be ignored for artifact resolution." );
+
+ project = null;
+ }
catch ( ProjectBuildingException e )
{
throw new ArtifactMetadataRetrievalException( "Unable to read the metadata file", e );
}
- Relocation relocation = null;
-
- DistributionManagement distMgmt = project.getDistributionManagement();
- if ( distMgmt != null )
+ if ( project != null )
{
- relocation = distMgmt.getRelocation();
- }
- if ( relocation != null )
- {
- if ( relocation.getGroupId() != null )
- {
- artifact.setGroupId( relocation.getGroupId() );
- }
- if ( relocation.getArtifactId() != null )
- {
- artifact.setArtifactId( relocation.getArtifactId() );
- }
- if ( relocation.getVersion() != null )
+ Relocation relocation = null;
+
+ DistributionManagement distMgmt = project.getDistributionManagement();
+ if ( distMgmt != null )
{
- artifact.setVersion( relocation.getVersion() );
+ relocation = distMgmt.getRelocation();
}
- String message = "\n This artifact has been relocated to " + artifact.getGroupId() + ":" +
- artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n";
+ if ( relocation != null )
+ {
+ if ( relocation.getGroupId() != null )
+ {
+ artifact.setGroupId( relocation.getGroupId() );
+ }
+ if ( relocation.getArtifactId() != null )
+ {
+ artifact.setArtifactId( relocation.getArtifactId() );
+ }
+ if ( relocation.getVersion() != null )
+ {
+ artifact.setVersion( relocation.getVersion() );
+ }
+
+ String message = "\n This artifact has been relocated to " + artifact.getGroupId() + ":"
+ + artifact.getArtifactId() + ":" + artifact.getVersion() + ".\n";
+
+ if ( relocation.getMessage() != null )
+ {
+ message += " " + relocation.getMessage() + "\n";
+ }
- if ( relocation.getMessage() != null )
+ getLogger().warn( message + "\n" );
+ }
+ else
{
- message += " " + relocation.getMessage() + "\n";
+ done = true;
}
-
- getLogger().warn( message + "\n" );
}
else
{
@@ -132,15 +148,27 @@
try
{
- // TODO: we could possibly use p.getDependencyArtifacts instead of this call, but they haven't been filtered
- // or used the inherited scope (should that be passed to the buildFromRepository method above?)
- Set artifacts = project.createArtifacts( artifactFactory, artifact.getScope(),
- artifact.getDependencyFilter() );
-
+ ResolutionGroup result;
- List repositories = aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() );
+ if ( project == null )
+ {
+ // if the project is null, we encountered an invalid model (read: m1 POM)
+ // we'll just return an empty resolution group.
+ result = new ResolutionGroup( pomArtifact, Collections.EMPTY_SET, Collections.EMPTY_LIST );
+ }
+ else
+ {
+ // TODO: we could possibly use p.getDependencyArtifacts instead of this call, but they haven't been filtered
+ // or used the inherited scope (should that be passed to the buildFromRepository method above?)
+ Set artifacts = project.createArtifacts( artifactFactory, artifact.getScope(),
+ artifact.getDependencyFilter() );
+
+ List repositories = aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() );
+
+ result = new ResolutionGroup( pomArtifact, artifacts, repositories );
+ }
- return new ResolutionGroup( pomArtifact, artifacts, repositories );
+ return result;
}
catch ( InvalidVersionSpecificationException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org