This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 0f84a02 Introduce property maven.site.path.suffix to allow override
site path
0f84a02 is described below
commit 0f84a02b6cad6a8c0f2a3f2c975ffb04cd37c1d1
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sun Mar 2 18:54:18 2025 +0100
Introduce property maven.site.path.suffix to allow override site path
It will be easier to have a possibility to only change the LATEST item
in site path instead of having dedicated for 4.x version.
Will suppress:
- 46eba0f51da7c69fc4aea195cb28f6bd6d83c7f6 #231
- 5c825483aaf44a20c0fbb5d10d4a9e5984ccb1d0 #233
---
docs/src/site/apt/index.apt.vm | 24 ++++++++++++------------
doxia-tools/pom.xml | 2 +-
maven-extensions/pom.xml | 3 +--
maven-plugins/pom.xml | 3 +--
maven-shared-components/pom.xml | 3 +--
maven-skins/pom.xml | 2 +-
pom.xml | 1 +
7 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/docs/src/site/apt/index.apt.vm b/docs/src/site/apt/index.apt.vm
index a0ac1dc..9e38999 100644
--- a/docs/src/site/apt/index.apt.vm
+++ b/docs/src/site/apt/index.apt.vm
@@ -71,19 +71,27 @@ mvn -Preporting site
This POM prepares site publication to
{{{/developers/website/index.html}Apache Maven's site svnpubsub}}.
- There are defined <<<maven.site.path>>> properties in parent POM for each
supported component type, as:
+ There are defined <<<maven.site.path.suffix>>> properties in parent POM,
as:
+
++-----+
+ <properties>
+ <maven.site.path.suffix>LATEST</maven.site.path.suffix>
+ </properties>
++-----+
+
+ Inherited project can change it in order to publish site in other path,
like as:
+-----+
<properties>
-
<maven.site.path>xxx-archives/\${project.artifactId}-LATEST</maven.site.path>
+ <maven.site.path.suffix>LATEST-4.x</maven.site.path.suffix>
</properties>
+-----+
- For maven-extensions, maven-plugins and maven-shared-components which
target Maven 4.x there are properties in parent POM:
+ There are defined <<<maven.site.path>>> properties in parent POM for each
supported component type, as:
+-----+
<properties>
-
<maven4x.site.path>xxx-archives/\${project.artifactId}-LATEST-4.x</maven4x.site.path>
+
<maven.site.path>xxx-archives/\${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
</properties>
+-----+
@@ -98,14 +106,6 @@ mvn -Preporting site
</distributionManagement>
+-----+
- NOTE: For Maven 4.x publishing we need to override property
<<<maven.site.path>>> by <<<maven4x.site.path>>>:
-
-+-----+
- <properties>
- <maven.site.path>${maven4x.site.path}</maven.site.path>
- </properties>
-+-----+
-
Once this is configured, the site can be published with:
+-----+
diff --git a/doxia-tools/pom.xml b/doxia-tools/pom.xml
index 60da4dd..60360ba 100644
--- a/doxia-tools/pom.xml
+++ b/doxia-tools/pom.xml
@@ -53,7 +53,7 @@ under the License.
<properties>
<projectVersion>${project.version}</projectVersion>
-
<maven.site.path>doxia-tools-archives/${project.artifactId}-LATEST</maven.site.path>
+
<maven.site.path>doxia-tools-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
</properties>
<build>
diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml
index a183afb..1702b91 100644
--- a/maven-extensions/pom.xml
+++ b/maven-extensions/pom.xml
@@ -42,8 +42,7 @@ under the License.
</distributionManagement>
<properties>
-
<maven.site.path>extensions-archives/${project.artifactId}-LATEST</maven.site.path>
-
<maven4x.site.path>extensions-archives/${project.artifactId}-LATEST-4.x</maven4x.site.path>
+
<maven.site.path>extensions-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
</properties>
<build>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index f6cf42d..c5434ad 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -47,8 +47,7 @@ under the License.
</distributionManagement>
<properties>
-
<maven.site.path>plugins-archives/${project.artifactId}-LATEST</maven.site.path>
-
<maven4x.site.path>plugins-archives/${project.artifactId}-LATEST-4.x</maven4x.site.path>
+
<maven.site.path>plugins-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
<enforce.dependency.declarations>false</enforce.dependency.declarations>
</properties>
diff --git a/maven-shared-components/pom.xml b/maven-shared-components/pom.xml
index 57aa9e4..077cda5 100644
--- a/maven-shared-components/pom.xml
+++ b/maven-shared-components/pom.xml
@@ -50,8 +50,7 @@ under the License.
</distributionManagement>
<properties>
-
<maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
-
<maven4x.site.path>shared-archives/${project.artifactId}-LATEST-4.x</maven4x.site.path>
+
<maven.site.path>shared-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
</properties>
<build>
diff --git a/maven-skins/pom.xml b/maven-skins/pom.xml
index 3fbd0b7..638079e 100644
--- a/maven-skins/pom.xml
+++ b/maven-skins/pom.xml
@@ -51,7 +51,7 @@ under the License.
</distributionManagement>
<properties>
-
<maven.site.path>skins-archives/${project.artifactId}-LATEST</maven.site.path>
+
<maven.site.path>skins-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
</properties>
<build>
diff --git a/pom.xml b/pom.xml
index 10a69cf..3e157a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -962,6 +962,7 @@ under the License.
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
<!-- to be overridden -->
<maven.site.path>../..</maven.site.path>
+ <maven.site.path.suffix>LATEST</maven.site.path.suffix>
<invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures>
<version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
<version.plexus-utils>4.0.2</version.plexus-utils>
