Author: jdcasey
Date: Thu Apr 28 17:29:04 2005
New Revision: 165242
URL: http://svn.apache.org/viewcvs?rev=165242&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=165242&r1=165241&r2=165242&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Thu Apr 28 17:29:04 2005
@@ -59,12 +59,12 @@
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-3</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
- </dependency>
+ </dependency -->
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=165242&r1=165241&r2=165242&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Thu Apr 28 17:29:04 2005
@@ -52,7 +52,7 @@
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.plugin.MojoManager</role>
+ <role>org.apache.maven.plugin.PluginManager</role>
</requirement>
</requirements>
<configuration>
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml?rev=165242&r1=165241&r2=165242&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
Thu Apr 28 17:29:04 2005
@@ -2,23 +2,23 @@
<component-discoverer-manager
implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
<listeners>
<listener
implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
- <role>org.apache.maven.plugin.MojoManager</role>
+ <role>org.apache.maven.plugin.PluginManager</role>
</listener>
</listeners>
<component-discoverers>
<component-discoverer
implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
</component-discoverers>
</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-factory
implementation="org.codehaus.plexus.component.factory.marmalade.MarmaladeClasspathComponentFactory">
<id>marmalade</id>
</component-factory>
</component-factories>
- </component-factory-manager>
+ </component-factory-manager -->
<components>
<component>
- <role>org.apache.maven.plugin.MojoManager</role>
+ <role>org.apache.maven.plugin.PluginManager</role>
<implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
<requirements>
<requirement>
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=165242&r1=165241&r2=165242&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Thu Apr 28
17:29:04 2005
@@ -36,12 +36,12 @@
public class MBoot
{
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-plugin-tools/maven-plugin-tools-api",
"maven-plugin-tools/maven-plugin-tools-java",
"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",
"maven-plugins/maven-install-plugin",
"maven-plugins/maven-jar-plugin",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
