Hi John,
On 14/07/2009, at 6:42 AM, [email protected] wrote:
Author: jdcasey
Date: Mon Jul 13 20:42:21 2009
New Revision: 793706
URL: http://svn.apache.org/viewvc?rev=793706&view=rev
Log:
[MNG-4228] Fixing ITs after changing wagon manager to use mappings
to lookup specific wagon component role-hints to use for a protocol.
Also, using ComponentDescriptor lookup instead of component lookup
to find extension wagons to register.
[snip]
Modified: maven/maven-2/branches/maven-2.2.x/maven-core/src/main/
java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=793706&r1=793705&r2=793706&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/
apache/maven/DefaultMaven.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/
apache/maven/DefaultMaven.java Mon Jul 13 20:42:21 2009
@@ -795,6 +795,19 @@
wagonManager.addMirror( mirror.getId(),
mirror.getMirrorOf(), mirror.getUrl() );
}
+
+ for ( Object k: executionProperties.keySet() )
+ {
+ String key = (String) k;
I prefer the synax
for ( String key : (Collection<String>) executionProperties.keySet() ) {
myself :)
Modified: maven/maven-2/branches/maven-2.2.x/maven-core/src/main/
resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=793706&r1=793705&r2=793706&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/resources/
META-INF/plexus/components.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core/src/main/resources/
META-INF/plexus/components.xml Mon Jul 13 20:42:21 2009
@@ -624,15 +624,28 @@
</component>
<component>
+ <role>org.apache.maven.artifact.manager.WagonProviderMapping</
role>
+ <role-hint>maven</role-hint>
+
<
implementation
>org.apache.maven.artifact.manager.DefaultWagonProviderMapping</
implementation>
+ <configuration>
+ <wagonProviders>
+ <http>lightweight</http>
+ <http>lightweight</http>
+ </wagonProviders>
+ </configuration>
+ </component>
should the second one here be <https> ?
Cheers,
Brett
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
