diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 198a90c10271..dffcf9d4dec4 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -61,20 +61,13 @@ under the License.
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>2.0.0</version>
-        <configuration>
-          <models>
-            <model>src/main/mdo/lifecycle.mdo</model>
-          </models>
-          <version>1.0.0</version>
-        </configuration>
         <executions>
           <execution>
             <id>modello</id>
-            <phase>none</phase>
+            <phase>none</phase><!-- java beans and readers/writers are generated with modello-plugin-velocity -->
           </execution>
           <execution>
-            <id>modello-site-docs</id>
+            <id>modello-site-docs-plugin-1.1</id>
             <phase>pre-site</phase>
             <configuration>
               <models>
@@ -83,6 +76,18 @@ under the License.
               <version>1.1.0</version>
             </configuration>
           </execution>
+          <execution>
+            <id>modello-site-docs-lifecycle</id>
+            <phase>pre-site</phase>
+            <configuration>
+              <configuration>
+                <models>
+                  <model>src/main/mdo/lifecycle.mdo</model>
+                </models>
+                <version>1.0.0</version>
+              </configuration>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -90,7 +95,7 @@ under the License.
         <artifactId>modello-plugin-velocity</artifactId>
         <executions>
           <execution>
-            <id>velocity</id>
+            <id>velocity-lifecycle</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>velocity</goal>
@@ -112,6 +117,28 @@ under the License.
               </params>
             </configuration>
           </execution>
+          <execution>
+            <id>velocity-plugin</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>velocity</goal>
+            </goals>
+            <configuration>
+              <version>1.1.0</version>
+              <models>
+                <model>src/main/mdo/plugin.mdo</model>
+              </models>
+              <templates>
+                <template>src/main/mdo/model.vm</template>
+                <template>src/main/mdo/reader.vm</template>
+              </templates>
+              <params>
+                <param>packageModelV3=org.apache.maven.plugin.immutabledescriptor</param>
+                <param>packageModelV4=org.apache.maven.plugin.immutabledescriptor</param>
+                <param>packageToolV4=org.apache.maven.plugin.immutabledescriptor.io.xpp3</param>
+              </params>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/ImmutableCollections.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/ImmutableCollections.java
similarity index 99%
rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/ImmutableCollections.java
rename to maven-plugin-api/src/main/java/org/apache/maven/plugin/ImmutableCollections.java
index 875b0b22fa27..4ed841bcd725 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/ImmutableCollections.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/ImmutableCollections.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.lifecycle;
+package org.apache.maven.plugin;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -38,7 +38,7 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
-class ImmutableCollections
+public class ImmutableCollections
 {
 
     private static final List<?> EMPTY_LIST = new AbstractImmutableList<Object>()
@@ -88,7 +88,7 @@ public int size()
         }
     };
 
-    static <E> List<E> copy( Collection<E> collection )
+    public static <E> List<E> copy( Collection<E> collection )
     {
         if ( collection == null )
         {
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 80829332a972..24e1ff3d15f4 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
@@ -39,6 +39,7 @@
  * TODO is there a need for the delegation of MavenMojoDescriptor to this?
  * Why not just extend ComponentDescriptor here?
  */
+@Deprecated
 public class MojoDescriptor
     extends ComponentDescriptor<Mojo>
     implements Cloneable
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 8c799419c3c3..c60309a90100 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
@@ -46,6 +46,7 @@
 /**
  * @author Jason van Zyl
  */
+@Deprecated
 public class PluginDescriptor
     extends ComponentSetDescriptor
     implements Cloneable
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 98021fa0c922..460c329b4681 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
@@ -36,6 +36,7 @@
 /**
  * @author Jason van Zyl
  */
+@Deprecated
 public class PluginDescriptorBuilder
 {
     public PluginDescriptor build( Reader reader )
diff --git a/maven-plugin-api/src/main/mdo/model.vm b/maven-plugin-api/src/main/mdo/model.vm
index e995fa6e9478..b96d9cf71099 100644
--- a/maven-plugin-api/src/main/mdo/model.vm
+++ b/maven-plugin-api/src/main/mdo/model.vm
@@ -44,6 +44,7 @@
     #set ( $dummy = $imports.add( "org.apache.maven.api.annotations.Nonnull" ) )
     #set ( $dummy = $imports.add( "org.apache.maven.api.annotations.NotThreadSafe" ) )
     #set ( $dummy = $imports.add( "org.apache.maven.api.annotations.ThreadSafe" ) )
+    #set ( $dummy = $imports.add( "org.apache.maven.plugin.ImmutableCollections" ) )
     #foreach ( $field in $allFields )
       #if ( $field.type == "java.util.List" )
           #set ( $dummy = $imports.add( "java.util.ArrayList" ) )
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo
index ddb2fd62a301..392f1a35d5ad 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -34,7 +34,7 @@ under the License.
   <defaults>
     <default>
       <key>package</key>
-      <value>plugin descriptor XML documentation (no java generation)</value><!-- intentionally non-buildable value -->
+      <value>org.apache.maven.plugin.descriptor</value><!-- intentionally non-buildable value -->
     </default>
   </defaults>
   <classes>
@@ -370,7 +370,7 @@ under the License.
     <class xdoc.anchorName="parameter">
       <name>Parameter</name>
       <version>1.0.0+</version>
-      <description>A phase mapping definition.</description>
+      <description>A parameter definition.</description>
       <!-- see o.a.m.plugin.descriptor.Parameter -->
       <fields>
         <field>
@@ -455,6 +455,37 @@ under the License.
           ]]></description>
         </field>
       </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.1.0+</version> <!--previously the model has been handcrafted -->
+          <comment>Add setters/getters for expression and default value coming from the mojo's configuration</comment>
+          <code><![CDATA[
+    /* getters exposing information originally comfing from the mojo's configuration */
+    private String expression;
+    private String defaultValue;
+
+    public String getExpression()
+    {
+        return expression;
+    }
+
+    public void setExpression( String expression )
+    {
+        this.expression = expression;
+    }
+
+    public void setDefaultValue( String defaultValue )
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDefaultValue()
+    {
+        return defaultValue;
+    }]]>
+          </code>
+        </codeSegment>
+      </codeSegments>
     </class>
 
     <class>
@@ -512,6 +543,26 @@ under the License.
           <description>The field name which has this requirement.</description>
         </field>
       </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.1.0+</version> <!--previously the model has been handcrafted -->
+          <comment>Conversion to Plexus Component Requirement</comment>
+          <code><![CDATA[
+    /**
+     * Converts the given requirement to a Plexus Component Requirement
+     */
+    org.codehaus.plexus.component.repository.ComponentRequirement toComponentRequirement()
+    {
+        org.codehaus.plexus.component.repository.ComponentRequirement componentRequirement
+            = new org.codehaus.plexus.component.repository.ComponentRequirement();
+        componentRequirement.setRole( role );
+        componentRequirement.setRoleHint( roleHint );
+        componentRequirement.setFieldName( fieldName );
+        return componentRequirement;
+    }]]>
+          </code>
+        </codeSegment>
+      </codeSegments>
     </class>
 
     <class xdoc.anchorName="dependency">
@@ -547,6 +598,27 @@ under the License.
           <description>The type of dependency.</description>
         </field>
       </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.1.0+</version> <!--previously the model has been handcrafted -->
+          <comment>Conversion to Plexus Component Dependency</comment>
+          <code><![CDATA[
+    /**
+     * Converts the given dependency to a Plexus Component Dependency
+     */
+    org.codehaus.plexus.component.repository.ComponentDependency toComponentDependency()
+    {
+        org.codehaus.plexus.component.repository.ComponentDependency componentDependency
+            = new org.codehaus.plexus.component.repository.ComponentDependency();
+        componentDependency.setGroupId( groupId );
+        componentDependency.setArtifactId( artifactId );
+        componentDependency.setVersion( version );
+        componentDependency.setType( type );
+        return componentDependency;
+    }]]>
+          </code>
+        </codeSegment>
+      </codeSegments>
     </class>
   </classes>
 </model>
diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java
deleted file mode 100644
index 0aec7d372222..000000000000
--- a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.plugin.descriptor;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class MojoDescriptorTest
-{
-    @Test
-    public void getParameterMap() throws DuplicateParameterException
-    {
-        MojoDescriptor mojoDescriptor = new MojoDescriptor();
-        Parameter param1 = new Parameter();
-        param1.setName( "param1" );
-        param1.setDefaultValue( "value1" );
-        mojoDescriptor.addParameter( param1 );
-
-        assertEquals( 1, mojoDescriptor.getParameters().size() );
-
-        assertEquals( mojoDescriptor.getParameters().size(), mojoDescriptor.getParameterMap().size() );
-
-        Parameter param2 = new Parameter();
-        param2.setName( "param2" );
-        param2.setDefaultValue( "value2" );
-        mojoDescriptor.addParameter( param2 );
-
-        assertEquals( 2, mojoDescriptor.getParameters().size() );
-        assertEquals( mojoDescriptor.getParameters().size(), mojoDescriptor.getParameterMap().size() );
-    }
-
-}
\ No newline at end of file