You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2024/11/14 14:27:21 UTC
(maven-site) branch master updated: Upgrade to Maven Site Plugin 3.21.0 and Maven Fluido Skin 2.0.0 (#525)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 9a8b4c22 Upgrade to Maven Site Plugin 3.21.0 and Maven Fluido Skin 2.0.0 (#525)
9a8b4c22 is described below
commit 9a8b4c22816bc9aaf63f456485a6fbb71625bdf3
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Nov 14 15:27:16 2024 +0100
Upgrade to Maven Site Plugin 3.21.0 and Maven Fluido Skin 2.0.0 (#525)
Co-authored-by: Konrad Windszus <kw...@apache.org>
---
content/site.xml | 6 ------
content/xdoc/errors/404.xml.vm | 4 ++--
pom.xml | 6 +++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/content/site.xml b/content/site.xml
index 18cffc8f..ae5bbb91 100644
--- a/content/site.xml
+++ b/content/site.xml
@@ -25,12 +25,6 @@ under the License.
name="Maven">
<version position="none" />
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluidoVersion}</version><!-- modify pom.xml property if necessary -->
- </skin>
-
<edit>${project.scm.url}</edit>
<body>
diff --git a/content/xdoc/errors/404.xml.vm b/content/xdoc/errors/404.xml.vm
index dc9a4e21..52a1c51d 100644
--- a/content/xdoc/errors/404.xml.vm
+++ b/content/xdoc/errors/404.xml.vm
@@ -31,10 +31,10 @@ under the License.
<title>Page Not Found</title>
<base href="https://maven.apache.org/errors" />
<!-- need to import styles by hand since the generated html has them relative and before the base tag -->
- <link rel="stylesheet" href="https://maven.apache.org/css/apache-maven-fluido-${fluidoVersion}.min.css" />
+ <link rel="stylesheet" href="https://maven.apache.org/css/apache-maven-fluido-${context.get("version.maven-fluido-skin")}.min.css" />
<link rel="stylesheet" href="https://maven.apache.org/css/site.css" />
<link rel="stylesheet" href="https://maven.apache.org/css/print.css" media="print" />
- <script type="text/javascript" src="https://maven.apache.org/js/apache-maven-fluido-${fluidoVersion}.min.js" />
+ <script type="text/javascript" src="https://maven.apache.org/js/apache-maven-fluido-${context.get("version.maven-fluido-skin")}.min.js" />
</head>
<body>
diff --git a/pom.xml b/pom.xml
index 10b87ffb..18c0a0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,10 +73,10 @@
<versions3x>3.9.9,3.9.8,3.9.7,3.9.6,3.9.5,3.9.4,3.9.3,3.9.2,3.9.1,3.9.0,3.8.8,3.8.7,3.8.6,3.8.5,3.8.4,3.8.3,3.8.2,3.8.1,3.6.3,3.6.2,3.6.1,3.6.0,3.5.4,3.5.3,3.5.2,3.5.0,3.5.0-beta-1,3.5.0-alpha-1,3.3.9,3.3.3,3.3.1,3.2.5,3.2.3,3.2.2,3.2.1,3.1.1,3.1.0,3.1.0-alpha-1,3.0.5,3.0.4,3.0.3,3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3</versions3x>
<version4x>4.0.0-beta-5,4.0.0-beta-4,4.0.0-beta-3,4.0.0-alpha-13,4.0.0-alpha-12,4.0.0-alpha-10,4.0.0-alpha-9,4.0.0-alpha-8,4.0.0-alpha-7,4.0.0-alpha-5,4.0.0-alpha-4,4.0.0-alpha-3,4.0.0-alpha-2</version4x>
<site.output>${project.build.directory}/site</site.output>
- <!-- used by src/xdoc/errors/404.xml.vm -->
- <fluidoVersion>2.0.0-M6</fluidoVersion>
<javaVersion>8</javaVersion>
<siteDirectory>${project.basedir}/content</siteDirectory>
+ <!-- used by src/xdoc/errors/404.xml.vm as well -->
+ <version.maven-fluido-skin>2.0.0</version.maven-fluido-skin>
</properties>
<dependencies>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>4.0.0-M8</version>
+ <version>3.21.0</version>
<configuration>
<siteDirectory>${siteDirectory}</siteDirectory>
<!-- don't deploy site with maven-site-plugin -->