Author: jvanzyl Date: Sun Apr 26 22:18:28 2009 New Revision: 768813 URL: http://svn.apache.org/viewvc?rev=768813&view=rev Log: o remove the plugin manager that required mercury and i'll use the repository system inside maven for new, keep more of the features that creeped in out o try and remove all traces of mercury and keep them in a branch
Removed: maven/components/trunk/bs maven/components/trunk/build-mercury.xml maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=768813&r1=768812&r2=768813&view=diff ============================================================================== --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Sun Apr 26 22:18:28 2009 @@ -18,11 +18,8 @@ <artifactId>maven</artifactId> <version>3.0-SNAPSHOT</version> </parent> - <artifactId>maven-core</artifactId> - <name>Maven Core</name> - <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -95,10 +92,6 @@ </dependency> <dependency> <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-plugin-manager</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-sec-dispatcher</artifactId> </dependency> <dependency> Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=768813&r1=768812&r2=768813&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Sun Apr 26 22:18:28 2009 @@ -9,15 +9,8 @@ import org.apache.maven.model.Extension; import org.apache.maven.model.Model; import org.apache.maven.model.ProjectUri; -import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Configuration; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.sonatype.plexus.plugin.manager.PlexusPluginManager; -import org.sonatype.plexus.plugin.manager.PluginMetadata; -import org.sonatype.plexus.plugin.manager.PluginResolutionRequest; -import org.sonatype.plexus.plugin.manager.PluginResolutionResult; /** * This listener has two parts: the collection of the extension elements which happens during POM construction, @@ -36,8 +29,8 @@ @Configuration(value = "true") private boolean inBuild = true; - @Requirement - PlexusPluginManager pluginManager; + //@Requirement + //PlexusPluginManager pluginManager; private List<Extension> buildExtensions = new ArrayList<Extension>(); @@ -69,6 +62,7 @@ for ( Extension be : buildExtensions ) { + /* PluginResolutionRequest request = new PluginResolutionRequest() .setPluginMetadata( new PluginMetadata( be.getGroupId(), be.getArtifactId(), be.getVersion() ) ) .addLocalRepository( session.getRequest().getLocalRepositoryPath() ) @@ -90,6 +84,7 @@ { e.printStackTrace(); } + */ } }