You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/17 19:22:50 UTC
(maven-doxia-converter) branch master updated: Inherit maven-parent directly instead of the doxia-tools parent
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
The following commit(s) were added to refs/heads/master by this push:
new ae909d9 Inherit maven-parent directly instead of the doxia-tools parent
ae909d9 is described below
commit ae909d9a3f397c1b49d2e29cbe3167a8354bae5d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Aug 17 21:03:01 2026 +0200
Inherit maven-parent directly instead of the doxia-tools parent
doxia-tools 45 is the newest release and cannot practically be superseded: the
Git repository is archived, its SVN trunk holds the pre-migration aggregator
rather than this pom, and the released pom declares no scm at all, so there is
nowhere to cut 46 from. That left the converter on maven-parent 45 while doxia,
sitetools and doxia-site are all on 49.
Since the converter already overrode scm, issueManagement, ciManagement and
distributionManagement, only four things had to move across: the groupId, the
maven.site.path property, the site plugin's skipDeploy, and the scm-publish
execution. The project url and inceptionYear are now stated rather than
inherited, keeping the values doxia-tools gave them.
The published site path is unchanged, so nothing moves on the website.
Verified: effective poms before and after differ only in the parent
coordinates, the developer roster, and plugin versions that come with parent
49; maven.site.path, distributionManagement, the svn publish url, project url
and inceptionYear are byte-identical. 23 tests pass.
---
pom.xml | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f582e3e..424d05e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,17 +21,20 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-tools</artifactId>
- <version>45</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>49</version>
<relativePath />
</parent>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-converter</artifactId>
<version>1.4-SNAPSHOT</version>
<name>Doxia Tools :: Converter</name>
<description>Doxia Converter Tool to convert a supported format to another.</description>
+ <url>https://maven.apache.org/doxia/doxia-tools/doxia-converter/</url>
+ <inceptionYear>2005</inceptionYear>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-doxia-converter.git</connection>
@@ -55,6 +58,8 @@ under the License.
</distributionManagement>
<properties>
+ <!-- kept identical to what doxia-tools set, so the published site path does not move -->
+ <maven.site.path>doxia-tools-archives/${project.artifactId}-${maven.site.path.suffix}</maven.site.path>
<doxiaVersion>2.1.0</doxiaVersion>
<javaVersion>8</javaVersion>
<slf4jVersion>2.0.18</slf4jVersion>
@@ -176,6 +181,14 @@ under the License.
<build>
<pluginManagement>
<plugins>
+ <!-- site is published by maven-scm-publish-plugin below, not by the site plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -190,6 +203,23 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
+ <!-- deploy the site with maven-scm-publish-plugin; no need for site:stage, use target/site -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content>
+ </configuration>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <phase>site-deploy</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>