maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steph...@apache.org
Subject git commit: Minimize intra-branch differences
Date Wed, 12 Dec 2012 11:10:00 GMT
Updated Branches:
  refs/heads/logging/slf4j-log4j 0ef5dd14d -> 66950927d


Minimize intra-branch differences


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/66950927
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/66950927
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/66950927

Branch: refs/heads/logging/slf4j-log4j
Commit: 66950927d7885d7d63b280f1444e74e4a0a4cd37
Parents: 0ef5dd1
Author: Stephen Connolly <stephen.alan.connolly@gmail.com>
Authored: Wed Dec 12 11:09:47 2012 +0000
Committer: Stephen Connolly <stephen.alan.connolly@gmail.com>
Committed: Wed Dec 12 11:09:47 2012 +0000

----------------------------------------------------------------------
 maven-embedder/pom.xml                             |    3 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |   18 +++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/66950927/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 8a8baef..6522601 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -10,7 +10,8 @@
     governing permissions and limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven/blob/66950927/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 90b69eb..49b1edc 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -78,7 +78,6 @@ import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.impl.Log4jLoggerAdapter;
 import org.sonatype.aether.transfer.TransferListener;
 import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
@@ -391,9 +390,7 @@ public class MavenCli
         DefaultPlexusContainer container = null;
 
         ContainerConfiguration cc =
-            new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).setRealm(
-                setupContainerRealm( cliRequest ) ).setClassPathScanning(
-                PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ).setName( "maven" );
+            new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).setRealm(
setupContainerRealm( cliRequest ) ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring(
true ).setName( "maven" );
 
         container = new DefaultPlexusContainer( cc, new AbstractModule()
         {
@@ -917,9 +914,7 @@ public class MavenCli
             userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
         }
 
-        request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
-            cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
-            reactorFailureBehaviour ) // default:
+        request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
reactorFailureBehaviour ) // default:
                                                                                         
                                                                                         
                                        // fail
                                                                                         
                                                                                         
                                        // fast
         .setRecursive( recursive ) // default: true
@@ -1125,14 +1120,23 @@ public class MavenCli
     static class CliRequest
     {
         String[] args;
+
         CommandLine commandLine;
+
         ClassWorld classWorld;
+
         String workingDirectory;
+
         boolean debug;
+
         boolean quiet;
+
         boolean showErrors = true;
+
         Properties userProperties = new Properties();
+
         Properties systemProperties = new Properties();
+
         MavenExecutionRequest request;
 
         CliRequest( String[] args, ClassWorld classWorld )


Mime
View raw message