You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/03/20 00:00:07 UTC
git commit: fixed merge conflicts
Updated Branches:
refs/heads/master 2d7069b6e -> 833b5f0e9
fixed merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/833b5f0e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/833b5f0e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/833b5f0e
Branch: refs/heads/master
Commit: 833b5f0e93b626bcead6520878d716e82a159d3d
Parents: 2d7069b
Author: Hervé Boutemy <hb...@apache.org>
Authored: Tue Mar 19 23:54:24 2013 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Tue Mar 19 23:55:04 2013 +0100
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 20 --------------------
maven-plugin-api/src/site/apt/index.apt | 15 ---------------
2 files changed, 0 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/833b5f0e/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index bdab9b2..fc3834e 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -24,11 +24,7 @@ Maven Logging
Plexus Logger and LoggerManager 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;
@@ -43,26 +39,11 @@ public class DefaultMyComponent
@Requirement
private LoggerManager loggerManager;
}
-<<<<<<< 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;
@@ -72,7 +53,6 @@ public class MyClass
final Logger logger = LoggerFactory.getLogger( MyClass.class );
}
+-----+
->>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
* Logger Name
http://git-wip-us.apache.org/repos/asf/maven/blob/833b5f0e/maven-plugin-api/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/site/apt/index.apt b/maven-plugin-api/src/site/apt/index.apt
index 3def6bc..4d2497b 100644
--- a/maven-plugin-api/src/site/apt/index.apt
+++ b/maven-plugin-api/src/site/apt/index.apt
@@ -3,35 +3,20 @@
-----
Hervé Boutemy
-----
-<<<<<<< HEAD
2012-06-02
-=======
- 2011-10-16
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
-----
Maven Plugin API
-<<<<<<< HEAD
The API for plugins - composed of goals implemented by Mojos - development.
A plugin is described in a {{{./plugin.html}<<<META-INF/maven/plugin.xml>>> plugin descriptor}},
generally generated from plugin sources using {{{/plugin-tools/maven-plugin-plugin/}maven-plugin-plugin}}.
-=======
- The API for plugins - Mojos - development.
-
- A plugin is described in a {{{./plugin.html}<<<META-INF/maven/plugin.xml>>> plugin descriptor}},
- generally generated from plugin sources using {{{/plugins/maven-plugin-plugin/}maven-plugin-plugin}}.
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
* See Also
* {{{/developers/mojo-api-specification.html}Mojo API Specification}}
-<<<<<<< HEAD
* {{{/plugin-tools/}plugin-tools}}
* {{{/plugin-testing/}plugin-testing}}
-=======
- * {{{/plugin-tools/}plugin-tools}}, containing {{{/plugins/maven-plugin-plugin/}maven-plugin-plugin}}
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be