You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/12/17 06:39:18 UTC
svn commit: r727290 - in /maven/components/trunk:
maven-mercury/src/main/resources/org/apache/maven/project/
maven-project/src/main/java/org/apache/maven/project/
maven-project/src/main/java/org/apache/maven/project/builder/
maven-project/src/main/reso...
Author: jvanzyl
Date: Tue Dec 16 21:39:18 2008
New Revision: 727290
URL: http://svn.apache.org/viewvc?rev=727290&view=rev
Log:
o actually put a valid GAV in the super pom
Modified:
maven/components/trunk/maven-mercury/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
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/builder/PomClassicTransformer.java
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Modified: maven/components/trunk/maven-mercury/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=727290&r1=727289&r2=727290&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original)
+++ maven/components/trunk/maven-mercury/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Tue Dec 16 21:39:18 2008
@@ -20,8 +20,10 @@
<!-- START SNIPPET: superpom -->
<project>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>super-pom</artifactId>
+ <version>3.0-SNAPSHOT</version>
<name>Maven Default Project</name>
-
<repositories>
<repository>
<id>central</id>
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=727290&r1=727289&r2=727290&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 Dec 16 21:39:18 2008
@@ -22,6 +22,8 @@
import java.io.File;
import java.io.IOException;
import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -44,6 +46,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
@@ -137,8 +140,12 @@
public MavenProject build( File projectDescriptor, ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
- MavenProject project = readModelFromLocalPath( "unknown", projectDescriptor, new DefaultPomArtifactResolver( config.getLocalRepository(), mavenTools
- .buildArtifactRepositories( getSuperModel() ), artifactResolver ), config );
+ List repositories = mavenTools.buildArtifactRepositories( getSuperModel() );
+
+ MavenProject project = readModelFromLocalPath( "unknown",
+ projectDescriptor,
+ new DefaultPomArtifactResolver( config.getLocalRepository(),
+ repositories, artifactResolver ), config );
project.setFile( projectDescriptor );
@@ -209,19 +216,14 @@
return project;
}
+ /**
+ * This is used for pom-less execution like running archetype:generate.
+ */
public MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
Model superModel = getSuperModel();
-
- superModel.setGroupId( STANDALONE_SUPERPOM_GROUPID );
-
- superModel.setArtifactId( STANDALONE_SUPERPOM_ARTIFACTID );
-
- superModel.setVersion( STANDALONE_SUPERPOM_VERSION );
-
- superModel = superModel;
-
+
ProfileManager profileManager = config.getGlobalProfileManager();
List activeProfiles = new ArrayList();
@@ -277,7 +279,7 @@
try
{
- superModel = Interpolator.interpolateModel(superModel, interpolatorProperties, basedir);
+ superModel = Interpolator.interpolateModel(superModel, interpolatorProperties, basedir );
}
catch (IOException e)
{
@@ -461,8 +463,8 @@
try
{
reader = ReaderFactory.newXmlReader( getClass().getResource( "pom-" + MAVEN_MODEL_VERSION + ".xml" ) );
-
- superModel = modelReader.read( reader, STRICT_MODEL_PARSING );
+
+ superModel = modelReader.read( reader, STRICT_MODEL_PARSING );
}
catch ( Exception e )
{
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=727290&r1=727289&r2=727290&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Tue Dec 16 21:39:18 2008
@@ -47,4 +47,3 @@
Interpolator.interpolateModelProperties( modelProperties, interpolatorProperties, (PomClassicDomainModel) domainModel);
}
}
-
Modified: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=727290&r1=727289&r2=727290&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original)
+++ maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Tue Dec 16 21:39:18 2008
@@ -20,8 +20,10 @@
<!-- START SNIPPET: superpom -->
<project>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>super-pom</artifactId>
+ <version>3.0-SNAPSHOT</version>
<name>Maven Default Project</name>
-
<repositories>
<repository>
<id>central</id>