Author: brett
Date: Mon Dec 22 14:58:16 2008
New Revision: 728820
URL: http://svn.apache.org/viewvc?rev=728820&view=rev
Log:
merge -r708789:728809 from 2.0.10-RC branch
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/pom.xml
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.0.x/build.xml
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java
maven/components/branches/maven-2.0.x/maven-core/pom.xml
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-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
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)
maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
maven/components/branches/maven-2.0.x/pom.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 22 14:58:16 2008
@@ -1,4 +1,3 @@
-/maven/components/branches/maven-2.0.10-RC:720697,725329-725330,725342,725349,725359,725748,726876-726881
-/maven/components/branches/maven-2.0.x: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.0.10-RC:708790-728809
/maven/components/branches/maven-2.1.x:720038,727670,727762,727868
/maven/components/trunk:720001,721902,726845
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 22 14:58:16 2008
@@ -1,4 +1,4 @@
-/maven/components/branches/maven-2.0.10-RC/apache-maven:720697,725329-725330,725342,725349,725359,725748,726876-726881
+/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809
/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
/maven/components/trunk/apache-maven:720001,721902,726845
Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Mon Dec 22
14:58:16 2008
@@ -100,11 +100,6 @@
<pattern>org.apache.commons.logging</pattern>
</relocation>
- <!-- For jsch wagon -->
- <relocation>
- <pattern>com.jcraft</pattern>
- </relocation>
-
<!-- For wagon API -->
<relocation>
<pattern>org.cyberneko</pattern>
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 22 14:58:16 2008
@@ -0,0 +1 @@
+/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809
Modified: maven/components/branches/maven-2.0.x/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/build.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Mon Dec 22 14:58:16 2008
@@ -266,6 +266,7 @@
</exec>
<echo>Running integration tests</echo>
+ <echo>maven.home is: ${maven.home}</echo>
<!-- Using java.io.tmpdir to avoid long path names that will make windows
scream. -->
<exec failonerror="true"
dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}"
executable="${maven.home}/bin/mvn">
<env key="M2_HOME" value="${maven.home}"/>
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Dec 22 14:58:16 2008
@@ -50,7 +50,6 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.proxy.ProxyInfoProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
@@ -241,11 +240,7 @@
}
}
- wagon.connect( artifactRepository, getAuthenticationInfo(
repository.getId() ), new ProxyInfoProvider(){
- public ProxyInfo getProxyInfo(String protocol) {
- return (ProxyInfo) proxies.get( protocol );
- }
- });
+ wagon.connect( artifactRepository, getAuthenticationInfo(
repository.getId() ), getProxy(protocol));
wagon.put( source, remotePath );
@@ -443,11 +438,7 @@
try
{
wagon.connect( new Repository( repository.getId(),
repository.getUrl() ),
- getAuthenticationInfo( repository.getId() ), new
ProxyInfoProvider(){
- public ProxyInfo getProxyInfo(String protocol) {
- return (ProxyInfo) proxies.get( protocol );
- }
- });
+ getAuthenticationInfo( repository.getId()
),getProxy(protocol));
boolean firstRun = true;
boolean retry = true;
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
Mon Dec 22 14:58:16 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -31,9 +29,7 @@
import org.apache.maven.wagon.StreamWagon;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringOutputStream;
@@ -58,7 +54,7 @@
}
public void fillInputData( InputData inputData )
- throws TransferFailedException, ResourceDoesNotExistException,
AuthorizationException
+ throws TransferFailedException, ResourceDoesNotExistException
{
Resource resource = inputData.getResource();
@@ -92,4 +88,10 @@
{
expectedContent.clear();
}
+
+ public void openConnection() throws ConnectionException,
+ AuthenticationException {
+ // TODO Auto-generated method stub
+
+ }
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java
Mon Dec 22 14:58:16 2008
@@ -24,8 +24,10 @@
import java.util.Map;
import org.apache.maven.wagon.AbstractWagon;
+import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.resource.Resource;
@@ -104,4 +106,10 @@
{
return new String[] { "string" };
}
+
+ public void openConnection() throws ConnectionException,
+ AuthenticationException {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Mon Dec 22
14:58:16 2008
@@ -184,15 +184,6 @@
</plugins>
</reporting>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
<profiles>
<profile>
<id>include-site</id>
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=728820&r1=728819&r2=728820&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
Mon Dec 22 14:58:16 2008
@@ -61,6 +61,7 @@
Set artifacts = new HashSet();
artifacts.add( "classworlds" );
+ artifacts.add( "jsch" );
artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" );
artifacts.add( "doxia-logging-api" );
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Mon Dec 22 14:58:16 2008
@@ -200,6 +200,7 @@
if ( getLogger().isDebugEnabled() )
{
+ getLogger().debug( "Extension container contents:" );
extensionContainer.getContainerRealm().display();
}
}
@@ -267,13 +268,19 @@
try
{
Map wagons = extensionContainer.lookupMap( Wagon.ROLE );
+ getLogger().debug( "Wagons to register: " + wagons.keySet() );
wagonManager.registerWagons( wagons.keySet(),
extensionContainer );
}
catch ( ComponentLookupException e )
{
// no wagons found in the extension
+ getLogger().debug( "No wagons found in the extensions or other
internal error: " + e.getMessage(), e );
}
}
+ else
+ {
+ getLogger().debug( "Wagons could not be registered as the
extension container was never created" );
+ }
}
public void contextualize( Context context )
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon Dec 22 14:58:16 2008
@@ -154,6 +154,7 @@
Extension extension = (Extension) j.next();
try
{
+ getLogger().debug( "Adding extension: " + extension );
extensionManager.addExtension( extension, project,
session.getLocalRepository() );
}
catch ( PlexusContainerException e )
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Mon Dec 22 14:58:16 2008
@@ -583,38 +583,5 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>http</role-hint>
-
<implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LightweightHttpWagon</description>
- <isolated-realm>false</isolated-realm>
- <configuration>
- <httpHeaders>
- <property>
- <name>User-Agent</name>
- <value>Apache Maven/${project.version}</value>
- </property>
- </httpHeaders>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.wagon.Wagon</role>
- <role-hint>https</role-hint>
-
<implementation>org.apache.maven.wagon.providers.http.LightweightHttpsWagon</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <description>LIghtweightHttpsWagon</description>
- <isolated-realm>false</isolated-realm>
- <configuration>
- <httpHeaders>
- <property>
- <name>User-Agent</name>
- <value>Apache Maven/${project.version}</value>
- </property>
- </httpHeaders>
- </configuration>
- </component>
</components>
</component-set>
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 22 14:58:16 2008
@@ -0,0 +1 @@
+/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 22 14:58:16 2008
@@ -0,0 +1 @@
+/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Mon Dec 22 14:58:16 2008
@@ -71,12 +71,12 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.2</version>
@@ -91,7 +91,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
@@ -111,27 +111,27 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
<version>2.2</version>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.0-beta-8</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
+ <version>2.0-beta-7</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -139,11 +139,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
+ <version>2.1-alpha-2</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=728820&r1=728819&r2=728820&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Dec 22 14:58:16 2008
@@ -259,7 +259,7 @@
<properties>
<mavenVersion>2.0.11-SNAPSHOT</mavenVersion>
- <wagonVersion>1.0-beta-4</wagonVersion>
+ <wagonVersion>1.0-beta-2</wagonVersion>
</properties>
<!--start-->
@@ -417,7 +417,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -579,4 +579,4 @@
</reporting>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
