diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index 6560e023d8a9..f98d39c73255 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -83,10 +83,8 @@ under the License. - - - - + + org.apache.maven.lifecycle.Lifecycle org.apache.maven.lifecycle.Lifecycle site @@ -99,14 +97,6 @@ under the License. post-site site-deploy - - - org.apache.maven.plugins:maven-site-plugin:3.12.1:site - - - org.apache.maven.plugins:maven-site-plugin:3.12.1:deploy - - diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 342cfa4fb92a..25f2548b4af4 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1599,7 +1599,7 @@ public void testPluginInheritanceSimple() throws Exception { @Test public void testPluginManagementDuplicate() throws Exception { PomTestWrapper pom = this.buildPom("plugin-management-duplicate/sub"); - assertEquals(12, ((List) pom.getValue("build/pluginManagement/plugins")).size()); + assertEquals(11, ((List) pom.getValue("build/pluginManagement/plugins")).size()); } @Test diff --git a/maven-core/src/test/resources/META-INF/plexus/components.xml b/maven-core/src/test/resources/META-INF/plexus/components.xml index 714cb36b4d98..a0a8ef19d0dc 100644 --- a/maven-core/src/test/resources/META-INF/plexus/components.xml +++ b/maven-core/src/test/resources/META-INF/plexus/components.xml @@ -53,10 +53,6 @@ post-site site-deploy - - org.apache.maven.plugins:maven-site-plugin:site - org.apache.maven.plugins:maven-site-plugin:deploy - @@ -72,13 +68,9 @@ - org.apache.maven.plugins:maven-site-plugin:attach-descriptor org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy - - org.apache.maven.plugins:maven-site-plugin:attach-descriptor - @@ -95,19 +87,15 @@ - org.apache.maven.plugins:maven-site-plugin:attach-descriptor, org.apache.maven.plugins:maven-clean-plugin:clean org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy - - org.apache.maven.plugins:maven-site-plugin:attach-descriptor - - \ No newline at end of file + diff --git a/maven-embedder/src/test/projects/invalid-goal/pom.xml b/maven-embedder/src/test/projects/invalid-goal/pom.xml index d72b515ad3a1..b2d0fbf1af55 100644 --- a/maven-embedder/src/test/projects/invalid-goal/pom.xml +++ b/maven-embedder/src/test/projects/invalid-goal/pom.xml @@ -32,8 +32,8 @@ under the License. org.apache.maven.plugins - maven-site-plugin - 2.0-beta-7 + maven-clean-plugin + 3.2.0 diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java index f90590b8d98e..ff122ee965bc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java @@ -77,15 +77,7 @@ public void convertReporting(Model model, ModelBuildingRequest request, ModelPro Plugin sitePlugin = findSitePlugin(build); if (sitePlugin == null) { - sitePlugin = new Plugin(); - sitePlugin.setArtifactId("maven-site-plugin"); - sitePlugin.setLocation("artifactId", location); - PluginManagement pluginManagement = build.getPluginManagement(); - if (pluginManagement == null) { - pluginManagement = new PluginManagement(); - build.setPluginManagement(pluginManagement); - } - pluginManagement.addPlugin(sitePlugin); + return; } Xpp3Dom configuration = (Xpp3Dom) sitePlugin.getConfiguration(); diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 7892a3113b5b..e809e0a8acd0 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -71,17 +71,6 @@ under the License. - - org.apache.maven.plugins - maven-site-plugin - - - - navigation.xml - - -