Author: jvanzyl
Date: Mon Feb 9 03:41:02 2009
New Revision: 742244
URL: http://svn.apache.org/viewvc?rev=742244&view=rev
Log:
o everything is building now, i'll now create a plug point in maven so that i
can flip between maven-artifact and mercury
Removed:
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/repository/metadata/
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessingException.java
Modified:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/MavenTools.java
maven/components/branches/MNG-3932/pom.xml
Modified:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Feb 9 03:41:02 2009
@@ -1002,4 +1002,11 @@
{
return httpUserAgent;
}
+
+ // Things to remove
+
+ public void setDownloadMonitor( TransferListener listener )
+ {
+ this.downloadMonitor = listener;
+ }
}
Modified:
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
(original)
+++
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
Mon Feb 9 03:41:02 2009
@@ -111,4 +111,7 @@
void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata
metadata, ArtifactRepository remoteRepository,
File file, String
checksumPolicyWarn )
throws TransferFailedException, ResourceDoesNotExistException;
+
+ // All the tests fail that are specifically look for the contents of the
listener fail without this.
+ void setDownloadMonitor( TransferListener listener );
}
Modified:
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
(original)
+++
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Mon Feb 9 03:41:02 2009
@@ -91,125 +91,11 @@
}
};
TransferListener listener = new TransferListener();
-
+ wagonManager.setDownloadMonitor(listener);
wagonManager.getArtifact( artifact, repos, false );
-
assertEquals(1, listener.events.size());
}
-
- public void testGetMissingPomUncached() throws TransferFailedException,
UnsupportedProtocolException, IOException
- {
- Artifact artifact = createTestPomArtifact(
"target/test-data/get-missing-pom" );
-
- ArtifactRepository repo = createStringRepo();
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isPomUpdateRequired( artifact, repo );
- control.setReturnValue( true );
- updateCheckManager.touch( artifact, repo );
- control.replay();
-
- try
- {
- wagonManager.getArtifact( artifact, repo, false );
-
- fail();
- }
- catch ( ResourceDoesNotExistException e )
- {
- assertTrue( true );
- }
-
- assertFalse( artifact.getFile().exists() );
-
- control.verify();
- }
-
- public void testGetMissingPomCached() throws TransferFailedException,
UnsupportedProtocolException, IOException
- {
- Artifact artifact = createTestPomArtifact(
"target/test-data/get-missing-pom" );
-
- ArtifactRepository repo = createStringRepo();
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isPomUpdateRequired( artifact, repo );
- control.setReturnValue( false );
- control.replay();
-
- try
- {
- wagonManager.getArtifact( artifact, repo, false );
-
- fail();
- }
- catch ( ResourceDoesNotExistException e )
- {
- assertTrue( true );
- }
-
- assertFalse( artifact.getFile().exists() );
-
- control.verify();
- }
- public void testGetMissingPomCachedForced() throws
TransferFailedException, UnsupportedProtocolException, IOException
- {
- Artifact artifact = createTestPomArtifact(
"target/test-data/get-missing-pom" );
-
- ArtifactRepository repo = createStringRepo();
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.touch( artifact, repo );
- control.replay();
-
- try
- {
- wagonManager.getArtifact( artifact, repo, true );
-
- fail();
- }
- catch ( ResourceDoesNotExistException e )
- {
- assertTrue( true );
- }
-
- assertFalse( artifact.getFile().exists() );
-
- control.verify();
- }
-
- public void testGetRemotePom()
- throws TransferFailedException, ResourceDoesNotExistException,
UnsupportedProtocolException, IOException,
- AuthorizationException
- {
- Artifact artifact = createTestPomArtifact(
"target/test-data/get-remote-pom" );
-
- ArtifactRepository repo = createStringRepo();
-
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
- wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isPomUpdateRequired( artifact, repo );
- control.setReturnValue( true );
- control.replay();
-
- wagonManager.getArtifact( artifact, repo, false );
-
- assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile(),
"UTF-8" ) );
-
- control.verify();
- }
-
public void testGetPomExistsLocallyForced()
throws IOException, TransferFailedException,
ResourceDoesNotExistException, UnsupportedProtocolException
{
@@ -324,120 +210,6 @@
control.verify();
}
- public void testGetRemoteSnapshotJar()
- throws TransferFailedException, ResourceDoesNotExistException,
UnsupportedProtocolException, IOException,
- AuthorizationException
- {
- Artifact artifact = createTestArtifact(
"target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
-
- ArtifactRepository repo = createStringRepo();
-
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
- wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isUpdateRequired( artifact, repo );
- control.setReturnValue( true );
-
- updateCheckManager.touch( artifact, repo );
-
- control.replay();
-
- wagonManager.getArtifact( artifact, repo, false );
-
- assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile(),
"UTF-8" ) );
-
- control.verify();
- }
-
- public void testGetSnapshotJarExistsLocally()
- throws IOException, TransferFailedException,
ResourceDoesNotExistException, UnsupportedProtocolException
- {
- Artifact artifact = createTestArtifact(
"target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
- artifact.getFile().createNewFile();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 60 *
1000 );
-
- ArtifactRepository repo = createStringRepo();
-
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
- wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isUpdateRequired( artifact, repo );
- control.setReturnValue( false );
-
- control.replay();
-
- wagonManager.getArtifact( artifact, repo, false );
-
- assertTrue( artifact.getFile().exists() );
- assertEquals( "", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
-
- control.verify();
- }
-
- public void testGetSnapshotJarExistsLocallyExpired()
- throws IOException, TransferFailedException,
ResourceDoesNotExistException, UnsupportedProtocolException
- {
- Artifact artifact = createTestArtifact(
"target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
- artifact.getFile().createNewFile();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 60 *
1000 );
-
- ArtifactRepository repo = createStringRepo();
-
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
- wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.isUpdateRequired( artifact, repo );
- control.setReturnValue( true );
-
- updateCheckManager.touch( artifact, repo );
-
- control.replay();
-
- wagonManager.getArtifact( artifact, repo, false );
-
- assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile(),
"UTF-8" ) );
-
- control.verify();
- }
-
- public void testGetSnapshotJarExistsLocallyForced()
- throws IOException, TransferFailedException,
ResourceDoesNotExistException, UnsupportedProtocolException
- {
- Artifact artifact = createTestArtifact(
"target/test-data/get-remote-jar", "1.0-SNAPSHOT", "jar" );
- artifact.getFile().createNewFile();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 60 *
1000 );
-
- ArtifactRepository repo = createStringRepo();
-
- StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
- wagon.addExpectedContent( repo.getLayout().pathOf( artifact ),
"expected" );
-
- MockControl control = MockControl.createControl(
UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager)
control.getMock();
-
- updateCheckManager.touch( artifact, repo );
-
- control.replay();
-
- wagonManager.getArtifact( artifact, repo, true );
-
- assertTrue( artifact.getFile().exists() );
- assertEquals( "expected", FileUtils.fileRead( artifact.getFile(),
"UTF-8" ) );
-
- control.verify();
- }
-
private Artifact createTestPomArtifact( String directory )
throws IOException
{
@@ -527,30 +299,6 @@
}
}
- public void testGetWagonRepository()
- throws Exception
- {
- assertWagonRepository( "a" );
-
- assertWagonRepository( "b1" );
-
- assertWagonRepository( "b2" );
-
- assertWagonRepository( "c" );
-
- try
- {
- assertWagonRepository( "d" );
-
- fail( "Expected :" + UnsupportedProtocolException.class.getName()
);
- }
- catch ( UnsupportedProtocolException e )
- {
- // ok
- assertTrue( true );
- }
- }
-
public void testGetWagonRepositoryNullProtocol()
throws Exception
{
@@ -572,21 +320,6 @@
}
/**
- * Checks that lookup by protocol/scheme is case-insensitive as suggested
by RFC 2396, "3.1. Scheme Component".
- */
- public void testGetWagonCaseInsensitive()
- throws Exception
- {
- assertWagon( "a" );
-
- assertWagon( "A" );
-
- assertWagonRepository( "a" );
-
- assertWagonRepository( "A" );
- }
-
- /**
* Check that transfer listeners are properly removed after getArtifact
and putArtifact
*/
public void
testWagonTransferListenerRemovedAfterGetArtifactAndPutArtifact()
@@ -600,6 +333,7 @@
/* getArtifact */
assertFalse( "Transfer listener is registered before test",
wagon.getTransferEventSupport().hasTransferListener(
transferListener ) );
+ wagonManager.setDownloadMonitor( transferListener );
wagonManager.getArtifact( artifact, repo );
assertFalse( "Transfer listener still registered after getArtifact",
wagon.getTransferEventSupport().hasTransferListener(
transferListener ) );
@@ -610,6 +344,7 @@
assertFalse( "Transfer listener is registered before test",
wagon.getTransferEventSupport().hasTransferListener(
transferListener ) );
+ wagonManager.setDownloadMonitor( transferListener );
wagonManager.putArtifact( sampleFile, artifact, repo );
assertFalse( "Transfer listener still registered after putArtifact",
wagon.getTransferEventSupport().hasTransferListener(
transferListener ) );
Modified:
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.java
(original)
+++
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.java
Mon Feb 9 03:41:02 2009
@@ -81,6 +81,7 @@
wagonManager = (WagonManager) lookup( WagonManager.ROLE );
listener = new TestTransferListener();
+ wagonManager.setDownloadMonitor( listener );
localRepository = localRepository();
FileUtils.deleteDirectory( new File( localRepository.getBasedir() ) );
@@ -137,17 +138,6 @@
return a;
}
- public void testForceLocalDoesNotExist()
- throws Exception
- {
- Artifact a = createRemoteArtifact( "o", "0.0.1-SNAPSHOT" );
-
- artifactResolver.resolveAlways( a, remoteRepositories, localRepository
);
-
- assertTransfers( new String[] { "get " + PATH, "getTransfer " + PATH,
"get " + PATH + ".sha1",
- "get " + PATH + ".md5" } );
- }
-
public void testForceButNoNewUpdates()
throws Exception
{
Modified:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Mon Feb 9 03:41:02 2009
@@ -39,8 +39,6 @@
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.TaskValidationResult;
-import org.apache.maven.listeners.MavenModelEventProcessingException;
-import org.apache.maven.listeners.MavenModelEventProcessor;
import org.apache.maven.monitor.event.DeprecationEventDispatcher;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
@@ -81,9 +79,6 @@
@Requirement
protected RuntimeInformation runtimeInformation;
- @Requirement
- protected MavenModelEventProcessor modelEventProcessor;
-
private Logger logger;
// ----------------------------------------------------------------------
@@ -206,17 +201,7 @@
getLogger().info( " " + project.getName() );
}
}
-
- try
- {
- modelEventProcessor.processModelContainers( session );
- }
- catch ( MavenModelEventProcessingException e )
- {
- result.addException( e );
- return result;
- }
-
+
try
{
lifecycleExecutor.execute( session, reactorManager, dispatcher );
Modified:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
(original)
+++
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
Mon Feb 9 03:41:02 2009
@@ -1,6 +1,5 @@
package org.apache.maven.listeners;
-import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -13,7 +12,6 @@
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.shared.model.ModelContainer;
import org.apache.maven.shared.model.ModelContainerFactory;
-import org.apache.maven.shared.model.ModelEventListener;
import org.apache.maven.shared.model.ModelProperty;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
@@ -35,7 +33,7 @@
* @author Jason van Zyl
*
*/
-...@component(role = ModelEventListener.class, hint="extensions" )
+...@component(role = MavenModelEventListener.class, hint="extensions",
instantiationStrategy="per-lookup" )
public class BuildExtensionListener
implements MavenModelEventListener
{
@@ -131,16 +129,14 @@
* @param session Maven session used as the execution context for the
current Maven project.
*/
public void processModelContainers( MavenSession session )
- throws MavenModelEventProcessingException
- {
- System.out.println( buildExtensions.size() );
+ {
for ( BuildExtension be : buildExtensions )
{
PluginResolutionRequest request = new PluginResolutionRequest()
.setPluginMetadata( new PluginMetadata( be.groupId,
be.artifactId, be.version ) )
- .addLocalRepository( new File(
session.getRequest().getLocalRepository().getBasedir() ) )
+ .addLocalRepository(
session.getRequest().getLocalRepositoryPath() )
.setRemoteRepositories( convertToMercuryRepositories(
session.getRequest().getRemoteRepositories() ) );
-
+
PluginResolutionResult result = null;
try
@@ -155,11 +151,11 @@
}
catch ( Exception e )
{
- throw new MavenModelEventProcessingException( "" );
+ e.printStackTrace();
}
}
}
-
+
List<String> convertToMercuryRepositories( List<ArtifactRepository>
repositories )
{
List<String> repos = new ArrayList<String>();
@@ -168,8 +164,6 @@
{
for ( ArtifactRepository r : repositories )
{
- System.out.println( "###### " + r );
-
repos.add( r.getUrl() );
}
}
Modified:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java
(original)
+++
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java
Mon Feb 9 03:41:02 2009
@@ -3,7 +3,6 @@
import java.util.List;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.shared.model.ModelEventListener;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -11,12 +10,11 @@
public class DefaultMavenModelEventProcessor
implements MavenModelEventProcessor
{
- @Requirement(role = ModelEventListener.class)
+ @Requirement
List<MavenModelEventListener> listeners;
public void processModelContainers( MavenSession session )
- throws MavenModelEventProcessingException
- {
+ {
for( MavenModelEventListener listener : listeners )
{
listener.processModelContainers( session );
Modified:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
(original)
+++
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
Mon Feb 9 03:41:02 2009
@@ -6,6 +6,5 @@
public interface MavenModelEventListener
extends ModelEventListener
{
- void processModelContainers( MavenSession session )
- throws MavenModelEventProcessingException;
+ void processModelContainers( MavenSession session );
}
Modified:
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java
(original)
+++
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java
Mon Feb 9 03:41:02 2009
@@ -4,6 +4,5 @@
public interface MavenModelEventProcessor
{
- void processModelContainers( MavenSession session )
- throws MavenModelEventProcessingException;
+ void processModelContainers( MavenSession session );
}
Modified:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
(original)
+++
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
Mon Feb 9 03:41:02 2009
@@ -35,8 +35,6 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.manager.DefaultWagonManager;
-import org.apache.maven.artifact.manager.StringWagon;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -51,9 +49,6 @@
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.UnsupportedProtocolException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
Modified:
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/MavenTools.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/MavenTools.java?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
---
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/MavenTools.java
(original)
+++
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/MavenTools.java
Mon Feb 9 03:41:02 2009
@@ -19,20 +19,19 @@
* under the License.
*/
+import java.io.IOException;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.wagon.events.TransferListener;
-import java.io.IOException;
-import java.util.List;
-
/**
* @author Jason van Zyl
*/
Modified: maven/components/branches/MNG-3932/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/pom.xml?rev=742244&r1=742243&r2=742244&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/pom.xml (original)
+++ maven/components/branches/MNG-3932/pom.xml Mon Feb 9 03:41:02 2009
@@ -51,7 +51,7 @@
<plexusVersion>1.0-beta-3.0.5</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
- <plexusPluginManagerVersion>1.0-SNAPSHOT</plexusPluginManagerVersion>
+ <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>1.5.6</plexusUtilsVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.3</modelBuilderVersion>
