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/17 21:24:05 UTC
svn commit: r233245 - in /maven/components/trunk:
maven-artifact/src/main/java/org/apache/maven/artifact/factory/
maven-core-it/ maven-core-it/it0051/ maven-core-it/it0051/src/
maven-core-it/it0051/src/main/ maven-core-it/it0051/src/main/java/
maven-co...
Author: jdcasey
Date: Wed Aug 17 12:23:45 2005
New Revision: 233245
URL: http://svn.apache.org/viewcvs?rev=233245&view=rev
Log:
Fixing some things:
o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)
o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom
o Removed the source plugin bindings for the lifecycle mappings in maven-core
o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.
o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.
o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.
Added:
maven/components/trunk/maven-core-it/it0051/
maven/components/trunk/maven-core-it/it0051/cli-options.txt (with props)
maven/components/trunk/maven-core-it/it0051/expected-results.txt (with props)
maven/components/trunk/maven-core-it/it0051/goals.txt (with props)
maven/components/trunk/maven-core-it/it0051/pom.xml (with props)
maven/components/trunk/maven-core-it/it0051/src/
maven/components/trunk/maven-core-it/it0051/src/main/
maven/components/trunk/maven-core-it/it0051/src/main/java/
maven/components/trunk/maven-core-it/it0051/src/main/java/org/
maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java (with props)
maven/components/trunk/maven-core-it/it0051/src/main/resources/
maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties (with props)
maven/components/trunk/maven-core-it/it0051/src/test/
maven/components/trunk/maven-core-it/it0051/src/test/java/
maven/components/trunk/maven-core-it/it0051/src/test/java/org/
maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/
maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java (with props)
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
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/DefaultMavenProjectHelper.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Wed Aug 17 12:23:45 2005
@@ -36,7 +36,7 @@
{
return createArtifact( groupId, artifactId, version, scope, type, null, null );
}
-
+
public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String scope,
String type, String classifier )
{
Modified: maven/components/trunk/maven-core-it/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Wed Aug 17 12:23:45 2005
@@ -139,6 +139,9 @@
it0049: Test parameter alias usage.
+it0050: Test surefire inclusion/exclusions
+
+it0051: Test source attachment when -DperformRelease=true is specified.
-------------------------------------------------------------------------------
- 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=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Wed Aug 17 12:23:45 2005
@@ -1,3 +1,5 @@
+it0051
+#it0050
it0049
it0048
it0047
Added: maven/components/trunk/maven-core-it/it0051/cli-options.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/cli-options.txt?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/cli-options.txt (added)
+++ maven/components/trunk/maven-core-it/it0051/cli-options.txt Wed Aug 17 12:23:45 2005
@@ -0,0 +1 @@
+--check-plugin-latest --no-plugin-registry -DperformRelease=true
Propchange: maven/components/trunk/maven-core-it/it0051/cli-options.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/cli-options.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/expected-results.txt?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0051/expected-results.txt Wed Aug 17 12:23:45 2005
@@ -0,0 +1,2 @@
+target/maven-core-it0051-1.0.jar
+target/maven-core-it0051-1.0-sources.jar
Propchange: maven/components/trunk/maven-core-it/it0051/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/goals.txt?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0051/goals.txt Wed Aug 17 12:23:45 2005
@@ -0,0 +1 @@
+package
Propchange: maven/components/trunk/maven-core-it/it0051/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/pom.xml?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0051/pom.xml Wed Aug 17 12:23:45 2005
@@ -0,0 +1,16 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it0051</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</model>
Propchange: maven/components/trunk/maven-core-it/it0051/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java (added)
+++ maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java Wed Aug 17 12:23:45 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/it0051/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties (added)
+++ maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties Wed Aug 17 12:23:45 2005
@@ -0,0 +1 @@
+name = jason
Propchange: maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java?rev=233245&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java (added)
+++ maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java Wed Aug 17 12:23:45 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/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Wed Aug 17 12:23:45 2005
@@ -208,8 +208,7 @@
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:jar,
- org.apache.maven.plugins:maven-source-plugin:jar
+ org.apache.maven.plugins:maven-jar-plugin:jar
</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
@@ -261,8 +260,7 @@
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>
- org.apache.maven.plugins:maven-ejb-plugin:ejb,
- org.apache.maven.plugins:maven-source-plugin:jar
+ org.apache.maven.plugins:maven-ejb-plugin:ejb
</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
@@ -321,7 +319,6 @@
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>
org.apache.maven.plugins:maven-jar-plugin:jar,
- org.apache.maven.plugins:maven-source-plugin:jar,
org.apache.maven.plugins:maven-rar-plugin:rar
</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
Modified: maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java Wed Aug 17 12:23:45 2005
@@ -23,6 +23,7 @@
import org.codehaus.plexus.archiver.jar.JarArchiver;
import java.io.File;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -32,10 +33,26 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
* @goal jar
+ * @phase package
*/
public class JarSourceMojo
extends AbstractMojo
{
+
+ /**
+ * @deprecated ICK! This needs to be generalized OUTSIDE of this mojo!
+ */
+ private static final List BANNED_PACKAGINGS;
+
+ static
+ {
+ List banned = new ArrayList();
+
+ banned.add( "pom" );
+
+ BANNED_PACKAGINGS = banned;
+ }
+
/**
* @parameter expression="${project}"
* @readonly
@@ -47,6 +64,13 @@
* @parameter expression="${component.org.apache.maven.project.MavenProjectHelper}
*/
private MavenProjectHelper projectHelper;
+
+ /**
+ * @parameter expression="${project.packaging}"
+ * @readonly
+ * @required
+ */
+ private String packaging;
/**
* @parameter expression="${project.build.finalName}"
@@ -77,6 +101,12 @@
if ( !attach )
{
getLog().info( "NOT adding java-sources to attached artifacts list." );
+
+ return;
+ }
+ else if ( BANNED_PACKAGINGS.contains( packaging ) )
+ {
+ getLog().info( "NOT adding java-sources to attached artifacts for packaging: \'" + packaging + "\'." );
return;
}
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=233245&r1=233244&r2=233245&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 17 12:23:45 2005
@@ -227,6 +227,30 @@
}
return map;
}
+
+ /**
+ * @deprecated Use build( File, ArtifactRepository, ProfileManager)
+ */
+ public MavenProject build( File projectDescriptor, ArtifactRepository localRepository, List activeExternalProfiles )
+ throws ProjectBuildingException
+ {
+ ProfileManager profileManager = new DefaultProfileManager( container );
+
+ if ( activeExternalProfiles != null )
+ {
+ for ( Iterator it = activeExternalProfiles.iterator(); it.hasNext(); )
+ {
+ Profile profile = (Profile) it.next();
+
+ // since it's already determined to be active, we'll explicitly set it as activated in the mgr.
+ profileManager.explicitlyActivate( profile.getId() );
+
+ profileManager.addProfile( profile );
+ }
+ }
+
+ return buildFromSourceFile( projectDescriptor, localRepository, profileManager );
+ }
public MavenProject build( File projectDescriptor, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException
@@ -393,7 +417,23 @@
throws ProjectBuildingException
{
Model superModel = getSuperModel();
+
+ ProfileManager superProjectProfileManager = new DefaultProfileManager( container );
+
+ List activeProfiles;
+
+ Properties profileProperties = new Properties();
+
+ superProjectProfileManager.addProfiles( superModel.getProfiles() );
+
+ activeProfiles = injectActiveProfiles( superProjectProfileManager, superModel, profileProperties );
+
+ MavenProject superProject = new MavenProject( superModel );
+
+ superProject.addProfileProperties( profileProperties );
+ superProject.setActiveProfiles( activeProfiles );
+
//noinspection CollectionDeclaredAsConcreteClass
LinkedList lineage = new LinkedList();
@@ -444,7 +484,7 @@
project.setOriginalModel( originalModel );
// we don't have to force the collision exception for superModel here, it's already been done in getSuperModel()
- Model previous = superModel;
+ Model previous = superProject.getModel();
for ( Iterator i = lineage.iterator(); i.hasNext(); )
{
@@ -1000,7 +1040,21 @@
superModel.setVersion( STANDALONE_SUPERPOM_VERSION );
+ ProfileManager profileManager = new DefaultProfileManager( container );
+
+ List activeProfiles;
+
+ Properties profileProperties = new Properties();
+
+ profileManager.addProfiles( superModel.getProfiles() );
+
+ activeProfiles = injectActiveProfiles( profileManager, superModel, profileProperties );
+
MavenProject project = new MavenProject( superModel );
+
+ project.addProfileProperties( profileProperties );
+
+ project.setActiveProfiles( activeProfiles );
project.setOriginalModel( superModel );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java Wed Aug 17 12:23:45 2005
@@ -19,9 +19,8 @@
Artifact artifact = artifactFactory.createArtifactWithClassifier( project.getGroupId(),
project.getArtifactId(),
project.getVersion(),
- null,
- "artifactType",
- "artifactClassifier" );
+ artifactType,
+ artifactClassifier );
artifact.setFile( artifactFile );
artifact.setResolved( true );
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Wed Aug 17 12:23:45 2005
@@ -34,6 +34,12 @@
String STANDALONE_SUPERPOM_VERSION = "2.0";
+ /**
+ * @deprecated Use build( File, ArtifactRepository, ProfileManager)
+ */
+ public MavenProject build( File projectDescriptor, ArtifactRepository localRepository, List activeExternalProfiles )
+ throws ProjectBuildingException;
+
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager )
throws ProjectBuildingException;
Modified: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=233245&r1=233244&r2=233245&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 Wed Aug 17 12:23:45 2005
@@ -63,6 +63,15 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<inherited>true</inherited>
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java?rev=233245&r1=233244&r2=233245&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java Wed Aug 17 12:23:45 2005
@@ -19,6 +19,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.profiles.DefaultProfileManager;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
@@ -108,7 +109,7 @@
protected MavenProject getProject( File pom )
throws Exception
{
- return projectBuilder.build( pom, getLocalRepository(), null );
+ return projectBuilder.build( pom, getLocalRepository(), new DefaultProfileManager( getContainer() ) );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org