I looked into this further and it broke profiles, which the assembly plugin was using during packaging (bootstrap), not the assembly plugin itself.
Shane On Wed, Sep 17, 2008 at 8:21 AM, Jason van Zyl <[EMAIL PROTECTED]> wrote: > What did it break exactly? > > On 17-Sep-08, at 4:42 PM, [EMAIL PROTECTED] wrote: > > Author: sisbell >> Date: Wed Sep 17 07:42:57 2008 >> New Revision: 696326 >> >> URL: http://svn.apache.org/viewvc?rev=696326&view=rev >> Log: >> Reverted back previous checkin, which broke something in the assembly >> plugin. >> >> Modified: >> >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java >> >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java >> >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java >> >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.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/builder/ArtifactModelContainerFactory.java >> >> Modified: >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java >> URL: >> http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=696326&r1=696325&r2=696326&view=diff >> >> ============================================================================== >> --- >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java >> (original) >> +++ >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java >> Wed Sep 17 07:42:57 2008 >> @@ -29,7 +29,6 @@ >> import org.apache.maven.model.Plugin; >> import org.apache.maven.model.PluginManagement; >> import org.apache.maven.profiles.ProfileManager; >> -import org.apache.maven.profiles.Profile; >> import >> org.apache.maven.profiles.activation.DefaultProfileActivationContext; >> import org.apache.maven.profiles.activation.ProfileActivationContext; >> import org.apache.maven.project.MavenProject; >> @@ -147,24 +146,23 @@ >> execProps.putAll( config.getExecutionProperties() ); >> } >> >> - execProps.putAll( inheritedInterpolationValues ); >> + if ( inheritedInterpolationValues != null ) >> + { >> + execProps.putAll( inheritedInterpolationValues ); >> + } >> + else >> + { >> + inheritedInterpolationValues = new HashMap(); >> + } >> >> config.setExecutionProperties( execProps ); >> >> - //INTERPOLATION >> + //INTERPOLATION >> List<InterpolatorProperty> interpolatorProperties = new >> ArrayList<InterpolatorProperty>(); >> - /* >> - for(Profile profile : (List<Profile>) >> request.getActiveProfiles()) >> - { >> - interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( profile.getProperties(), >> - PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> - } >> - */ >> - interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( >> config.getExecutionProperties(), >> - PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> - >> - interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(), >> - PomInterpolatorTag.USER_PROPERTIES.name())); >> + interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( >> config.getExecutionProperties(), >> + PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> + interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(), >> + PomInterpolatorTag.USER_PROPERTIES.name())); >> if(config.getBuildStartTime() != null) >> { >> interpolatorProperties.add(new >> InterpolatorProperty("${build.timestamp}", >> >> Modified: >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java >> URL: >> http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=696326&r1=696325&r2=696326&view=diff >> >> ============================================================================== >> --- >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java >> (original) >> +++ >> maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java >> Wed Sep 17 07:42:57 2008 >> @@ -20,7 +20,6 @@ >> */ >> >> import org.apache.maven.ArtifactFilterManager; >> -import org.apache.maven.profiles.Profile; >> import org.apache.maven.path.PathTranslator; >> import org.apache.maven.shared.model.InterpolatorProperty; >> import org.apache.maven.artifact.Artifact; >> @@ -558,15 +557,8 @@ >> if ( dom != null ) >> { >> try >> - { >> + { >> List<InterpolatorProperty> interpolatorProperties = new >> ArrayList<InterpolatorProperty>(); >> - /* >> - for(Profile profile : (List<Profile>) >> project.getActiveProfiles()) >> - { >> - interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( profile.getProperties(), >> - PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> - } >> - */ >> interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( >> session.getProjectBuilderConfiguration().getExecutionProperties(), >> PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( >> session.getProjectBuilderConfiguration().getUserProperties(), >> >> Modified: >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java >> URL: >> http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=696326&r1=696325&r2=696326&view=diff >> >> ============================================================================== >> --- >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java >> (original) >> +++ >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java >> Wed Sep 17 07:42:57 2008 >> @@ -341,6 +341,19 @@ >> return profileActivationContext.getActiveByDefaultProfileIds(); >> } >> >> + private static String getVersion( Model model ) >> + { >> + Parent parent = model.getParent(); >> + >> + String version = model.getVersion(); >> + if ( ( parent != null ) && ( version == null ) ) >> + { >> + version = parent.getVersion(); >> + } >> + >> + return version; >> + } >> + >> public static String getGroupId( Model model ) >> { >> Parent parent = model.getParent(); >> >> Modified: >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java >> URL: >> http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java?rev=696326&r1=696325&r2=696326&view=diff >> >> ============================================================================== >> --- >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java >> (original) >> +++ >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java >> Wed Sep 17 07:42:57 2008 >> @@ -70,7 +70,8 @@ >> injectBuild( profile, model ); >> >> Properties props = new Properties(); >> - >> + props.putAll( model.getProperties() ); >> + props.putAll( profile.getProperties() ); >> >> model.setProperties( props ); >> } >> >> 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=696326&r1=696325&r2=696326&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 Sep 17 07:42:57 2008 >> @@ -42,7 +42,10 @@ >> import org.apache.maven.profiles.activation.ProfileActivationException; >> import org.apache.maven.profiles.build.ProfileAdvisor; >> import >> org.apache.maven.project.artifact.InvalidDependencyVersionException; >> -import org.apache.maven.project.builder.*; >> +import org.apache.maven.project.builder.PomArtifactResolver; >> +import org.apache.maven.project.builder.ProjectBuilder; >> +import org.apache.maven.project.builder.PomInterpolatorTag; >> +import org.apache.maven.project.builder.PomClassicTransformer; >> import org.apache.maven.project.validation.ModelValidationResult; >> import org.apache.maven.project.validation.ModelValidator; >> import org.apache.maven.project.workspace.ProjectWorkspace; >> @@ -133,30 +136,12 @@ >> >> if ( project == null ) >> { >> - List<Profile> activeProfiles; >> - try >> - { >> - activeProfiles = getActiveProfilesFromModel(new >> PomClassicDomainModel( >> - new FileInputStream( projectDescriptor >> )).getModel(), config, projectDescriptor, true); >> - } catch (IOException e) >> - { >> - throw new ProjectBuildingException("", e.getMessage()); >> - } >> - >> - Properties activeProfileProperties = new Properties(); >> - for(Profile profile : activeProfiles) >> - { >> - activeProfileProperties.putAll(profile.getProperties()); >> - } >> - >> project = readModelFromLocalPath( "unknown", projectDescriptor, >> new PomArtifactResolver( >> config.getLocalRepository(), >> repositoryHelper.buildArtifactRepositories( >> - getSuperProject( config, projectDescriptor, true >> ).getModel() ), artifactResolver ), config, >> - activeProfileProperties ); >> + getSuperProject( config, projectDescriptor, true >> ).getModel() ), artifactResolver ), config ); >> >> project.setFile( projectDescriptor ); >> - >> - project = buildMavenProject( project.getModel(), config, >> projectDescriptor, project.getParentFile(), activeProfiles); >> + project = buildInternal( project.getModel(), config, >> projectDescriptor, project.getParentFile(), true ); >> >> Build build = project.getBuild(); >> // NOTE: setting this script-source root before path >> translation, because >> @@ -210,27 +195,9 @@ >> artifactRepositories.addAll( >> repositoryHelper.buildArtifactRepositories( >> getSuperProject( config, artifact.getFile(), false >> ).getModel() ) ); >> >> - >> - List<Profile> activeProfiles; >> - try >> - { >> - activeProfiles = this.getActiveProfilesFromModel(new >> PomClassicDomainModel( >> - new FileInputStream( >> artifact.getFile())).getModel(), config, artifact.getFile(), true); >> - } catch (IOException e) >> - { >> - throw new ProjectBuildingException("", e.getMessage()); >> - } >> - >> - Properties activeProfileProperties = new Properties(); >> - for(Profile profile : activeProfiles) >> - { >> - activeProfileProperties.putAll(profile.getProperties()); >> - } >> - >> project = readModelFromLocalPath( "unknown", >> artifact.getFile(), new PomArtifactResolver( >> - config.getLocalRepository(), artifactRepositories, >> artifactResolver ), config, activeProfileProperties ); >> - project = buildMavenProject( project.getModel(), config, >> artifact.getFile(), project.getParentFile(), >> - activeProfiles); >> + config.getLocalRepository(), artifactRepositories, >> artifactResolver ), config ); >> + project = buildInternal( project.getModel(), config, >> artifact.getFile(), project.getParentFile(), false ); >> } >> >> artifact.setFile( f ); >> @@ -429,9 +396,9 @@ >> return logger; >> } >> >> - private List<Profile> getActiveProfilesFromModel(Model model, >> ProjectBuilderConfiguration config, >> - File >> projectDescriptor, boolean isReactorProject) >> - throws ProjectBuildingException >> + private MavenProject buildInternal( Model model, >> ProjectBuilderConfiguration config, File projectDescriptor, >> + File parentDescriptor, boolean >> isReactorProject ) >> + throws ProjectBuildingException >> { >> String projectId = safeVersionlessKey( model.getGroupId(), >> model.getArtifactId() ); >> >> @@ -456,21 +423,6 @@ >> profileActivationContext = new DefaultProfileActivationContext( >> config.getExecutionProperties(), false ); >> } >> >> - >> - List<Profile> projectProfiles = new ArrayList<Profile>(); >> - projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( >> model, projectDescriptor, >> - >> isReactorProject, profileActivationContext ) ); >> - projectProfiles.addAll( >> profileAdvisor.applyActivatedExternalProfiles( model, projectDescriptor, >> - >> externalProfileManager ) ); >> - return projectProfiles; >> - } >> - >> - private MavenProject buildMavenProject( Model model, >> ProjectBuilderConfiguration config, File projectDescriptor, >> - File parentDescriptor, >> List<Profile> projectProfiles ) >> - throws ProjectBuildingException >> - { >> - String projectId = safeVersionlessKey( model.getGroupId(), >> model.getArtifactId() ); >> - >> MavenProject project; >> try >> { >> @@ -481,6 +433,11 @@ >> throw new InvalidProjectModelException( projectId, >> e.getMessage(), projectDescriptor, e ); >> } >> >> + List<Profile> projectProfiles = new ArrayList<Profile>(); >> + projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( >> project.getModel(), project.getFile(), >> + >> isReactorProject, profileActivationContext ) ); >> + projectProfiles.addAll( >> profileAdvisor.applyActivatedExternalProfiles( project.getModel(), >> project.getFile(), >> + >> externalProfileManager ) ); >> project.setActiveProfiles( projectProfiles ); >> >> projectWorkspace.storeProjectByCoordinate( project ); >> @@ -522,7 +479,35 @@ >> "Maven super-POM contains >> an invalid repository!", e ); >> } >> >> - superProject.setActiveProfiles( getActiveProfilesFromModel(model, >> config, projectDescriptor, isReactorProject) ); >> + String projectId = safeVersionlessKey( model.getGroupId(), >> model.getArtifactId() ); >> + >> + ProfileActivationContext profileActivationContext; >> + ProfileManager externalProfileManager = >> config.getGlobalProfileManager(); >> + if ( externalProfileManager != null ) >> + { >> + // used to trigger the caching of SystemProperties in the >> container context... >> + try >> + { >> + externalProfileManager.getActiveProfiles(); >> + } >> + catch ( ProfileActivationException e ) >> + { >> + throw new ProjectBuildingException( projectId, "Failed to >> activate external profiles.", >> + projectDescriptor, e >> ); >> + } >> + profileActivationContext = >> externalProfileManager.getProfileActivationContext(); >> + } >> + else >> + { >> + profileActivationContext = new >> DefaultProfileActivationContext( config.getExecutionProperties(), false ); >> + } >> + >> + List<Profile> superProjectProfiles = new ArrayList<Profile>(); >> + superProjectProfiles.addAll( >> profileAdvisor.applyActivatedProfiles( model, projectDescriptor, >> isReactorProject, >> + >> profileActivationContext ) ); >> + superProjectProfiles.addAll( >> + profileAdvisor.applyActivatedExternalProfiles( model, >> projectDescriptor, externalProfileManager ) ); >> + superProject.setActiveProfiles( superProjectProfiles ); >> >> return superProject; >> } >> @@ -574,7 +559,7 @@ >> } >> >> private MavenProject readModelFromLocalPath( String projectId, File >> projectDescriptor, PomArtifactResolver resolver, >> - >> ProjectBuilderConfiguration config, Properties profileProperties ) >> + >> ProjectBuilderConfiguration config ) >> throws ProjectBuildingException >> { >> if ( projectDescriptor == null ) >> @@ -592,11 +577,6 @@ >> PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> interpolatorProperties.addAll( >> InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(), >> PomInterpolatorTag.USER_PROPERTIES.name())); >> - if(profileProperties != null) >> - { >> - >> interpolatorProperties.addAll(InterpolatorProperty.toInterpolatorProperties( >> profileProperties, >> - PomInterpolatorTag.SYSTEM_PROPERTIES.name())); >> - } >> >> if(config.getBuildStartTime() != null) >> { >> @@ -617,7 +597,7 @@ >> { >> throw new ProjectBuildingException( projectId, "File = " + >> projectDescriptor.getAbsolutePath(), e ); >> } >> - mavenProject.getProperties().putAll(profileProperties); >> + >> return mavenProject; >> >> } >> >> Modified: >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java >> URL: >> http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=696326&r1=696325&r2=696326&view=diff >> >> ============================================================================== >> --- >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java >> (original) >> +++ >> maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java >> Wed Sep 17 07:42:57 2008 >> @@ -165,18 +165,7 @@ >> return ModelContainerAction.NOP; >> } >> } >> - else >> - { >> - if ( c.type.equals( type ) ) >> - { >> - return ModelContainerAction.DELETE; >> - } >> - else >> - { >> - return ModelContainerAction.NOP; >> - } >> - } >> - //TODO Verify - PluginManagement Section may make >> versions equal >> + return ModelContainerAction.DELETE;//TODO Verify - >> PluginManagement Section may make versions equal >> } >> >> if ( c.version.equals( version ) ) >> @@ -192,14 +181,7 @@ >> } >> else >> { >> - if ( c.type.equals( type ) ) >> - { >> - return ModelContainerAction.DELETE; >> - } >> - else >> - { >> - return ModelContainerAction.NOP; >> - } >> + return ModelContainerAction.DELETE; >> } >> } >> else >> >> >> > Thanks, > > Jason > > ---------------------------------------------------------- > Jason van Zyl > Founder, Apache Maven > jason at sonatype dot com > ---------------------------------------------------------- > > We know what we are, but know not what we may be. > > -- Shakespeare > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > >
