slachiewicz opened a new pull request, #1352:
URL: https://github.com/apache/maven-site-plugin/pull/1352

   Carries #216 by @kwin onto the 3.x line: his commit as authored, then our 
commits on top. Adds the `site:attach-resources` goal (default phase `package`, 
`pom` packaging only), which archives `src/site` without the site descriptors 
and attaches it as a `site-resources` artifact, so it is installed and deployed 
with the project. `site:site`, `site:jar`, `site:run` and `site:auto-refresh` 
unpack the parent's archive, or copy the parent's `src/site` when the parent is 
in the reactor, into `inheritedSiteDirectory` (default `target/inherited-site`) 
and render it along with the project's own documents.
   
   On top of the carried commit:
   
   - Wiring for the 3.x mojos, including `site:run` and `site:auto-refresh`, 
and constructor injection in the new mojo (the review remark on #216).
   - Inherited documents never override or clash with the project's own: the 
inherited directory is added last with `skipDuplicates`, which Sitetools 2.1.0 
already provides, so the TODO for DOXIASITETOOLS-359 is resolved.
   - The default locale read the inherited documents from 
`inherited-site/<locale>`; it now reads `inherited-site`.
   - `inheritedSiteDirectory` is cleared before each run, so documents removed 
from a parent do not linger.
   - IT version placeholders fixed, more assertions in `inheritedResources`, 
unit tests for the archive content.
   
   Not included: reading the parent's `attach-resources` configuration from 
`pluginManagement` alone when the parent is in the reactor; the effective POM 
covers the case where the execution is declared in `pluginManagement` and the 
plugin is used. User documentation for the site guide will follow on 
apache/maven-site.
   
   Please merge with "Rebase and merge" to keep Konrad as the author of his 
commit.
   
   Fixes #1066
   
   Verified: `mvn -Prun-its verify 
-Dinvoker.test=inheritedResources,site-attach-resources,site-attach-descriptor,inheritance-interpolation,auto-refresh`
 → 5 passed on Maven 3.9.16; `inheritedResources`, `site-attach-resources` and 
`auto-refresh` also pass on Maven 4.0.0-rc-7.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to