From 6fd5ead5d55b06a4f060a8cac59fbc4384b5f01f Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Fri, 2 Mar 2007 20:36:58 +0000 Subject: [PATCH] git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513938 13f79535-47bb-0310-9956-ffa450edef68 --- build.properties | 4 ++-- ...avenExecutionRequestDefaultsPopulator.java | 24 +++++++++---------- pom.xml | 6 +++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.properties b/build.properties index 89a081864c..79607c60a3 100644 --- a/build.properties +++ b/build.properties @@ -16,13 +16,13 @@ # under the License. classworlds.version=1.2-alpha-7 -plexus.version=1.0-alpha-16 +plexus.version=1.0-alpha-17 plexus-archiver.version=1.0-alpha-8 plexus-utils.version=1.4 plexus-interactivity-api.version=1.0-alpha-4 commons-cli.version=1.0 commons-lang.version=2.1 -wagon.version=1.0-beta-3-SNAPSHOT +wagon.version=1.0-beta-2 jsch.version=0.1.27 doxia.version=1.0-alpha-9-SNAPSHOT modello.version=1.0-alpha-13 diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java index aeefa6cd54..4da8df9fbe 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java @@ -84,7 +84,8 @@ public class DefaultMavenExecutionRequestDefaultsPopulator private WagonManager wagonManager; - public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, MavenEmbedder embedder ) + public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, + MavenEmbedder embedder ) throws MavenEmbedderException { if ( request.getSettings() == null ) @@ -123,24 +124,21 @@ public class DefaultMavenExecutionRequestDefaultsPopulator // Wagon - wagonManager.setOnline( !request.isOffline() ); - if ( request.isOffline() ) { getLogger().info( SystemWarnings.getOfflineWarning() ); - if ( request.isOffline() ) - { - wagonManager.setOnline( false ); - } - else - { - wagonManager.setInteractive( request.isInteractiveMode() ); + wagonManager.setOnline( false ); + } + else + { + wagonManager.setInteractive( request.isInteractiveMode() ); - wagonManager.addTransferListener( request.getTransferListener() ); + System.out.println( "request.getTransferListener() = " + request.getTransferListener() ); - wagonManager.setOnline( true ); - } + wagonManager.addTransferListener( request.getTransferListener() ); + + wagonManager.setOnline( true ); } try diff --git a/pom.xml b/pom.xml index 0471564a83..0187ca9d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -133,10 +133,12 @@ under the License. + @@ -162,7 +164,7 @@ under the License. maven-embedder - 1.0-alpha-16 + 1.0-alpha-17 1.0-beta-3-SNAPSHOT @@ -193,7 +195,7 @@ under the License. org.codehaus.plexus plexus-utils - 1.4.1-SNAPSHOT + 1.4 commons-lang