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 2012/12/09 22:58:30 UTC

git commit: [MNG-5406] added importSlf4jApi element to plugin descriptor (not yet used to effectively import slf4j-api or not)

Updated Branches:
  refs/heads/MNG-5406 [created] 0b870d538


[MNG-5406] added importSlf4jApi element to plugin descriptor (not yet
used to effectively import slf4j-api or not)

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

Branch: refs/heads/MNG-5406
Commit: 0b870d5389a55d10008a7b3cd727101a9a20e018
Parents: c8536bf
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Dec 9 22:58:26 2012 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Dec 9 22:58:26 2012 +0100

----------------------------------------------------------------------
 .../maven/plugin/descriptor/PluginDescriptor.java  |   21 +++++++++++++++
 .../plugin/descriptor/PluginDescriptorBuilder.java |    7 +++++
 2 files changed, 28 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/0b870d53/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index 856893b..a2fb1e4 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -87,10 +87,31 @@ public class PluginDescriptor
 
     private Map<String, Lifecycle> lifecycleMappings;
 
+    /**
+     * @since 3.1.0
+     */
+    private boolean importSlf4jApi = false;
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
 
+    /**
+     * @since 3.1.0
+     */
+    public boolean isImportSlf4jApi()
+    {
+        return importSlf4jApi;
+    }
+
+    /**
+     * @since 3.1.0
+     */
+    public void setImportSlf4jApi( boolean importSlf4jApi )
+    {
+        this.importSlf4jApi = importSlf4jApi;
+    }
+
     @SuppressWarnings( { "unchecked", "rawtypes" } )
     public List<MojoDescriptor> getMojos()
     {

http://git-wip-us.apache.org/repos/asf/maven/blob/0b870d53/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
index 66b1691..6e9dac7 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
@@ -66,6 +66,13 @@ public class PluginDescriptorBuilder
             pluginDescriptor.setIsolatedRealm( Boolean.parseBoolean( isolatedRealm ) );
         }
 
+        String importSlf4jApi = c.getChild( "importSlf4jApi" ).getValue();
+
+        if ( importSlf4jApi != null )
+        {
+            pluginDescriptor.setImportSlf4jApi( Boolean.parseBoolean( importSlf4jApi ) );
+        }
+
         String inheritedByDefault = c.getChild( "inheritedByDefault" ).getValue();
 
         if ( inheritedByDefault != null )