Author: jvanzyl
Date: Sat Sep 27 13:37:39 2008
New Revision: 699732
URL: http://svn.apache.org/viewvc?rev=699732&view=rev
Log:
o fixing component references
Removed:
maven/components/branches/jvz/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderImportProjectTest.java
maven/components/branches/jvz/maven-embedder/src/test/projects/complex-project/
Modified:
maven/components/branches/jvz/build.xml
maven/components/branches/jvz/maven-core/src/test/resources/META-INF/plexus/components.xml
maven/components/branches/jvz/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/branches/jvz/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/build.xml?rev=699732&r1=699731&r2=699732&view=diff
==============================================================================
--- maven/components/branches/jvz/build.xml (original)
+++ maven/components/branches/jvz/build.xml Sat Sep 27 13:37:39 2008
@@ -155,6 +155,7 @@
<target name="maven-compile" depends="compile-boot" description="compiles
Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli"
failonerror="true">
<classpath refid="maven.classpath"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
Modified:
maven/components/branches/jvz/maven-core/src/test/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/src/test/resources/META-INF/plexus/components.xml?rev=699732&r1=699731&r2=699732&view=diff
==============================================================================
---
maven/components/branches/jvz/maven-core/src/test/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/jvz/maven-core/src/test/resources/META-INF/plexus/components.xml
Sat Sep 27 13:37:39 2008
@@ -70,6 +70,7 @@
<lifecycle>
<id>default</id>
<!-- START SNIPPET: pom-lifecycle -->
+
<phases>
<package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
Modified:
maven/components/branches/jvz/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml?rev=699732&r1=699731&r2=699732&view=diff
==============================================================================
---
maven/components/branches/jvz/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
(original)
+++
maven/components/branches/jvz/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
Sat Sep 27 13:37:39 2008
@@ -27,9 +27,6 @@
<role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
</requirement>
<requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
Modified:
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=699732&r1=699731&r2=699732&view=diff
==============================================================================
---
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
Sat Sep 27 13:37:39 2008
@@ -82,9 +82,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -209,16 +206,6 @@
|
-->
<component>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
- </component>
-
-<!--
- |
- |
- |
- -->
- <component>
<role>org.apache.maven.project.validation.ModelValidator</role>
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
</component>
