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-intake.git
The following commit(s) were added to refs/heads/master by this push:
new 6cb13035 Moved to site 2.0.0, update from snapshot versions for parent
and yaafi, testcontainer
6cb13035 is described below
commit 6cb1303553347c8e78367375f5ea66117d22bbe3
Author: Georg Kallidis <[email protected]>
AuthorDate: Tue Oct 15 16:06:23 2024 +0200
Moved to site 2.0.0, update from snapshot versions for parent and yaafi,
testcontainer
---
pom.xml | 10 +++----
src/site/site.xml | 54 ++++++++++++++++++++++++++++++++++----
{xdocs => src/site/xdoc}/howto.xml | 0
{xdocs => src/site/xdoc}/index.xml | 0
4 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0cceb958..ebd87ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>13</version>
<relativePath />
</parent>
@@ -90,11 +90,11 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.3</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
@@ -128,13 +128,13 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/site/site.xml b/src/site/site.xml
index 65754692..f3e1055c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,14 +17,58 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Intake">
+<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 Intake" 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 which allows
skin inheritance again.
+ -->
+ <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"/>
<item name="Howto" href="/howto.html"/>
- </menu>
- </body>
+ </menu>
+ <menu ref="reports"></menu>
-</project>
+ <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>
\ No newline at end of file
diff --git a/xdocs/howto.xml b/src/site/xdoc/howto.xml
similarity index 100%
rename from xdocs/howto.xml
rename to src/site/xdoc/howto.xml
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