Skip to content

Remove site plugin binding #11797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Voldemat wants to merge 1 commit into
base: maven-3.9.x
Choose a base branch
from
Draft

Remove site plugin binding #11797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions maven-core/src/main/resources/META-INF/plexus/components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ under the License.
</default-phases>
<!-- END SNIPPET: clean -->
</configuration>
</component>

<!-- 'site' lifecycle, with default bindings -->
<component>
</component>
<component>
<role>org.apache.maven.lifecycle.Lifecycle</role>
<implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
<role-hint>site</role-hint>
Expand All @@ -99,14 +97,6 @@ under the License.
<phase>post-site</phase>
<phase>site-deploy</phase>
</phases>
<default-phases>
<site>
org.apache.maven.plugins:maven-site-plugin:3.12.1:site
</site>
<site-deploy>
org.apache.maven.plugins:maven-site-plugin:3.12.1:deploy
</site-deploy>
</default-phases>
<!-- END SNIPPET: site -->
</configuration>
</component>
Expand Down
2 changes: 1 addition & 1 deletion maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 1 addition & 13 deletions maven-core/src/test/resources/META-INF/plexus/components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
<phase>post-site</phase>
<phase>site-deploy</phase>
</phases>
<default-phases>
<site>org.apache.maven.plugins:maven-site-plugin:site</site>
<site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
</default-phases>
</lifecycle>
</lifecycles>
</configuration>
Expand All @@ -72,13 +68,9 @@
<!-- START SNIPPET: pom-lifecycle -->

<phases>
<package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
<optional-mojos>
<optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
</optional-mojos>
<!-- END SNIPPET: pom-lifecycle -->
</lifecycle>
</lifecycles>
Expand All @@ -95,19 +87,15 @@
<!-- START SNIPPET: pom-lifecycle -->
<phases>
<package>
org.apache.maven.plugins:maven-site-plugin:attach-descriptor,
org.apache.maven.plugins:maven-clean-plugin:clean
</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
<optional-mojos>
<optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
</optional-mojos>
<!-- END SNIPPET: pom-lifecycle -->
</lifecycle>
</lifecycles>
</configuration>
</component>
</components>
</component-set>
</component-set>
4 changes: 2 additions & 2 deletions maven-embedder/src/test/projects/invalid-goal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>

<executions>
<execution>
Expand Down
10 changes: 1 addition & 9 deletions ...-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 0 additions & 11 deletions maven-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@ under the License.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<!-- Exclude the navigation file for Maven 1 sites
as it interferes with the site generation. -->
<moduleExcludes>
<xdoc>navigation.xml</xdoc>
</moduleExcludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down