Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency updates #69

Merged
merged 3 commits into from
Feb 13, 2022
Merged

Dependency updates #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca1960
[MSITE-883] Upgrade plugins in ITs
michael-o Jan 25, 2022
09d2f6f
[MSITE-881] Upgrade Maven Reporting API to 3.1.0
michael-o Jan 25, 2022
26979ff
[MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
michael-o Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,24 +207,25 @@ under the License.
<slf4jVersion>1.7.32</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
<javadocPluginVersion>3.2.0</javadocPluginVersion>
<javadocPluginVersion>3.3.2</javadocPluginVersion>
<pmdPluginVersion>3.11.0</pmdPluginVersion>
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
<jxrPluginVersion>3.1.1</jxrPluginVersion>
<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>

<dependencies>
<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>
<artifactId>maven-reporting-exec</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-159/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-265/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-458/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-484/parent-usage-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<version>@jxrPluginVersion@</version>
</plugin>
<!-- Overriding an inherited plugin -->
<plugin>
Expand Down
9 changes: 1 addition & 8 deletions src/it/projects/MSITE-497/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-512/parent-usage-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<version>@jxrPluginVersion@</version>
</plugin>

</plugins>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-566/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-582/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-609/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/MSITE-658/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 1 addition & 8 deletions src/it/projects/MSITE-723/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 5 additions & 2 deletions src/it/projects/default-reports/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
2 changes: 1 addition & 1 deletion src/it/projects/failure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 16 additions & 6 deletions src/it/projects/full-reporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand Down
16 changes: 8 additions & 8 deletions src/it/projects/full-reporting/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ 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;
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>
];
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/inheritance-interpolation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/inheritance-interpolation/repo-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/inheritedMenus/parentAsRef/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/inheritedMenus/parentNotAsRef/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/it/projects/inheritedMenus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 1 addition & 7 deletions src/it/projects/report-changes-generation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</issueManagement>

<properties>
<changesPluginVersion>2.1</changesPluginVersion>
<changesPluginVersion>2.12.1</changesPluginVersion>
</properties>

<build>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down