You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/10/06 19:21:09 UTC
[maven-antrun-plugin] branch stabilize created (now 03e5e2e)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git.
at 03e5e2e Fix site generation
This branch includes the following new commits:
new 03e5e2e Fix site generation
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-antrun-plugin] 01/01: Fix site generation
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit 03e5e2ed91d5b689759ccd88744b3c80db3e9d97
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Oct 6 21:20:42 2021 +0200
Fix site generation
---
pom.xml | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 994721d..b0b5ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
+ <configuration> <!-- remove after MPOM-269 -->
+ <tagletArtifacts combine.self="override"/>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -169,7 +172,7 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.10.0</version><!-- 1.11 error: There are more than one class as root element for this version -->
+ <version>1.11</version>
<configuration>
<models>
<model>src/main/mdo/antrun.mdo</model>
@@ -184,23 +187,23 @@ under the License.
<goal>java</goal>
</goals>
</execution>
- <execution>
- <id>resources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xsd</goal>
- </goals>
- <configuration>
- <outputDirectory>target/generated-site/resources/xsd</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>documentation</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- </goals>
- </execution>
+<!-- <execution> --><!-- error: There are more than one class as root element for this version -->
+<!-- <id>resources</id> -->
+<!-- <phase>pre-site</phase> -->
+<!-- <goals> -->
+<!-- <goal>xsd</goal> -->
+<!-- </goals> -->
+<!-- <configuration> -->
+<!-- <outputDirectory>target/generated-site/resources/xsd</outputDirectory> -->
+<!-- </configuration> -->
+<!-- </execution> -->
+<!-- <execution> --><!-- error: There are more than one class as root element for this version -->
+<!-- <id>documentation</id> -->
+<!-- <phase>pre-site</phase> -->
+<!-- <goals> -->
+<!-- <goal>xdoc</goal> -->
+<!-- </goals> -->
+<!-- </execution> -->
</executions>
</plugin>
</plugins>