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/01/25 22:26:58 UTC
[maven-site-plugin] branch dependency-updates created (now 3ae49a0)
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.
at 3ae49a0 [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
This branch includes the following new commits:
new 2c749a2 Update ITs (for MSITE-881/MSITE-882)
new 50c8aff [MSITE-881] Upgrade Maven Reporting API to 3.1.0
new 3ae49a0 [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
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.
[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 50c8aff698b86c8744fbefa3614f4ba6f3734a12
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 489641d..0f842be 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-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
[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 3ae49a082c85d3726771825bf024ac8360ed790c
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 0f842be..1cb0eff 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 2c749a2afe968ff4bf631dea4e6683a789c24533
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 +++---
.../projects/MSITE-484/parent-usage-test/pom.xml | 2 +-
.../projects/MSITE-512/parent-usage-test/pom.xml | 2 +-
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/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 +-
12 files changed, 43 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index d366fac..489641d 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.1.2</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-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-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/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/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;