diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 0db5b4b29f..e6e15d2c31 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -127,7 +127,7 @@ public synchronized ClassRealm getMavenApiRealm()
         return mavenRealm;
     }
 
-    private void importMavenApi( Map<String, ClassLoader> imports )
+    private void importMavenApi( Map<String, ClassLoader> imports, boolean importSlf4japi )
     {
         ClassRealm coreRealm = getCoreRealm();
 
@@ -219,7 +219,10 @@ private void importMavenApi( Map<String, ClassLoader> imports )
         // imports.put( "com.google.inject.util.*", coreRealm );
 
         // SLF4J
-        imports.put( "org.slf4j.*", coreRealm );
+        if ( importSlf4japi )
+        {
+            imports.put( "org.slf4j.*", coreRealm );
+        }
     }
 
     /**
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index d73f66d5f4..8c3d9da894 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -108,7 +108,10 @@ public class MojoDescriptor
     /** Specify the required dependencies in a specified scope */
     private String dependencyResolutionRequired = null;
 
-    /** The scope of (transitive) dependencies that should be collected but not resolved. */
+    /**
+     * The scope of (transitive) dependencies that should be collected but not resolved.
+     * @since 3.0-alpha-3
+     */
     private String dependencyCollectionRequired;
 
     /**  By default, the Mojo needs a Maven project to be executed */
@@ -132,7 +135,10 @@ public class MojoDescriptor
     /**  By default, the Mojo don't need reports to run */
     private boolean requiresReports = false;
 
-    /** By default, mojos are not threadsafe */
+    /**
+     * By default, mojos are not threadsafe
+     * @since 3.0-beta-2
+     */
     private boolean threadSafe = false;
 
     /**
@@ -271,6 +277,9 @@ public String isDependencyResolutionRequired()
         return dependencyResolutionRequired;
     }
 
+    /**
+     * @since 3.0-alpha-3
+     */
     public void setDependencyCollectionRequired( String requiresDependencyCollection )
     {
         this.dependencyCollectionRequired = requiresDependencyCollection;
@@ -284,6 +293,7 @@ public void setDependencyCollectionRequired( String requiresDependencyCollection
      * full dependency resolution might fail due to projects which haven't been built yet.
      * 
      * @return The scope of (transitive) dependencies that should be collected or {@code null} if none.
+     * @since 3.0-alpha-3
      */
     public String getDependencyCollectionRequired()
     {
@@ -664,6 +674,7 @@ public String getExecuteGoal()
 
     /**
      * @return True if the <code>Mojo</code> is thread-safe and can be run safely in parallel
+     * @since 3.0-beta-2
      */
     public boolean isThreadSafe()
     {
@@ -672,6 +683,7 @@ public boolean isThreadSafe()
 
     /**
      * @param threadSafe indicates that the mojo is thread-safe and can be run safely in parallel
+     * @since 3.0-beta-2
      */
     public void setThreadSafe( boolean threadSafe )
     {