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.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233245 13f79535-47bb-0310-9956-ffa450edef68

maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java

@@ -36,7 +36,7 @@ public Artifact createArtifact( String groupId, String artifactId, String versio
     {
         return createArtifact( groupId, artifactId, version, scope, type, null, null );
     }
-
+    
     public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String scope,
                                                   String type, String classifier )
     {

maven-core-it/README.txt

@@ -139,6 +139,9 @@ it0048: Verify that default values for mojo parameters are working (indirectly,
 
 it0049: Test parameter alias usage.
 
+it0050: Test surefire inclusion/exclusions
+
+it0051: Test source attachment when -DperformRelease=true is specified.
 -------------------------------------------------------------------------------
 
 - generated sources

maven-core-it/integration-tests.txt

@@ -1,3 +1,5 @@
+it0051
+#it0050
 it0049
 it0048
 it0047

maven-core-it/it0051/cli-options.txt

@@ -0,0 +1 @@
+--check-plugin-latest --no-plugin-registry -DperformRelease=true

maven-core-it/it0051/expected-results.txt

@@ -0,0 +1,2 @@
+target/maven-core-it0051-1.0.jar
+target/maven-core-it0051-1.0-sources.jar

maven-core-it/it0051/goals.txt

@@ -0,0 +1 @@
+package

maven-core-it/it0051/pom.xml

@@ -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>

maven-core-it/it0051/src/main/java/org/apache/maven/it0001/Person.java

@@ -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;
+    }
+}

maven-core-it/it0051/src/main/resources/it0001.properties

@@ -0,0 +1 @@
+name = jason

maven-core-it/it0051/src/test/java/org/apache/maven/it0001/PersonTest.java

@@ -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() );
+    }
+}

maven-core/src/main/resources/META-INF/plexus/components.xml

@@ -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-jar-plugin:jar
-            org.apache.maven.plugins:maven-source-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-ejb-plugin:ejb
-            org.apache.maven.plugins:maven-source-plugin:jar
           </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>

maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java

@@ -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&oslash;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 @@ public class JarSourceMojo
      * @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}"
@@ -80,6 +104,12 @@ public void execute()
             
             return;
         }
+        else if ( BANNED_PACKAGINGS.contains( packaging ) )
+        {
+            getLog().info( "NOT adding java-sources to attached artifacts for packaging: \'" + packaging + "\'." );
+            
+            return;
+        }
         
         // TODO: use a component lookup?
         JarArchiver archiver = new JarArchiver();

maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

@@ -227,6 +227,30 @@ private Map createManagedVersionMap( DependencyManagement dependencyManagement )
         }
         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 @@ private MavenProject build( String pomLocation, Model model, ArtifactRepository
         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 @@ private MavenProject build( String pomLocation, Model model, ArtifactRepository
         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 @@ public MavenProject buildStandaloneSuperProject( ArtifactRepository localReposit
 
         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 );
 

maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java

@@ -19,9 +19,8 @@ public void attachArtifact( MavenProject project, String artifactType, String ar
         Artifact artifact = artifactFactory.createArtifactWithClassifier( project.getGroupId(),
                                                                           project.getArtifactId(),
                                                                           project.getVersion(), 
-                                                                          null, 
+                                                                          artifactType,
-                                                                          "artifactType",
+                                                                          artifactClassifier );
-                                                                          "artifactClassifier" );
         
         artifact.setFile( artifactFile );
         artifact.setResolved( true );

maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java

@@ -34,6 +34,12 @@ public interface MavenProjectBuilder
 
     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;
 

maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml

@@ -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>

maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java

@@ -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 getProjectWithDependencies( File pom )
     protected MavenProject getProject( File pom )
         throws Exception
     {
-        return projectBuilder.build( pom, getLocalRepository(), null );
+        return projectBuilder.build( pom, getLocalRepository(), new DefaultProfileManager( getContainer() ) );
     }
 
 }