Author: jvanzyl
Date: Mon Dec 11 07:47:09 2006
New Revision: 485721
URL: http://svn.apache.org/viewvc?view=rev&rev=485721
Log:
o flipping back to 1.0-beta-1 of wagon for the time being
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=485721&r1=485720&r2=485721
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Mon Dec 11 07:47:09 2006
@@ -4,7 +4,7 @@
plexus-utils.version=1.2
plexus-interactivity-api.version=1.0-alpha-4
commons-cli.version=1.0
-wagon.version=1.0-beta-2-SNAPSHOT
+wagon.version=1.0-beta-1
doxia.version=1.0-alpha-9-SNAPSHOT
modello.version=1.0-alpha-13
junit.version=3.8.1
Modified:
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java?view=diff&rev=485721&r1=485720&r2=485721
==============================================================================
---
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
(original)
+++
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
Mon Dec 11 07:47:09 2006
@@ -33,6 +33,8 @@
String url = transferEvent.getWagon().getRepository().getUrl();
+ System.out.println( "url = " + url );
+
// TODO: can't use getLogger() because this isn't currently
instantiated as a component
System.out.println( message + ": " + url + "/" +
transferEvent.getResource().getName() );
}
Modified:
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?view=diff&rev=485721&r1=485720&r2=485721
==============================================================================
---
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Mon Dec 11 07:47:09 2006
@@ -48,6 +48,7 @@
ClassWorld classWorld = new ClassWorld( "plexus.core",
Thread.currentThread().getContextClassLoader() );
int result = main( args, classWorld );
+
System.exit(result);
}
@@ -150,7 +151,7 @@
interactive = false;
}
- boolean usePluginRegistry = true;
+ boolean usePluginRegistry = false;
if ( commandLine.hasOption( CLIManager.SUPPRESS_PLUGIN_REGISTRY ) )
{
Modified:
maven/components/trunk/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java?view=diff&rev=485721&r1=485720&r2=485721
==============================================================================
---
maven/components/trunk/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
(original)
+++
maven/components/trunk/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
Mon Dec 11 07:47:09 2006
@@ -34,7 +34,6 @@
public abstract class AbstractConsoleDownloadMonitorTest
extends TestCase
{
-
private AbstractConsoleDownloadMonitor monitor;
public AbstractConsoleDownloadMonitorTest()
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=485721&r1=485720&r2=485721
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Dec 11 07:47:09 2006
@@ -146,7 +146,7 @@
<module>maven-tools</module>
</modules>
<properties>
- <wagonVersion>1.0-beta-2-SNAPSHOT</wagonVersion>
+ <wagonVersion>1.0-beta-1</wagonVersion>
<plexusVersion>1.0-alpha-13</plexusVersion>
</properties>
<dependencies>