Remove more modello calls

Maven3 stuff should not be published
apache · Dec 28, 2024 · 6738e47 · 6738e47
1 parent b25032d
commit 6738e47
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 71 deletions.
diff --git a/api/maven-api-cli/pom.xml b/api/maven-api-cli/pom.xml
@@ -65,8 +65,8 @@
             <id>modello</id>
             <goals>
               <goal>velocity</goal>
-              <goal>xsd</goal>
               <goal>xdoc</goal>
+              <goal>xsd</goal>
             </goals>
             <phase>generate-sources</phase>
           </execution>

diff --git a/api/pom.xml b/api/pom.xml
@@ -49,27 +49,6 @@
     <project.directory>api</project.directory>
   </properties>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.modello</groupId>
-          <artifactId>modello-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>modello-site-docs</id>
-              <goals>
-                <goal>xdoc</goal>
-                <goal>xsd</goal>
-              </goals>
-              <phase>none</phase>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <profiles>
     <profile>
       <id>reporting</id>

diff --git a/compat/maven-model/pom.xml b/compat/maven-model/pom.xml
@@ -95,20 +95,6 @@ under the License.
           </params>
         </configuration>
         <executions>
-          <execution>
-            <id>modello-site-docs</id>
-            <goals>
-              <goal>xdoc</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-          <execution>
-            <id>modello-schema</id>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
           <execution>
             <id>model-v3</id>
             <goals>

diff --git a/impl/maven-core/pom.xml b/impl/maven-core/pom.xml
@@ -215,31 +215,6 @@ under the License.
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.1.0</version>
-          <!-- This is a required attribute and is intentionally left empty -->
-          <models />
-        </configuration>
-        <executions>
-          <execution>
-            <!-- This step is required to generate xdoc, and does not generate java code -->
-            <id>modello-site-doc</id>
-            <goals>
-              <goal>xdoc</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <version>1.0.0</version>
-              <models>
-                <model>src/main/mdo/extension.mdo</model>
-              </models>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -709,16 +709,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.</licenseText>
           </configuration>
-          <executions>
-            <execution>
-              <id>modello-site-docs</id>
-              <goals>
-                <goal>xdoc</goal>
-                <goal>xsd</goal>
-              </goals>
-              <phase>pre-site</phase>
-            </execution>
-          </executions>
         </plugin>
         <!-- enforce backwards compatibility -->
         <plugin>