Author: brett
Date: Thu Jan 29 04:19:04 2009
New Revision: 738755
URL: http://svn.apache.org/viewvc?rev=738755&view=rev
Log:
[MNG-3920] block out the component api from plugins since they are only going
to be exposed to the one from the core (it is not shaded). This prevents the
confusing scenario of double loading the interfaces and having the container
not register them properly
Merged from: r738753
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props
changed)
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 04:19:04 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 04:19:04 2009
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723,738753
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 04:19:04 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723,738753
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=738755&r1=738754&r2=738755&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
Thu Jan 29 04:19:04 2009
@@ -84,6 +84,10 @@
artifacts.add( "plexus-interactivity-api" );
artifacts.add( "maven-toolchain" );
artifacts.add( "wagon-provider-api" );
+
+ // drop the component-api - even though we don't use it directly it is
included in out container-default
+ artifacts.add( "plexus-component-api" );
+
return artifacts;
}
}
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 04:19:04 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723,738753
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 04:19:04 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723,738753
