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-upload.git
The following commit(s) were added to refs/heads/master by this push:
new b378517 Upgrade to site.xml, snapshot dependencies
b378517 is described below
commit b3785174308ac8c29fa95f58cc867ec039abb5eb
Author: gk <[email protected]>
AuthorDate: Fri Dec 13 11:00:56 2024 +0100
Upgrade to site.xml, snapshot dependencies
---
pom.xml | 6 ++---
src/site/site.xml | 48 ++++++++++++++++++++++----------------
{xdocs => src/site/xdoc}/index.xml | 0
3 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index d9e04ae..31b814f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>13-SNAPSHOT</version>
+ <version>13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -103,13 +103,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 fd5061b..5767193 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,28 +17,36 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.4.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd"
- name="Fulcrum Upload">
+<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 Upload" 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>1.9</version>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>2.0.0-M11</version>
</skin>
-
-
- <body>
- <menu name="Overview">
+
+<body>
+ <menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
- </body>
-
- <custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
-</project>
+ <menu ref="reports"></menu>
+</body>
+
+
+</site>
+
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