Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Commented earlier changes until I have time to make them work properly 

o Added DEFAULT_MODEL_VERSION constant to Maven.class for referencing in case there is no project POM


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163087 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2004-09-16 16:06:13 +00:00
parent 9e24a7b410
commit 2d4e9a1a0e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/main/java/org/apache/maven/Maven.java
View File

@ -32,6 +32,8 @@ import java.util.Map;
public interface Maven
{
static String ROLE = Maven.class.getName();
static String DEFAULT_MODEL_VERSION = "4.0.0";
// ----------------------------------------------------------------------
// Execution

18
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -16,6 +16,7 @@ package org.apache.maven.project;
* limitations under the License.
*/
import org.apache.maven.Maven;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.MavenMetadataSource;
@ -120,10 +121,19 @@ public class DefaultMavenProjectBuilder
validateLeafModel(userModel);
// TODO: rename to super-pom.xml so it is not used by the reactor
superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "pom-" + userModel.getModelVersion() + ".xml" ) ) );
superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "pom-4.0.0.xml" ) ) );
// [JDC 9/16]: Commented until I have time to figure this out...
// badmodelVersion somewhere
//superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "pom-" + userModel.getModelVersion() + ".xml" ) ) );
superModel.getRepositories().addAll( userModel.getRepositories() );
}
if(superModel == null)
{
superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "pom-" + Maven.DEFAULT_MODEL_VERSION + ".xml" ) ) );
}
if ( localRepositoryValue == null && superModel.getLocal() != null && superModel.getLocal().getRepository() != null )
{
@ -223,6 +233,11 @@ public class DefaultMavenProjectBuilder
private void validateLeafModel( Model userModel )
{
// [JDC 9/16]:
// Commenting this out until I have time to get this particular validation
// fixed in all tests, core plugins, and IT's...
/*
String modelVersion = userModel.getModelVersion();
if ( modelVersion == null || modelVersion.length() < 1 )
{
@ -246,6 +261,7 @@ public class DefaultMavenProjectBuilder
{
throw new IllegalStateException( "POM element \'version\' must be specified; it may not be inherited" );
}
*/
}