You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/02/06 00:55:07 UTC
[maven-site-plugin] branch dependency-updates updated (ae2a8b8 -> b340cf8)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.
discard ae2a8b8 [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
discard 68b75a4 [MSITE-881] Upgrade Maven Reporting API to 3.1.0
omit 2c749a2 Update ITs (for MSITE-881/MSITE-882)
new 61d9b21 Update ITs (for MSITE-881/MSITE-882)
new fdf3b8b [MSITE-881] Upgrade Maven Reporting API to 3.1.0
new b340cf8 [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ae2a8b8)
\
N -- N -- N refs/heads/dependency-updates (b340cf8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 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.
Summary of changes:
pom.xml | 2 +-
src/it/projects/MSITE-159/pom.xml | 7 -------
src/it/projects/MSITE-265/pom.xml | 7 -------
src/it/projects/MSITE-458/pom.xml | 7 -------
src/it/projects/MSITE-497/pom.xml | 9 +--------
src/it/projects/MSITE-566/pom.xml | 7 -------
src/it/projects/MSITE-582/pom.xml | 7 -------
src/it/projects/MSITE-609/pom.xml | 7 -------
src/it/projects/MSITE-658/pom.xml | 7 -------
src/it/projects/MSITE-723/pom.xml | 9 +--------
src/it/projects/inheritance-interpolation/pom.xml | 7 -------
src/it/projects/inheritance-interpolation/repo-parent/pom.xml | 7 -------
src/it/projects/inheritedMenus/parentAsRef/pom.xml | 7 -------
src/it/projects/inheritedMenus/parentNotAsRef/pom.xml | 7 -------
src/it/projects/inheritedMenus/pom.xml | 7 -------
src/it/projects/resources/pom.xml | 7 -------
src/it/projects/site-deploy/pom.xml | 7 -------
src/it/projects/site-inheritance/aggregator/pom.xml | 7 -------
src/it/projects/site-inheritance/module/pom.xml | 7 -------
src/it/projects/site-inheritance/parent/pom.xml | 7 -------
src/it/projects/site-inheritance/pom.xml | 7 -------
src/it/projects/site-jar/pom.xml | 7 -------
src/it/projects/site-sd-lang/pom.xml | 7 -------
src/it/projects/site-sd/pom.xml | 7 -------
src/it/projects/template-skin/pom.xml | 7 -------
src/it/projects/validate/src/site/fml/faq.fml | 2 +-
src/it/projects/validate/src/site/xdoc/xdoc.xml | 2 +-
27 files changed, 5 insertions(+), 173 deletions(-)
[maven-site-plugin] 03/03: [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit b340cf8d651c059697a0df479d7630521c6c7493
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 25 23:26:45 2022 +0100
[MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ca7679a..64e356d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-exec</artifactId>
- <version>1.5.1</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
[maven-site-plugin] 01/03: Update ITs (for MSITE-881/MSITE-882)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 61d9b21550b55d3909beec6465620f2e38751a4e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 25 23:06:04 2022 +0100
Update ITs (for MSITE-881/MSITE-882)
---
pom.xml | 6 +++---
src/it/projects/MSITE-159/pom.xml | 7 -------
src/it/projects/MSITE-265/pom.xml | 7 -------
src/it/projects/MSITE-458/pom.xml | 7 -------
.../projects/MSITE-484/parent-usage-test/pom.xml | 2 +-
src/it/projects/MSITE-497/pom.xml | 9 +--------
.../projects/MSITE-512/parent-usage-test/pom.xml | 2 +-
src/it/projects/MSITE-566/pom.xml | 7 -------
src/it/projects/MSITE-582/pom.xml | 7 -------
src/it/projects/MSITE-609/pom.xml | 7 -------
src/it/projects/MSITE-658/pom.xml | 7 -------
src/it/projects/MSITE-723/pom.xml | 9 +--------
src/it/projects/default-reports/verify.groovy | 7 +++++--
src/it/projects/failure/pom.xml | 2 +-
src/it/projects/full-reporting/pom.xml | 22 ++++++++++++++++------
src/it/projects/full-reporting/verify.groovy | 16 ++++++++--------
src/it/projects/inheritance-interpolation/pom.xml | 7 -------
.../inheritance-interpolation/repo-parent/pom.xml | 7 -------
src/it/projects/inheritedMenus/parentAsRef/pom.xml | 7 -------
.../projects/inheritedMenus/parentNotAsRef/pom.xml | 7 -------
src/it/projects/inheritedMenus/pom.xml | 7 -------
src/it/projects/report-changes-generation/pom.xml | 8 +-------
.../src/changes/changes.xml | 2 +-
.../projects/report-changes-generation/verify.bsh | 21 +++------------------
src/it/projects/reportConfig/pom.xml | 4 ++--
src/it/projects/reportConfig/verify.groovy | 2 +-
src/it/projects/resources/pom.xml | 7 -------
src/it/projects/site-deploy/pom.xml | 7 -------
.../projects/site-inheritance/aggregator/pom.xml | 7 -------
src/it/projects/site-inheritance/module/pom.xml | 7 -------
src/it/projects/site-inheritance/parent/pom.xml | 7 -------
src/it/projects/site-inheritance/pom.xml | 7 -------
src/it/projects/site-jar/pom.xml | 7 -------
src/it/projects/site-sd-lang/pom.xml | 7 -------
src/it/projects/site-sd/pom.xml | 7 -------
src/it/projects/template-skin/pom.xml | 7 -------
src/it/projects/validate/src/site/fml/faq.fml | 2 +-
src/it/projects/validate/src/site/xdoc/xdoc.xml | 2 +-
38 files changed, 47 insertions(+), 223 deletions(-)
diff --git a/pom.xml b/pom.xml
index d366fac..b3e417f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,11 +207,11 @@ under the License.
<slf4jVersion>1.7.32</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
- <javadocPluginVersion>3.2.0</javadocPluginVersion>
+ <javadocPluginVersion>3.3.2-SNAPSHOT</javadocPluginVersion>
<pmdPluginVersion>3.11.0</pmdPluginVersion>
- <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+ <projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
<surefirePluginVersion>2.22.2</surefirePluginVersion>
- <surefire.version>2.22.2</surefire.version>
+ <surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2021-12-22T09:25:46Z</project.build.outputTimestamp>
</properties>
diff --git a/src/it/projects/MSITE-159/pom.xml b/src/it/projects/MSITE-159/pom.xml
index 6eca69a..e2f3c88 100644
--- a/src/it/projects/MSITE-159/pom.xml
+++ b/src/it/projects/MSITE-159/pom.xml
@@ -47,13 +47,6 @@ under the License.
<configuration>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-265/pom.xml b/src/it/projects/MSITE-265/pom.xml
index 77dbc89..7142d90 100644
--- a/src/it/projects/MSITE-265/pom.xml
+++ b/src/it/projects/MSITE-265/pom.xml
@@ -44,13 +44,6 @@ under the License.
<configuration>
<locales>en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN</locales>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/MSITE-458/pom.xml b/src/it/projects/MSITE-458/pom.xml
index 43a8d34..e6f60b0 100644
--- a/src/it/projects/MSITE-458/pom.xml
+++ b/src/it/projects/MSITE-458/pom.xml
@@ -44,13 +44,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-484/parent-usage-test/pom.xml b/src/it/projects/MSITE-484/parent-usage-test/pom.xml
index f7a817b..42913a3 100644
--- a/src/it/projects/MSITE-484/parent-usage-test/pom.xml
+++ b/src/it/projects/MSITE-484/parent-usage-test/pom.xml
@@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>3.1.1</version>
</plugin>
<!-- Overriding an inherited plugin -->
<plugin>
diff --git a/src/it/projects/MSITE-497/pom.xml b/src/it/projects/MSITE-497/pom.xml
index ceec263..df20b82 100644
--- a/src/it/projects/MSITE-497/pom.xml
+++ b/src/it/projects/MSITE-497/pom.xml
@@ -74,7 +74,7 @@ under the License.
<id>maven-3</id>
<activation>
<file>
- <!-- This employs that the basedir expression is only recognized
+ <!-- This employs that the basedir expression is only recognized
by Maven 3.x (see MNG-2363) -->
<exists>${basedir}</exists>
</file>
@@ -86,13 +86,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-512/parent-usage-test/pom.xml b/src/it/projects/MSITE-512/parent-usage-test/pom.xml
index bde29de..ca892fc 100644
--- a/src/it/projects/MSITE-512/parent-usage-test/pom.xml
+++ b/src/it/projects/MSITE-512/parent-usage-test/pom.xml
@@ -79,7 +79,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>3.1.1</version>
</plugin>
</plugins>
diff --git a/src/it/projects/MSITE-566/pom.xml b/src/it/projects/MSITE-566/pom.xml
index 61bd00f..93fc629 100644
--- a/src/it/projects/MSITE-566/pom.xml
+++ b/src/it/projects/MSITE-566/pom.xml
@@ -43,13 +43,6 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-582/pom.xml b/src/it/projects/MSITE-582/pom.xml
index 69801fd..1617b4c 100644
--- a/src/it/projects/MSITE-582/pom.xml
+++ b/src/it/projects/MSITE-582/pom.xml
@@ -41,13 +41,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-609/pom.xml b/src/it/projects/MSITE-609/pom.xml
index 214fcc5..85d4a09 100644
--- a/src/it/projects/MSITE-609/pom.xml
+++ b/src/it/projects/MSITE-609/pom.xml
@@ -49,13 +49,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/MSITE-658/pom.xml b/src/it/projects/MSITE-658/pom.xml
index fb24013..c6299e3 100644
--- a/src/it/projects/MSITE-658/pom.xml
+++ b/src/it/projects/MSITE-658/pom.xml
@@ -46,13 +46,6 @@ under the License.
<configuration>
<locales>en,de</locales>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/MSITE-723/pom.xml b/src/it/projects/MSITE-723/pom.xml
index 78f53a2..f7818e3 100644
--- a/src/it/projects/MSITE-723/pom.xml
+++ b/src/it/projects/MSITE-723/pom.xml
@@ -22,7 +22,7 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>maven-site-index-test</groupId>
<artifactId>MSITE-723</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -64,13 +64,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/default-reports/verify.groovy b/src/it/projects/default-reports/verify.groovy
index 3c4041d..6a3ccac 100644
--- a/src/it/projects/default-reports/verify.groovy
+++ b/src/it/projects/default-reports/verify.groovy
@@ -20,6 +20,9 @@
sitedir = new File( basedir, 'target/site' );
+assert new File( sitedir, 'dependency-info.html' ).exists();
assert new File( sitedir, 'index.html' ).exists();
-assert new File( sitedir, 'team-list.html' ).exists();
-assert new File( sitedir, 'dependencies.html' ).exists();
+assert new File( sitedir, 'plugin-management.html' ).exists();
+assert new File( sitedir, 'plugins.html' ).exists();
+assert new File( sitedir, 'project-info.html' ).exists();
+assert new File( sitedir, 'summary.html' ).exists();
diff --git a/src/it/projects/failure/pom.xml b/src/it/projects/failure/pom.xml
index 36ccc96..b0008d4 100644
--- a/src/it/projects/failure/pom.xml
+++ b/src/it/projects/failure/pom.xml
@@ -99,7 +99,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml
index 50b5345..f5399a6 100644
--- a/src/it/projects/full-reporting/pom.xml
+++ b/src/it/projects/full-reporting/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>31</version>
+ <version>34</version>
</parent>
<groupId>org.apache.maven.plugins.site.its</groupId>
@@ -34,6 +34,11 @@ under the License.
<name>maven-site-plugin IT: full reporting</name>
+ <issueManagement>
+ <system>default</system>
+ <url>http://localhost/issues</url>
+ </issueManagement>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -93,13 +98,13 @@ under the License.
<reports>
<report>index</report>
<report>summary</report>
- <report>license</report>
- <report>project-team</report>
+ <report>licenses</report>
+ <report>team</report>
<report>scm</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
+ <report>issue-management</report>
+ <report>mailing-lists</report>
<report>dependencies</report>
- <report>cim</report>
+ <report>ci-management</report>
<report>plugin-management</report>
<report>plugins</report>
</reports>
@@ -124,6 +129,11 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@checkstylePluginVersion@</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/full-reporting/verify.groovy b/src/it/projects/full-reporting/verify.groovy
index 4eaf07e..7c08f59 100644
--- a/src/it/projects/full-reporting/verify.groovy
+++ b/src/it/projects/full-reporting/verify.groovy
@@ -38,7 +38,7 @@ assert new File( sitedir, 'xref/index.html' ).exists();
assert new File( sitedir, 'xref-test/index.html' ).exists();
assert new File( sitedir, 'taglist.html' ).exists();
-assert new File( sitedir, 'team-list.html' ).exists();
+assert new File( sitedir, 'team.html' ).exists();
assert new File( sitedir, 'dependencies.html' ).exists();
content = new File( sitedir, 'dependencies.html' ).text;
@@ -46,14 +46,14 @@ assert content.contains( 'junit:junit:jar:3.8.2' );
// check reports order
String[] reports = [ 'index', // <report>index</report>
- 'project-summary', // <report>summary</report>
- 'license', // <report>license</report>
- 'team-list', // <report>project-team</report>
- 'source-repository', // <report>scm</report>
- 'issue-tracking', // <report>issue-tracking</report>
- 'mail-lists', // <report>mailing-list</report>
+ 'summary', // <report>summary</report>
+ 'licenses', // <report>licenses</report>
+ 'team', // <report>team</report>
+ 'scm', // <report>scm</report>
+ 'issue-management', // <report>issue-management</report>
+ 'mailing-lists', // <report>mailing-lists</report>
'dependencies', // <report>dependencies</report>
- 'integration', // <report>cim</report>
+ 'ci-management', // <report>ci-management</report>
'plugin-management', // <report>plugin-management</report>
'plugins' // <report>plugins</report>
];
diff --git a/src/it/projects/inheritance-interpolation/pom.xml b/src/it/projects/inheritance-interpolation/pom.xml
index 4808e03..8ad5f6c 100644
--- a/src/it/projects/inheritance-interpolation/pom.xml
+++ b/src/it/projects/inheritance-interpolation/pom.xml
@@ -49,13 +49,6 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
index 46b4782..7494a6c 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -67,13 +67,6 @@ under the License.
</goals>
</execution>
</executions>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/inheritedMenus/parentAsRef/pom.xml b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
index d98d1e2..a8bc396 100644
--- a/src/it/projects/inheritedMenus/parentAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentAsRef/pom.xml
@@ -46,13 +46,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
index e077fc3..56f23e2 100644
--- a/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
+++ b/src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
@@ -46,13 +46,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/inheritedMenus/pom.xml b/src/it/projects/inheritedMenus/pom.xml
index 5006878..e943ff3 100644
--- a/src/it/projects/inheritedMenus/pom.xml
+++ b/src/it/projects/inheritedMenus/pom.xml
@@ -40,13 +40,6 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/report-changes-generation/pom.xml b/src/it/projects/report-changes-generation/pom.xml
index 34be77e..ca7eb28 100644
--- a/src/it/projects/report-changes-generation/pom.xml
+++ b/src/it/projects/report-changes-generation/pom.xml
@@ -47,7 +47,7 @@
</issueManagement>
<properties>
- <changesPluginVersion>2.1</changesPluginVersion>
+ <changesPluginVersion>2.12.1</changesPluginVersion>
</properties>
<build>
@@ -57,9 +57,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${changesPluginVersion}</version>
- <configuration>
- <issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -96,9 +93,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>${changesPluginVersion}</version>
- <configuration>
- <issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
- </configuration>
<reportSets>
<reportSet>
<reports>
diff --git a/src/it/projects/report-changes-generation/src/changes/changes.xml b/src/it/projects/report-changes-generation/src/changes/changes.xml
index a3ce68e..b09bbee 100644
--- a/src/it/projects/report-changes-generation/src/changes/changes.xml
+++ b/src/it/projects/report-changes-generation/src/changes/changes.xml
@@ -42,7 +42,7 @@ under the License.
</action>
<action dev="you" type="update" system="bugzilla">
Handle different issue systems.
- <fixes issue="bug-12345"/>
+ <fixes issue="BUG-12345"/>
<dueto name="John Doe" email="john@doe.com"/>
</action>
<action dev="him" type="update">
diff --git a/src/it/projects/report-changes-generation/verify.bsh b/src/it/projects/report-changes-generation/verify.bsh
index fb3946e..27bbd10 100644
--- a/src/it/projects/report-changes-generation/verify.bsh
+++ b/src/it/projects/report-changes-generation/verify.bsh
@@ -35,42 +35,27 @@ try
}
String reportContent = FileUtils.fileRead( report );
- int indexOf = reportContent.indexOf( "Changes Report" );
+ int indexOf = reportContent.indexOf( "Changes" );
if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains Changes Report title" );
return false;
}
- indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
+ indexOf = reportContent.indexOf( "href=\"http://localhost/MCHANGES-88\"" );
if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains jira issue link" );
return false;
}
- // Test for output problem caused by only using <dueTo> elements
- indexOf = reportContent.indexOf( "Thanks to , " );
- if ( indexOf != -1 )
- {
- System.err.println( "changes-report.html has too many dueTos in the Map" );
- return false;
- }
-
// Tests output problems caused by only using <fixes> element
- indexOf = reportContent.indexOf( "bug-12345" );
+ indexOf = reportContent.indexOf( "BUG-12345" );
if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );
return false;
}
- indexOf = reportContent.indexOf( "Fixes ." );
- if ( indexOf != -1 )
- {
- System.err.println( "changes-report.html doesn't handle empty fixes attribute properly" );
- return false;
- }
-
}
catch ( Throwable e )
{
diff --git a/src/it/projects/reportConfig/pom.xml b/src/it/projects/reportConfig/pom.xml
index c86748b..5a12ce0 100644
--- a/src/it/projects/reportConfig/pom.xml
+++ b/src/it/projects/reportConfig/pom.xml
@@ -75,10 +75,10 @@ under the License.
<reportSet>
<reports>
<report>index</report>
- <report>license</report>
+ <report>licenses</report>
</reports>
</reportSet>
- </reportSets>
+ </reportSets>
</plugin>
</plugins>
</reporting>
diff --git a/src/it/projects/reportConfig/verify.groovy b/src/it/projects/reportConfig/verify.groovy
index 0a5b677..195a2e0 100644
--- a/src/it/projects/reportConfig/verify.groovy
+++ b/src/it/projects/reportConfig/verify.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-File f = new File( basedir, 'target/site/license.html' )
+File f = new File( basedir, 'target/site/licenses.html' )
assert f.exists();
content = f.text;
diff --git a/src/it/projects/resources/pom.xml b/src/it/projects/resources/pom.xml
index 66310f6..c472248 100644
--- a/src/it/projects/resources/pom.xml
+++ b/src/it/projects/resources/pom.xml
@@ -47,13 +47,6 @@ under the License.
<configuration>
<generateReports>false</generateReports>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/site-deploy/pom.xml b/src/it/projects/site-deploy/pom.xml
index 99255c4..163090d 100644
--- a/src/it/projects/site-deploy/pom.xml
+++ b/src/it/projects/site-deploy/pom.xml
@@ -49,13 +49,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/site-inheritance/aggregator/pom.xml b/src/it/projects/site-inheritance/aggregator/pom.xml
index df4ff69..8f88c3c 100644
--- a/src/it/projects/site-inheritance/aggregator/pom.xml
+++ b/src/it/projects/site-inheritance/aggregator/pom.xml
@@ -47,13 +47,6 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/site-inheritance/module/pom.xml b/src/it/projects/site-inheritance/module/pom.xml
index 09bde98..431ea1d 100644
--- a/src/it/projects/site-inheritance/module/pom.xml
+++ b/src/it/projects/site-inheritance/module/pom.xml
@@ -46,13 +46,6 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/www/website/module</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/www/website/module</stagingSiteURL>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/site-inheritance/parent/pom.xml b/src/it/projects/site-inheritance/parent/pom.xml
index 4b061c0..f62ccda 100644
--- a/src/it/projects/site-inheritance/parent/pom.xml
+++ b/src/it/projects/site-inheritance/parent/pom.xml
@@ -47,13 +47,6 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/site-inheritance/pom.xml b/src/it/projects/site-inheritance/pom.xml
index a1d453e..c06ed59 100644
--- a/src/it/projects/site-inheritance/pom.xml
+++ b/src/it/projects/site-inheritance/pom.xml
@@ -47,13 +47,6 @@ under the License.
<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/junk/</stagingDirectory>
<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/junk/</stagingSiteURL>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/site-jar/pom.xml b/src/it/projects/site-jar/pom.xml
index d1fa668..0bf8b83 100644
--- a/src/it/projects/site-jar/pom.xml
+++ b/src/it/projects/site-jar/pom.xml
@@ -57,13 +57,6 @@ under the License.
</manifestEntries>
</archive>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/src/it/projects/site-sd-lang/pom.xml b/src/it/projects/site-sd-lang/pom.xml
index 690e956..63fde74 100755
--- a/src/it/projects/site-sd-lang/pom.xml
+++ b/src/it/projects/site-sd-lang/pom.xml
@@ -45,13 +45,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
<configuration>
<locales>en,fr</locales>
</configuration>
diff --git a/src/it/projects/site-sd/pom.xml b/src/it/projects/site-sd/pom.xml
index 015aca0..aae7c5c 100644
--- a/src/it/projects/site-sd/pom.xml
+++ b/src/it/projects/site-sd/pom.xml
@@ -49,13 +49,6 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/template-skin/pom.xml b/src/it/projects/template-skin/pom.xml
index f535519..bde0432 100644
--- a/src/it/projects/template-skin/pom.xml
+++ b/src/it/projects/template-skin/pom.xml
@@ -47,13 +47,6 @@ under the License.
<att1>val1</att1>
</attributes>
</configuration>
- <dependencies><!-- TODO remove when prerequisite is Java 7 -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/it/projects/validate/src/site/fml/faq.fml b/src/it/projects/validate/src/site/fml/faq.fml
index a31de08..7e74f66 100644
--- a/src/it/projects/validate/src/site/fml/faq.fml
+++ b/src/it/projects/validate/src/site/fml/faq.fml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<faqs xmlns="http://maven.apache.org/FML/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0 https://maven.apache.org/xsd/fml-1.0.xsd"
id="General FAQ">
<part id="General">
<faq id="where">
diff --git a/src/it/projects/validate/src/site/xdoc/xdoc.xml b/src/it/projects/validate/src/site/xdoc/xdoc.xml
index f75896d..c438ae8 100644
--- a/src/it/projects/validate/src/site/xdoc/xdoc.xml
+++ b/src/it/projects/validate/src/site/xdoc/xdoc.xml
@@ -20,7 +20,7 @@ under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Welcome</title>
<author email="dev@maven.apache.org">The Maven Team</author>
[maven-site-plugin] 02/03: [MSITE-881] Upgrade Maven Reporting API to 3.1.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit fdf3b8b8442668ab82212f092833fff56e2146de
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 25 23:11:25 2022 +0100
[MSITE-881] Upgrade Maven Reporting API to 3.1.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b3e417f..ca7679a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>