maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject [40/50] git commit: Merge branch 'trunk' of github.com:apache/maven-3 into trunk
Date Mon, 18 Mar 2013 21:47:27 GMT
Merge branch 'trunk' of github.com:apache/maven-3 into trunk

Conflicts:
	apache-maven/src/bin/mvn
	maven-embedder/src/site/apt/logging.apt


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

Branch: refs/heads/master
Commit: 38d132b64d0e176456b9720f5acf56ce7decf457
Parents: fdf808d fcffe3c
Author: Jason van Zyl <jason@tesla.io>
Authored: Thu Feb 14 18:02:32 2013 -0500
Committer: Jason van Zyl <jason@tesla.io>
Committed: Thu Feb 14 18:02:32 2013 -0500

----------------------------------------------------------------------
 apache-maven/src/bin/mvn                           |   25 +++++
 apache-maven/src/bin/mvnDebug                      |   26 +++++-
 apache-maven/src/bin/mvnyjp                        |   32 +++++--
 apache-maven/src/main/assembly/src.xml             |    1 +
 init-git-svn.sh                                    |    4 +
 .../apache/maven/DefaultArtifactFilterManager.java |    4 +-
 .../main/java/org/apache/maven/DefaultMaven.java   |   45 ++++------
 .../maven/DefaultProjectDependenciesResolver.java  |    6 +-
 .../apache/maven/ProjectBuildFailureException.java |   19 ++++
 .../main/java/org/apache/maven/ReactorReader.java  |    6 +-
 .../maven/artifact/repository/RepositoryCache.java |   58 ++++++++++++
 .../repository/metadata/io/MetadataReader.java     |    2 +-
 .../resolver/ArtifactResolutionRequest.java        |    9 ++
 .../maven/classrealm/DefaultClassRealmManager.java |   16 ++--
 .../maven/exception/DefaultExceptionHandler.java   |    6 +-
 .../org/apache/maven/execution/MavenSession.java   |   11 +++
 .../maven/plugin/DefaultPluginRealmCache.java      |   21 ++++-
 .../maven/project/DefaultMavenProjectHelper.java   |   25 ++---
 .../org/apache/maven/project/MavenProject.java     |   71 ++++++++++-----
 .../apache/maven/project/MavenProjectHelper.java   |   36 ++++++++
 .../org/apache/maven/cli/CLIReportingUtils.java    |    4 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |   24 ++----
 .../transfer/BatchModeMavenTransferListener.java   |    4 +-
 maven-embedder/src/site/apt/logging.apt            |   20 ++++
 24 files changed, 356 insertions(+), 119 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/38d132b6/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --cc apache-maven/src/bin/mvn
index 6dd9d5e,f535d38..52451ad
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@@ -53,24 -53,30 +53,49 @@@ mingw=fals
  case "`uname`" in
    CYGWIN*) cygwin=true ;;
    MINGW*) mingw=true;;
++<<<<<<< HEAD
 +  Darwin*) darwin=true 
 +           
++=======
+   Darwin*) darwin=true            
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
             #
             # Look for the Apple JDKs first to preserve the existing behaviour, and then
look
             # for the new JDKs provided by Oracle.
             # 
++<<<<<<< HEAD
++=======
+            if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK
]] ; then
+              #
+              # Apple JDKs
+              #
+              export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+            fi
+            
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
             if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK
]] ; then
               #
               # Apple JDKs
               #
++<<<<<<< HEAD
 +             JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
 +           fi
 +             
 +           if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK"
]] ; then
 +               #
 +               # Oracle JDKs
 +               #
 +               JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
++=======
+              export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+            fi
+              
+            if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK"
]] ; then
+              #
+              # Oracle JDKs
+              #
+              export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
             fi           
             ;;
  esac

http://git-wip-us.apache.org/repos/asf/maven/blob/38d132b6/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --cc maven-embedder/src/site/apt/logging.apt
index cca01bf,cb860d0..22fa1ac
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@@ -24,7 -24,7 +24,11 @@@ Maven Loggin
  
   Plexus Logger can be injected in Plexus component using Plexus annotations
  
++<<<<<<< HEAD
 ++------
++=======
+ +------+
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
  import org.codehaus.plexus.logging.Logger;
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
@@@ -36,20 -36,20 +40,36 @@@ public class DefaultMyComponen
      @Requirement
      private Logger logger;
  }
++<<<<<<< HEAD
 ++------
++=======
+ +------+
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
  
   Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course,
this will only work when run under
   Maven 3.1.0, then this technique can be used safely only in Maven core components.
   
++<<<<<<< HEAD
 ++-----
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +public class Wombat
 +{
 +   final Logger logger = LoggerFactory.getLogger(Wombat.class);
 +}
 ++-----
++=======
+ +-----+
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+ public class MyClass
+ {
+    final Logger logger = LoggerFactory.getLogger( MyClass.class );
+ }
+ +-----+
++>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
  
  * Logger Name
  


Mime
View raw message