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

Cleaning up errors I introduced with search-and-replace, and with marmalade scripting support. I'm marking marmalade support out for now, until I can get that stuff dragged back into the present. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165242 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-04-29 00:29:04 +00:00
parent a58632b9dd
commit f5cd6adbe7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core/pom.xml
View File

@ -59,12 +59,12 @@
<artifactId>plexus-i18n</artifactId> <artifactId>plexus-i18n</artifactId>
<version>1.0-beta-3</version> <version>1.0-beta-3</version>
</dependency> </dependency>
<dependency> <!-- dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId> <artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency -->
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>

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

@ -52,7 +52,7 @@
<role>org.apache.maven.project.MavenProjectBuilder</role> <role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement> </requirement>
<requirement> <requirement>
<role>org.apache.maven.plugin.MojoManager</role> <role>org.apache.maven.plugin.PluginManager</role>
</requirement> </requirement>
</requirements> </requirements>
<configuration> <configuration>

8
maven-core/src/main/resources/META-INF/plexus/plexus.xml
View File

@ -2,23 +2,23 @@
<component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager"> <component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
<listeners> <listeners>
<listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor"> <listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
<role>org.apache.maven.plugin.MojoManager</role> <role>org.apache.maven.plugin.PluginManager</role>
</listener> </listener>
</listeners> </listeners>
<component-discoverers> <component-discoverers>
<component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/> <component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
</component-discoverers> </component-discoverers>
</component-discoverer-manager> </component-discoverer-manager>
<component-factory-manager implementation="org.codehaus.plexus.component.factory.DefaultComponentFactoryManager"> <!-- component-factory-manager implementation="org.codehaus.plexus.component.factory.DefaultComponentFactoryManager">
<component-factories> <component-factories>
<component-factory implementation="org.codehaus.plexus.component.factory.marmalade.MarmaladeClasspathComponentFactory"> <component-factory implementation="org.codehaus.plexus.component.factory.marmalade.MarmaladeClasspathComponentFactory">
<id>marmalade</id> <id>marmalade</id>
</component-factory> </component-factory>
</component-factories> </component-factories>
</component-factory-manager> </component-factory-manager -->
<components> <components>
<component> <component>
<role>org.apache.maven.plugin.MojoManager</role> <role>org.apache.maven.plugin.PluginManager</role>
<implementation>org.apache.maven.plugin.DefaultPluginManager</implementation> <implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
<requirements> <requirements>
<requirement> <requirement>

4
maven-mboot2/src/main/java/MBoot.java
View File

@ -36,12 +36,12 @@ import java.util.TreeMap;
public class MBoot public class MBoot
{ {
String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api", String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api",
"maven-plugin-descriptor", "maven-artifact", "maven-script/maven-script-marmalade", "maven-plugin-descriptor", "maven-artifact", /*"maven-script/maven-script-marmalade",*/
"maven-project", "maven-core", "maven-archiver", "maven-project", "maven-core", "maven-archiver",
"maven-plugin-tools/maven-plugin-tools-api", "maven-plugin-tools/maven-plugin-tools-api",
"maven-plugin-tools/maven-plugin-tools-java", "maven-plugin-tools/maven-plugin-tools-java",
"maven-plugin-tools/maven-plugin-tools-pluggy", "maven-plugin-tools/maven-plugin-tools-pluggy",
"maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"}; /*"maven-plugin-tools/maven-plugin-tools-marmalade",*/ "maven-core-it-verifier"};
String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin", String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin",
"maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin", "maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin",