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-fulcrum-testcontainer.git
The following commit(s) were added to refs/heads/master by this push:
new d4ff336 Prepare release: Parent and yaafi to non-SNAPSHOT versions,
junit jupter to v5.11.2, Fix site build by updating site.xml (inherit from
parent v14) and moving xdocs to folder site/xdoc
d4ff336 is described below
commit d4ff33684aa7fbb1c343df158d310711648230aa
Author: Georg Kallidis <georg.kalli...@fu-berlin.de>
AuthorDate: Tue Oct 8 16:58:59 2024 +0200
Prepare release: Parent and yaafi to non-SNAPSHOT versions, junit jupter to
v5.11.2, Fix site build by updating site.xml (inherit from parent v14) and
moving xdocs to folder site/xdoc
---
pom.xml | 6 ++--
src/site/site.xml | 58 +++++++++++++++++++++++++++++++++-----
{xdocs => src/site/xdoc}/index.xml | 0
3 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 43cf94d..30d9b72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>13-SNAPSHOT</version>
+ <version>13</version>
<relativePath />
</parent>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<!--optional>true</optional-->
</dependency>
<!-- required for testcontainer and not test scope, we have to define
version here -->
@@ -161,7 +161,7 @@
<properties>
<turbine.site.path>turbine-fulcrum-testcontainer</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
- <junit.jupiter.version>5.11.0-M2</junit.jupiter.version>
+ <junit.jupiter.version>5.11.2</junit.jupiter.version>
</properties>
</project>
diff --git a/src/site/site.xml b/src/site/site.xml
index a41a50f..1e25bd1 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,14 +17,58 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Test Container">
- <version position="left" />
- <publishDate format="dd MMM yyyy"/>
+<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 - Fulcrum Test Container" combine.self="merge">
+
+ <bannerLeft href="https://turbine.apache.org/";>
+ <image src="https://turbine.apache.org/images/turbine-project.png";
alt="Apache Turbine" />
+ </bannerLeft>
+
+ <bannerRight/>
+
+ <publishDate format="dd MMMM yyyy" position="left" />
+ <version position="left" />
+
+ <!-- IMPORTANT Notice: elements like bannerLeft, publishDate, version,
links, skin and custom
+ are redundant after updating to released parent pom v14
+ -->
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>2.0.0-M11</version>
+ </skin>
+
<body>
+ <head/>
+
+ <links>
+ <item name="Apache" href="https://www.apache.org/";> </item>
+ <item name="Turbine" href="https://turbine.apache.org/";> </item>
+ <item name="Fulcrum" href="/fulcrum/"> </item>
+ </links>
+
<menu name="Overview">
<item name="Main" href="/index.html"/>
- </menu>
- <menu ref="reports"></menu>
- </body>
+ </menu>
+ <menu ref="reports"></menu>
+
+ <footer/>
+ </body>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ <googleSearch>
+ <sitesearch>${project.url}</sitesearch>
+ </googleSearch>
+ <gitHub>
+ <projectId>apache/${turbine.site.path}</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>gray</ribbonColor>
+ </gitHub>
+ </fluidoSkin>
+ </custom>
+
+</site>
-</project>
diff --git a/xdocs/index.xml b/src/site/xdoc/index.xml
similarity index 100%
rename from xdocs/index.xml
rename to src/site/xdoc/index.xml
![https://turbine.apache.org/images/turbine-project.png"](https://turbine.apache.org/images/turbine-project.png"){kind=link}