This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-parent.git
commit ee949269a9fde30d67cb3620da1c0a4185c1c084 Author: Georg Kallidis <[email protected]> AuthorDate: Tue Oct 8 16:46:14 2024 +0200 add explict attach-descriptor to site plugin to allow skin,custom and default banner, publishdate format and version position to be inherited by modules. --- pom.xml | 8 ++++++++ src/site/site.xml | 27 +++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index fa288b6..fb0faeb 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,14 @@ <!-- don't deploy site with maven-site-plugin --> <skipDeploy>true</skipDeploy> </configuration> + <executions> + <execution> + <id>inherit-parent-site</id> + <goals> + <goal>attach-descriptor</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/src/site/site.xml b/src/site/site.xml index a0b5f16..91ae9ce 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -19,20 +19,27 @@ --> <site xmlns="http://maven.apache.org/SITE/2.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; - name="Apache Turbine"> - - <bannerLeft href="https://turbine.apache.org/"; target="_blank"> + name="Apache Turbine" combine.self="merge"> + + <bannerLeft href="https://turbine.apache.org/";> <image src="https://turbine.apache.org/images/turbine-project.png"; alt="Apache Turbine" /> </bannerLeft> - <publishDate format="dd MMMM yyyy" position="left" /> - <version position="left" /> - <skin> + + <bannerRight href="https://turbine.apache.org/";> + <image src="http://turbine.apache.org/images/logo.gif"; /> + </bannerRight> + + <publishDate format="dd MMMM yyyy" position="left" /> + <version position="left" /> + + <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>2.0.0-M10</version> - </skin> - <body> - <head></head> + <version>2.0.0-M11</version> + </skin> + <body> + <head/> + <links> <item name="Apache" href="https://www.apache.org"/> <item name="Turbine" href="https://turbine.apache.org/"; />
![https://turbine.apache.org/images/turbine-project.png"](https://turbine.apache.org/images/turbine-project.png"){kind=link}
![http://turbine.apache.org/images/logo.gif"](http://turbine.apache.org/images/logo.gif"){kind=link}