This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSITE-965
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
omit 7270fd37 [MSITE-965] configure system requirements history
add 90cb4486 [MNG-6829] Replace StringUtils#isEmpty(String) and
#isNotEmpty(String) (#154)
add 1df6b080 Bump plexus-archiver from 4.6.2 to 4.7.1 (#153)
add 5118a42d Bump maven-shared-utils from 3.3.4 to 3.4.1 (#151)
add 5ada43f2 [MSITE-833] Remove dependency to maven-compat
add 0f8cb00f [MSITE-968] Upgrade plugins and components (in ITs)
add 3e421339 [MSITE-965] Add system requirements history
add 8aa54120 [MSITE-969] Upgrade to Doxia 2.0.0-M7/Doxia Sitetools
2.0.0-M11
add 0e4b54e8 [MSITE-970] Upgrade to Maven Reporting API 4.0.0-M7, Maven
Reporting Impl 4.0.0-M9, Maven Reporting Exec 2.0.0-M9
add d44e48b1 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M9
add ab9993d6 [maven-release-plugin] prepare for next development iteration
add d94b70b2 Consistency with Maven Reporting Impl
add 2c5da40c [MSITE-973] Have ${project.build.outputTimestamp} injected as
@Parameter
add 83f67b3d [MSITE-975] Use injected only properties in additional
template properties
add 893d8cb4 Improve exceptions
add 15a38f27 [MSITE-976] Bump org.codehaus.plexus:plexus-archiver from
4.7.1 to 4.8.0 (#157)
add 8d8bc361 Fix formatting
add 6de7a784 Update log4j and junit to avoid security reports in ITs (#160)
add 15f59a7c [MNG-6847] Use diamond operator (#161)
add 8d6a9b4b display latest 3.x from Maven Central
add d7992c94 [MSITE-979] Upgrade to Parent 40
add 2a0790b9 [MSITE-980] Upgrade plugins and components (in ITs)
add 4ddd4b13 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M10
add 9b505c95 [maven-release-plugin] prepare for next development iteration
add c7619b04 [MSITE-981] Upgrade to Doxia 2.0.0-M8
add 0b20e686 [MSITE-982] Upgrade to Doxia Sitetools 2.0.0-M13
add 6471c48c [MSITE-983] Upgrade to Maven Reporting API 4.0.0-M8
add 1a51eb36 [MSITE-984] Upgrade to Maven Reporting Impl/Exec 4.0.0-M11
add 2ab22945 [MSITE-985] Upgrade plugins and components (in ITs)
add b69cca54 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M11
add 0cc7ff1f [maven-release-plugin] prepare for next development iteration
add c0c35fb1 remove executable flag
add 79ed7988 Make field names consistent
add 6acdc6e6 Don't combine reports, otherwise the IT is pointless
add a157124f [MSITE-991] Upgrade to Parent 41
add 952ef111 [MSITE-993] Upgrade to Maven Reporting API 4.0.0-M9
add 90797338 [MSITE-994] Upgrade to Maven Reporting Exec 4.0.0-M12
add 87aeeb5f [MSITE-992] Upgrade to Doxia Sitetools 2.0.0-M16
add fea50671 [MSITE-995] Upgrade plugins and components (in ITs)
add 8ceb7b02 [MSITE-987] Consistently log when skipping report goal
execution
add 9d72298c Bump org.codehaus.mojo:mrm-maven-plugin from 1.5.0 to 1.6.0
add 7f7b333a [MSITE-996] Rewrite site.xml in ITs for new site model
add a8a705b9 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M12
add 7c18d867 [maven-release-plugin] prepare for next development iteration
add fdb02ab9 Use AbstractMavenReport#getReportOutputDirectory()
consistently
add 54882574 [MSITE-997] Non-localized site directory
DocumentRenderingContext passed
add a3fe0020 [MSITE-998] MavenReport#setReportOutputDirectory(File) is
called too late
add d867ec43 [MSITE-999] Upgrade plugins and components (in ITs)
add a6d3a101 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M13
add 32c6b6a5 [maven-release-plugin] prepare for next development iteration
add d78b8da7 Expand and update CI for Maven 3.2.5 and newer
add 1e269327 remove obsolete link to template file (#176)
add ec3dcb37 [MSITE-1004] Bump org.apache.maven:maven-archiver from 3.6.1
to 3.6.2 (#178)
add 04dfdb8f [MSITE-1005] Bump org.codehaus.plexus:plexus-archiver from
4.9.0 to 4.9.2 (#175)
add 036997f9 Simplify IT for MSITE-723
add 1bbad2d3 [MSITE-1003] Upgrade plugins and components (in ITs)
add 86c6d37f Fix broken commit 1bbad2d356a4ede8ebbe3a523533b660d66d9b58
add b3a063b1 [MSITE-1006] MSITE-723 causes duplicate document rendering
and log output
add 67624ffb [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M14
add c1c781b3 [maven-release-plugin] prepare for next development iteration
add 22b76704 Bump maven-gh-actions-shared to v4
add deee90af [MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3
add 64c42984 [MSITE-1008] Upgrade to Parent 42 and Maven 3.6.3 (2)
add 0f45c49c [MSITE-1009] Upgrade plugins and components (in ITs)
add e3166b31 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M15
add f473d69f [maven-release-plugin] prepare for next development iteration
add 1fc3b093 Fix build with Maven 3.9.8
add 3ff6f69a [MSITE-1013] Deprecate and rename
SiteStageDeployMojo#stagingRepositoryId to #stagingSiteId
add 170efdbb [MSITE-1012] Clean up notion that sites aren't deployed to
repositories
add e5430327 Bump org.codehaus.plexus:plexus-archiver from 4.9.2 to 4.10.0
add f167dac4 [MSITE-1010] Add documentation how site deployment
inheritance works
add 3c178587 [maven-release-plugin] prepare release
maven-site-plugin-4.0.0-M16
add 3d488c7c [maven-release-plugin] prepare for next development iteration
new a4dfaf61 [MSITE-965] configure system requirements history
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7270fd37)
\
N -- N -- N refs/heads/MSITE-965 (a4dfaf61)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven-verify.yml | 2 +-
Jenkinsfile | 2 +-
README.md | 1 +
pom.xml | 63 ++++----
src/it/mrm/settings.xml | 6 +-
src/it/projects/MSITE-159/src/site/site.xml | 7 +-
src/it/projects/MSITE-159/verify.bsh | 6 +-
src/it/projects/MSITE-265/src/site/site.xml | 8 +-
src/it/projects/MSITE-456/verify.bsh | 8 +-
src/it/projects/MSITE-458/src/site/site.xml | 6 +-
src/it/projects/MSITE-497/apps/app/pom.xml | 13 +-
.../app/src/main/java/org/apache/maven/App.java | 5 +-
src/it/projects/MSITE-497/src/site/site.xml | 7 +-
src/it/projects/MSITE-504/maven-plugin/pom.xml | 15 +-
src/it/projects/MSITE-506/pom.xml | 6 +-
.../src/test/java/mavenjavadoc/AppTest.java | 34 +----
src/it/projects/MSITE-507/pom.xml | 2 +-
src/it/projects/MSITE-566/src/site/site.xml | 7 +-
src/it/projects/MSITE-582/child/src/site/site.xml | 8 +-
src/it/projects/MSITE-582/src/site/site.xml | 8 +-
src/it/projects/MSITE-582/verify.groovy | 4 +-
src/it/projects/MSITE-604/parent/pom.xml | 6 +-
src/it/projects/MSITE-604/pom.xml | 10 +-
src/it/projects/MSITE-604/verify.groovy | 10 +-
src/it/projects/MSITE-609/src/site/site.xml | 8 +-
src/it/projects/MSITE-609/verify.bsh | 4 +-
src/it/projects/MSITE-627/pom.xml | 21 +++
.../java/org/apache/maven/plugins/it/MyReport.java | 28 +---
src/it/projects/MSITE-658/src/site/site.xml | 8 +-
src/it/projects/MSITE-658/src/site/site_de.xml | 8 +-
src/it/projects/MSITE-658/verify.bsh | 4 +-
src/it/projects/MSITE-665/pom.xml | 2 +-
src/it/projects/MSITE-723/index.apt | 20 ---
src/it/projects/MSITE-723/pom.xml | 2 +-
src/it/projects/MSITE-842/project/pom.xml | 15 ++
.../java/org/apache/maven/plugins/it/MyReport.java | 10 +-
.../projects/MSITE-842/project/src/site/site.xml | 7 +-
src/it/projects/MSITE-856/src/site/site.xml | 8 +-
src/it/projects/MSITE-856/src/site/site_de.xml | 8 +-
src/it/projects/doxia-formats/src/site/site.xml | 9 +-
src/it/projects/doxia-formats/src/site/site_de.xml | 9 +-
src/it/projects/effective-site/pom.xml | 4 +-
src/it/projects/effective-site/src/site/site.xml | 8 +-
src/it/projects/failure/pom.xml | 2 +-
src/it/projects/full-reporting/pom.xml | 10 +-
src/it/projects/full-reporting/verify.groovy | 4 +-
.../child/src/site/apt/pom.apt.vm | 4 +-
.../inheritance-interpolation/repo-parent/pom.xml | 12 +-
.../repo-parent/src/site/site.xml | 12 +-
.../inheritance-interpolation/verify.groovy | 4 +-
.../childAsRef/grandChildAsRef/src/site/site.xml | 6 +-
.../parentAsRef/childAsRef/src/site/site.xml | 6 +-
.../inheritedMenus/parentAsRef/src/site/site.xml | 7 +-
.../grandChildNotAsRef/src/site/site.xml | 6 +-
.../parentNotAsRef/childNotAsRef/src/site/site.xml | 7 +-
.../parentNotAsRef/src/site/site.xml | 6 +-
src/it/projects/inheritedMenus/verify.bsh | 58 +++----
src/it/projects/it-plugin-test/pom.xml | 2 +-
src/it/projects/new-configuration/pom.xml | 2 +-
src/it/projects/no-version/pom.xml | 2 +-
.../site-attach-descriptor/child/src/site/site.xml | 8 +-
.../site-attach-descriptor/src/site/site.xml | 8 +-
.../site-attach-descriptor/src/site/site_sv.xml | 8 +-
src/it/projects/site-deploy/src/site/site.xml | 8 +-
src/it/projects/site-deploy/verify.bsh | 4 +-
.../child_and_module/src/site/site.xml | 7 +-
.../inheriting_child/src/site/site.xml | 7 +-
.../site-inheritance/module/src/site/site.xml | 7 +-
.../site-inheritance/parent/src/site/site.xml | 7 +-
.../site-inheritance/sub_module/src/site/site.xml | 7 +-
src/it/projects/site-inheritance/verify.bsh | 120 +++++++--------
src/it/projects/site-jar/src/site/site.xml | 8 +-
.../site-sd-lang/mymodule/src/site/site.xml | 28 ++--
.../site-sd-lang/mymodule/src/site/site_fr.xml | 28 ++--
src/it/projects/site-sd-lang/pom.xml | 37 +++++
src/it/projects/site-sd-lang/src/site/site.xml | 6 +-
.../projects/site-sd-lang/src/site/site_de_AT.xml | 6 +-
.../projects/site-sd-lang/src/site/site_de_DE.xml | 6 +-
src/it/projects/site-sd-lang/src/site/site_fr.xml | 6 +-
.../projects/site-sd-stagingSiteURL/parent/pom.xml | 2 +-
src/it/projects/site-sd/src/site/site.xml | 8 +-
src/it/projects/surefire-report/pom.xml | 2 +-
src/it/projects/template-skin/src/site/site.xml | 7 +-
src/it/projects/validate/src/site/site.xml | 15 +-
.../plugins/site/deploy/AbstractDeployMojo.java | 169 ++++++---------------
.../plugins/site/deploy/AbstractStagingMojo.java | 3 +-
.../plugins/site/deploy/SiteStageDeployMojo.java | 23 ++-
.../descriptor/AbstractSiteDescriptorMojo.java | 2 +-
.../plugins/site/descriptor/EffectiveSiteMojo.java | 7 +-
.../site/render/AbstractSiteRenderingMojo.java | 101 +++++++-----
.../site/render/ReportDocumentRenderer.java | 24 +--
.../maven/plugins/site/render/SiteJarMojo.java | 12 +-
.../apache/maven/plugins/site/render/SiteMojo.java | 121 +++++++--------
.../apache/maven/plugins/site/run/DoxiaBean.java | 17 +--
.../apache/maven/plugins/site/run/DoxiaFilter.java | 22 ---
.../apache/maven/plugins/site/run/SiteRunMojo.java | 35 +++--
.../inheritance-site-distribution-management.apt | 76 +++++++++
src/site/apt/history.apt | 22 +--
src/site/apt/index.apt.vm | 2 -
src/site/site.xml | 8 +-
.../site/deploy/AbstractSiteDeployWebDavTest.java | 11 +-
.../plugins/site/deploy/AuthAsyncProxyServlet.java | 2 +-
.../maven/plugins/site/deploy/HttpRequest.java | 2 +-
.../site/deploy/SimpleDavServerHandler.java | 2 +-
.../plugins/site/deploy/SiteDeployMojoTest.java | 6 +-
105 files changed, 823 insertions(+), 771 deletions(-)
delete mode 100644 src/it/projects/MSITE-723/index.apt
mode change 100755 => 100644 src/it/projects/site-sd-lang/pom.xml
create mode 100644
src/site/apt/examples/inheritance-site-distribution-management.apt
