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

Resolving: MNG-878, MNG-921 

o Verified that plugins are added to the list in the model when invoked from the command line (878)
o Reformatted ModelUtils after the profiles-cloning addition
o Added cache-flush for the plugin map in MavenProject
o Moved dependencies for subproject/subproject2 into the parent-project POM, inside a profile
o Added activation property for this new profile into the test.sh script
o Added explicit activation inside of release:perform's m2 invocation for all profile-ids active in the release-plugin's execution.
o Added code to remove the dynamic parts of the POM from the release-pom.xml...it's not meant to be a dynamic version of a POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290336 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-09-20 02:59:44 +00:00
parent 74de0709de
commit ec8d262f16
8 changed files with 295 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
maven-core-it/it2002/project/pom.xml
View File

@ -53,9 +53,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0-beta-1</version>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@ -64,9 +63,40 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0-alpha-1</version>
<version>2.0-beta-1</version>
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>env-test</id>
<activation>
<property>
<name>env</name>
<value>test</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>alt-target</directory>
</build>
</profile>
</profiles>
</project>

15
maven-core-it/it2002/project/subproject/pom.xml
View File

@ -8,19 +8,4 @@
<artifactId>project-sub1</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

24
maven-core-it/it2002/project/subproject2/pom.xml
View File

@ -14,30 +14,6 @@
<artifactId>project-sub1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>env-test</id>
<activation>
<property>
<name>env</name>
<value>test</value>
</property>
</activation>
</profile>
</profiles>
</project>

8
maven-core-it/it2002/test.sh
View File

@ -18,11 +18,7 @@ cd project.checkout
rm -Rf target
#. ~/shell-switches/m2-debug-on
#echo "Enabling debugging options. Please attach the debugger."
m2 -e release:prepare -Denv=test
export MAVEN_OPTS=
m2 -e release:prepare
m2 -e release:perform
m2 -e release:perform -Denv=test

31
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
View File

@ -16,9 +16,11 @@
* limitations under the License.
*/
import org.apache.maven.model.Profile;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.release.helpers.ReleaseProgressTracker;
import org.apache.maven.plugins.release.helpers.ScmHelper;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
@ -26,6 +28,8 @@
import org.codehaus.plexus.util.cli.StreamConsumer;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
/**
* Perform a release from SCM
@ -56,6 +60,13 @@ public class PerformReleaseMojo
*/
protected String workingDirectory;
/**
* @parameter expression="${project}"
* @required
* @readonly
*/
protected MavenProject project;
private ReleaseProgressTracker releaseProgress;
protected void executeTask()
@ -104,6 +115,26 @@ private void runGoals()
cl.createArgument().setLine( "--batch-mode" );
List profiles = project.getActiveProfiles();
if ( profiles != null && !profiles.isEmpty() )
{
StringBuffer buffer = new StringBuffer();
buffer.append( "-P " );
for ( Iterator it = profiles.iterator(); it.hasNext(); )
{
Profile profile = (Profile) it.next();
buffer.append( profile.getId() ).append( "," );
}
buffer.setLength( buffer.length() - 1 );
cl.createArgument().setLine( buffer.toString() );
}
StreamConsumer consumer = new DefaultConsumer();
try

6
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
View File

@ -836,6 +836,12 @@ private void generateReleasePoms()
Model releaseModel = releaseProject.getModel();
fixNullValueInModel( releaseModel, project.getModel() );
// the release POM should reflect bits of these which were injected at build time...
// we don't need these polluting the POM.
releaseModel.setProfiles( Collections.EMPTY_LIST );
releaseModel.setDependencyManagement( null );
releaseModel.getBuild().setPluginManagement( null );
String projectVersion = releaseModel.getVersion();
if ( ArtifactUtils.isSnapshot( projectVersion ) )
{

1
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -1129,6 +1129,7 @@ public void addPlugin( Plugin plugin )
if ( !build.getPluginsAsMap().containsKey( plugin.getKey() ) )
{
build.addPlugin( plugin );
build.flushPluginMap();
}
}

184
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
View File

@ -19,7 +19,6 @@
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Build;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@ -56,7 +55,7 @@
public final class ModelUtils
{
public static void mergePluginLists( PluginContainer childContainer, PluginContainer parentContainer,
boolean handleAsInheritance )
boolean handleAsInheritance )
{
if ( childContainer == null || parentContainer == null )
{
@ -78,8 +77,8 @@ public static void mergePluginLists( PluginContainer childContainer, PluginConta
String parentInherited = parentPlugin.getInherited();
if ( !handleAsInheritance || parentInherited == null ||
Boolean.valueOf( parentInherited ).booleanValue() )
if ( !handleAsInheritance || parentInherited == null
|| Boolean.valueOf( parentInherited ).booleanValue() )
{
Plugin assembledPlugin = parentPlugin;
@ -140,8 +139,8 @@ public static void mergeReportPluginLists( Reporting child, Reporting parent, bo
String parentInherited = parentPlugin.getInherited();
if ( !handleAsInheritance || parentInherited == null ||
Boolean.valueOf( parentInherited ).booleanValue() )
if ( !handleAsInheritance || parentInherited == null
|| Boolean.valueOf( parentInherited ).booleanValue() )
{
ReportPlugin assembledPlugin = parentPlugin;
@ -259,7 +258,7 @@ else if ( handleAsInheritance && parentInherited == null )
}
public static void mergeReportPluginDefinitions( ReportPlugin child, ReportPlugin parent,
boolean handleAsInheritance )
boolean handleAsInheritance )
{
if ( child == null || parent == null )
{
@ -509,7 +508,7 @@ private static List cloneProfiles( List profiles )
Profile newProfile = new Profile();
newProfile.setId(profile.getId());
newProfile.setId( profile.getId() );
newProfile.setActivation( cloneProfileActivation( profile.getActivation() ) );
@ -528,7 +527,8 @@ private static List cloneProfiles( List profiles )
newProfile.setDependencyManagement( newDM );
}
newProfile.setDistributionManagement( cloneProfileDistributionManagement( profile.getDistributionManagement() ) );
newProfile.setDistributionManagement( cloneProfileDistributionManagement( profile
.getDistributionManagement() ) );
List modules = profile.getModules();
@ -552,7 +552,7 @@ private static List cloneProfiles( List profiles )
newProfile.setRepositories( cloneProfileRepositories( profile.getRepositories() ) );
newProfile.setSource(profile.getSource() );
newProfile.setSource( profile.getSource() );
newProfiles.add( newProfile );
}
@ -568,7 +568,7 @@ private static Reporting cloneProfileReporting( Reporting reporting )
{
newR = new Reporting();
newR.setOutputDirectory(reporting.getOutputDirectory());
newR.setOutputDirectory( reporting.getOutputDirectory() );
List newP = null;
@ -584,19 +584,19 @@ private static Reporting cloneProfileReporting( Reporting reporting )
ReportPlugin newPlugin = new ReportPlugin();
newPlugin.setArtifactId(plugin.getArtifactId());
newPlugin.setGroupId(plugin.getGroupId());
newPlugin.setVersion(plugin.getVersion());
newPlugin.setInherited(plugin.getInherited());
newPlugin.setArtifactId( plugin.getArtifactId() );
newPlugin.setGroupId( plugin.getGroupId() );
newPlugin.setVersion( plugin.getVersion() );
newPlugin.setInherited( plugin.getInherited() );
newPlugin.setReportSets( cloneReportSets( plugin.getReportSets() ) );
// TODO: Implement deep-copy of configuration.
newPlugin.setConfiguration(plugin.getConfiguration());
newPlugin.setConfiguration( plugin.getConfiguration() );
newP.add( newPlugin );
}
newR.setPlugins(newP);
newR.setPlugins( newP );
}
}
@ -618,12 +618,12 @@ private static List cloneReportSets( List sets )
ReportSet newSet = new ReportSet();
// TODO: Deep-copy config.
newSet.setConfiguration(set.getConfiguration());
newSet.setConfiguration( set.getConfiguration() );
newSet.setId(set.getId());
newSet.setInherited(set.getInherited());
newSet.setId( set.getId() );
newSet.setInherited( set.getInherited() );
newSet.setReports(new ArrayList( set.getReports() ));
newSet.setReports( new ArrayList( set.getReports() ) );
newSets.add( newSet );
}
@ -646,22 +646,22 @@ private static List cloneProfileRepositories( List repos )
Repository newRepo = new Repository();
newRepo.setChecksumPolicy(repo.getChecksumPolicy());
newRepo.setId(repo.getId());
newRepo.setLayout(repo.getLayout());
newRepo.setName(repo.getName());
newRepo.setSnapshotPolicy(repo.getSnapshotPolicy());
newRepo.setChecksumPolicy( repo.getChecksumPolicy() );
newRepo.setId( repo.getId() );
newRepo.setLayout( repo.getLayout() );
newRepo.setName( repo.getName() );
newRepo.setSnapshotPolicy( repo.getSnapshotPolicy() );
RepositoryPolicy releasePolicy = repo.getReleases();
if ( releasePolicy != null )
{
RepositoryPolicy newPolicy = new RepositoryPolicy();
newPolicy.setEnabled(releasePolicy.isEnabled());
newPolicy.setChecksumPolicy(releasePolicy.getChecksumPolicy());
newPolicy.setUpdatePolicy(releasePolicy.getUpdatePolicy());
newPolicy.setEnabled( releasePolicy.isEnabled() );
newPolicy.setChecksumPolicy( releasePolicy.getChecksumPolicy() );
newPolicy.setUpdatePolicy( releasePolicy.getUpdatePolicy() );
newRepo.setReleases(newPolicy);
newRepo.setReleases( newPolicy );
}
RepositoryPolicy snapPolicy = repo.getSnapshots();
@ -669,14 +669,14 @@ private static List cloneProfileRepositories( List repos )
if ( snapPolicy != null )
{
RepositoryPolicy newPolicy = new RepositoryPolicy();
newPolicy.setEnabled(snapPolicy.isEnabled());
newPolicy.setChecksumPolicy(snapPolicy.getChecksumPolicy());
newPolicy.setUpdatePolicy(snapPolicy.getUpdatePolicy());
newPolicy.setEnabled( snapPolicy.isEnabled() );
newPolicy.setChecksumPolicy( snapPolicy.getChecksumPolicy() );
newPolicy.setUpdatePolicy( snapPolicy.getUpdatePolicy() );
newRepo.setSnapshots(newPolicy);
newRepo.setSnapshots( newPolicy );
}
newRepo.setUrl(repo.getUrl());
newRepo.setUrl( repo.getUrl() );
newRepos.add( newRepo );
}
@ -693,8 +693,8 @@ private static DistributionManagement cloneProfileDistributionManagement( Distri
{
newDM = new DistributionManagement();
newDM.setDownloadUrl(dm.getDownloadUrl() );
newDM.setStatus(dm.getStatus());
newDM.setDownloadUrl( dm.getDownloadUrl() );
newDM.setStatus( dm.getStatus() );
Relocation relocation = dm.getRelocation();
@ -702,12 +702,12 @@ private static DistributionManagement cloneProfileDistributionManagement( Distri
{
Relocation newR = new Relocation();
newR.setArtifactId(relocation.getArtifactId());
newR.setGroupId(relocation.getGroupId());
newR.setMessage(relocation.getMessage());
newR.setVersion(relocation.getVersion());
newR.setArtifactId( relocation.getArtifactId() );
newR.setGroupId( relocation.getGroupId() );
newR.setMessage( relocation.getMessage() );
newR.setVersion( relocation.getVersion() );
newDM.setRelocation(newR);
newDM.setRelocation( newR );
}
RepositoryBase repo = dm.getRepository();
@ -716,12 +716,12 @@ private static DistributionManagement cloneProfileDistributionManagement( Distri
{
RepositoryBase newRepo = new RepositoryBase();
newRepo.setId(repo.getId());
newRepo.setLayout(repo.getLayout());
newRepo.setName(repo.getName());
newRepo.setUrl(repo.getUrl());
newRepo.setId( repo.getId() );
newRepo.setLayout( repo.getLayout() );
newRepo.setName( repo.getName() );
newRepo.setUrl( repo.getUrl() );
newDM.setRepository(newRepo);
newDM.setRepository( newRepo );
}
Site site = dm.getSite();
@ -730,11 +730,11 @@ private static DistributionManagement cloneProfileDistributionManagement( Distri
{
Site newSite = new Site();
newSite.setId(site.getId());
newSite.setName(site.getName());
newSite.setUrl(site.getUrl());
newSite.setId( site.getId() );
newSite.setName( site.getName() );
newSite.setUrl( site.getUrl() );
newDM.setSite(newSite);
newDM.setSite( newSite );
}
RepositoryBase sRepo = dm.getSnapshotRepository();
@ -743,12 +743,12 @@ private static DistributionManagement cloneProfileDistributionManagement( Distri
{
RepositoryBase newRepo = new RepositoryBase();
newRepo.setId(sRepo.getId());
newRepo.setLayout(sRepo.getLayout());
newRepo.setName(sRepo.getName());
newRepo.setUrl(sRepo.getUrl());
newRepo.setId( sRepo.getId() );
newRepo.setLayout( sRepo.getLayout() );
newRepo.setName( sRepo.getName() );
newRepo.setUrl( sRepo.getUrl() );
newDM.setSnapshotRepository(newRepo);
newDM.setSnapshotRepository( newRepo );
}
}
@ -769,14 +769,14 @@ private static List cloneProfileDependencies( List dependencies )
Dependency newDep = new Dependency();
newDep.setArtifactId(dep.getArtifactId());
newDep.setClassifier(dep.getClassifier());
newDep.setArtifactId( dep.getArtifactId() );
newDep.setClassifier( dep.getClassifier() );
newDep.setExclusions( cloneDependencyExclusions( dep.getExclusions() ) );
newDep.setGroupId(dep.getGroupId());
newDep.setScope(dep.getScope());
newDep.setSystemPath(dep.getSystemPath());
newDep.setType(dep.getType());
newDep.setVersion(dep.getVersion());
newDep.setGroupId( dep.getGroupId() );
newDep.setScope( dep.getScope() );
newDep.setSystemPath( dep.getSystemPath() );
newDep.setType( dep.getType() );
newDep.setVersion( dep.getVersion() );
newDependencies.add( newDep );
}
@ -799,7 +799,7 @@ private static List cloneDependencyExclusions( List ex )
Exclusion newExclusion = new Exclusion();
newExclusion.setArtifactId(exclusion.getArtifactId() );
newExclusion.setArtifactId( exclusion.getArtifactId() );
newExclusion.setGroupId( exclusion.getGroupId() );
newEx.add( newExclusion );
@ -816,9 +816,9 @@ private static BuildBase cloneProfileBuild( BuildBase build )
{
newBuild = new BuildBase();
newBuild.setDefaultGoal(build.getDefaultGoal());
newBuild.setDirectory(build.getDirectory());
newBuild.setFinalName(build.getFinalName());
newBuild.setDefaultGoal( build.getDefaultGoal() );
newBuild.setDirectory( build.getDirectory() );
newBuild.setFinalName( build.getFinalName() );
newBuild.setPluginManagement( cloneProfilePluginManagement( build.getPluginManagement() ) );
newBuild.setPlugins( cloneProfilePlugins( build.getPlugins() ) );
@ -843,11 +843,11 @@ private static List cloneProfileResources( List resources )
Resource newResource = new Resource();
newResource.setDirectory(resource.getDirectory());
newResource.setExcludes(new ArrayList( resource.getExcludes()));
newResource.setFiltering(resource.isFiltering());
newResource.setIncludes(new ArrayList( resource.getIncludes()));
newResource.setTargetPath(resource.getTargetPath());
newResource.setDirectory( resource.getDirectory() );
newResource.setExcludes( new ArrayList( resource.getExcludes() ) );
newResource.setFiltering( resource.isFiltering() );
newResource.setIncludes( new ArrayList( resource.getIncludes() ) );
newResource.setTargetPath( resource.getTargetPath() );
newResources.add( newResource );
}
@ -886,24 +886,24 @@ private static List cloneProfilePlugins( List plugins )
Plugin newPlugin = new Plugin();
newPlugin.setArtifactId(plugin.getArtifactId());
newPlugin.setExtensions(plugin.isExtensions());
newPlugin.setGroupId(plugin.getGroupId());
newPlugin.setInherited(plugin.getInherited());
newPlugin.setVersion(plugin.getVersion());
newPlugin.setArtifactId( plugin.getArtifactId() );
newPlugin.setExtensions( plugin.isExtensions() );
newPlugin.setGroupId( plugin.getGroupId() );
newPlugin.setInherited( plugin.getInherited() );
newPlugin.setVersion( plugin.getVersion() );
// TODO: Deep-copy this!
newPlugin.setConfiguration(plugin.getConfiguration());
newPlugin.setConfiguration( plugin.getConfiguration() );
List goals = plugin.getGoals();
if ( goals != null && !goals.isEmpty() )
{
List newGoals = new ArrayList( goals );
newPlugin.setGoals(newGoals);
newPlugin.setGoals( newGoals );
}
newPlugin.setExecutions( cloneExecutions( plugin.getExecutions() ));
newPlugin.setExecutions( cloneExecutions( plugin.getExecutions() ) );
newPlugins.add( newPlugin );
}
@ -927,11 +927,11 @@ private static List cloneExecutions( List executions )
PluginExecution newExec = new PluginExecution();
// TODO: Deep-copy configs.
newExec.setConfiguration(exec.getConfiguration());
newExec.setConfiguration( exec.getConfiguration() );
newExec.setId(exec.getId());
newExec.setInherited(exec.getInherited());
newExec.setPhase(exec.getPhase());
newExec.setId( exec.getId() );
newExec.setInherited( exec.getInherited() );
newExec.setPhase( exec.getPhase() );
List goals = exec.getGoals();
@ -954,20 +954,20 @@ private static Activation cloneProfileActivation( Activation activation )
{
newActivation = new Activation();
newActivation.setActiveByDefault(activation.isActiveByDefault());
newActivation.setActiveByDefault( activation.isActiveByDefault() );
ActivationFile af = activation.getFile();
if ( af != null )
{
ActivationFile afNew = new ActivationFile();
afNew.setExists(af.getExists());
afNew.setMissing(af.getMissing());
afNew.setExists( af.getExists() );
afNew.setMissing( af.getMissing() );
newActivation.setFile(afNew);
newActivation.setFile( afNew );
}
newActivation.setJdk(activation.getJdk());
newActivation.setJdk( activation.getJdk() );
ActivationProperty ap = activation.getProperty();
@ -975,10 +975,10 @@ private static Activation cloneProfileActivation( Activation activation )
{
ActivationProperty newAp = new ActivationProperty();
newAp.setName(ap.getName());
newAp.setValue(ap.getValue());
newAp.setName( ap.getName() );
newAp.setValue( ap.getValue() );
newActivation.setProperty(newAp);
newActivation.setProperty( newAp );
}
}