Author: sisbell Date: Thu Feb 26 18:03:57 2009 New Revision: 748244 URL: http://svn.apache.org/viewvc?rev=748244&view=rev Log: Removed profile builder.
Removed: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=748244&r1=748243&r2=748244&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java Thu Feb 26 18:03:57 2009 @@ -23,13 +23,11 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.MavenProfilesBuilder; import org.apache.maven.profiles.ProfileManager; import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.injection.ProfileInjector; import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.repository.MavenRepositorySystem; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.annotations.Component; @@ -48,11 +46,6 @@ public class DefaultProfileAdvisor implements ProfileAdvisor, LogEnabled, Contextualizable { - @Requirement - private MavenRepositorySystem mavenTools; - - @Requirement - private MavenProfilesBuilder profilesBuilder; @Requirement private ProfileInjector profileInjector; 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=748244&r1=748243&r2=748244&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 Thu Feb 26 18:03:57 2009 @@ -38,7 +38,6 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; -import org.apache.maven.profiles.MavenProfilesBuilder; import org.apache.maven.profiles.ProfileManager; import org.apache.maven.profiles.activation.DefaultProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationContext; @@ -66,9 +65,6 @@ implements MavenProjectBuilder, LogEnabled { @Requirement - protected MavenProfilesBuilder profilesBuilder; - - @Requirement private ModelValidator validator; @Requirement