Skip to content

Commit eca1960

Browse files
michael-omichael-o
committed
[MSITE-883] Upgrade plugins in ITs
* Maven Javadoc Plugin to 3.3.2 * Maven JXR Plugin to 3.1.1 * Maven Project Info Reports Plugin to 3.2.1 * Maven Changelog Plugin to 2.3 * Taglist Maven Plugin to 3.0.0 * Maven Changes Plugin to 2.12.1
1 parent db0ed41 commit eca1960

File tree

38 files changed

+48
-223
lines changed

38 files changed

+48
-223
lines changed

‎pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,12 @@ under the License.
207207
<slf4jVersion>1.7.32</slf4jVersion>
208208
<!-- for ITs -->
209209
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
210-
<javadocPluginVersion>3.2.0</javadocPluginVersion>
210+
<javadocPluginVersion>3.3.2</javadocPluginVersion>
211211
<pmdPluginVersion>3.11.0</pmdPluginVersion>
212-
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
212+
<jxrPluginVersion>3.1.1</jxrPluginVersion>
213+
<projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
213214
<surefirePluginVersion>2.22.2</surefirePluginVersion>
214-
<surefire.version>2.22.2</surefire.version>
215+
<surefire.version>2.22.2</surefire.version>
215216
<project.build.outputTimestamp>2021-12-22T09:25:46Z</project.build.outputTimestamp>
216217
</properties>
217218

‎src/it/projects/MSITE-159/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@ under the License.
4747
<configuration>
4848
<relativizeDecorationLinks>false</relativizeDecorationLinks>
4949
</configuration>
50-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
51-
<dependency>
52-
<groupId>org.apache.maven.doxia</groupId>
53-
<artifactId>doxia-module-markdown</artifactId>
54-
<version>1.7</version>
55-
</dependency>
56-
</dependencies>
5750
</plugin>
5851
</plugins>
5952
</pluginManagement>

‎src/it/projects/MSITE-265/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ under the License.
4444
<configuration>
4545
<locales>en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN</locales>
4646
</configuration>
47-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
48-
<dependency>
49-
<groupId>org.apache.maven.doxia</groupId>
50-
<artifactId>doxia-module-markdown</artifactId>
51-
<version>1.7</version>
52-
</dependency>
53-
</dependencies>
5447
</plugin>
5548
</plugins>
5649
</build>

‎src/it/projects/MSITE-458/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ under the License.
4444
<plugin>
4545
<artifactId>maven-site-plugin</artifactId>
4646
<version>@project.version@</version>
47-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
48-
<dependency>
49-
<groupId>org.apache.maven.doxia</groupId>
50-
<artifactId>doxia-module-markdown</artifactId>
51-
<version>1.7</version>
52-
</dependency>
53-
</dependencies>
5447
</plugin>
5548
</plugins>
5649
</pluginManagement>

‎src/it/projects/MSITE-484/parent-usage-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ under the License.
4747
<plugin>
4848
<groupId>org.apache.maven.plugins</groupId>
4949
<artifactId>maven-jxr-plugin</artifactId>
50-
<version>2.1</version>
50+
<version>@jxrPluginVersion@</version>
5151
</plugin>
5252
<!-- Overriding an inherited plugin -->
5353
<plugin>

‎src/it/projects/MSITE-497/pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ under the License.
7474
<id>maven-3</id>
7575
<activation>
7676
<file>
77-
<!-- This employs that the basedir expression is only recognized
77+
<!-- This employs that the basedir expression is only recognized
7878
by Maven 3.x (see MNG-2363) -->
7979
<exists>${basedir}</exists>
8080
</file>
@@ -86,13 +86,6 @@ under the License.
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-site-plugin</artifactId>
8888
<version>@project.version@</version>
89-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
90-
<dependency>
91-
<groupId>org.apache.maven.doxia</groupId>
92-
<artifactId>doxia-module-markdown</artifactId>
93-
<version>1.7</version>
94-
</dependency>
95-
</dependencies>
9689
</plugin>
9790
</plugins>
9891
</pluginManagement>

‎src/it/projects/MSITE-512/parent-usage-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ under the License.
7979
<plugin>
8080
<groupId>org.apache.maven.plugins</groupId>
8181
<artifactId>maven-jxr-plugin</artifactId>
82-
<version>2.1</version>
82+
<version>@jxrPluginVersion@</version>
8383
</plugin>
8484

8585
</plugins>

‎src/it/projects/MSITE-566/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ under the License.
4343
<configuration>
4444
<generateReports>false</generateReports>
4545
</configuration>
46-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
47-
<dependency>
48-
<groupId>org.apache.maven.doxia</groupId>
49-
<artifactId>doxia-module-markdown</artifactId>
50-
<version>1.7</version>
51-
</dependency>
52-
</dependencies>
5346
</plugin>
5447
</plugins>
5548
</pluginManagement>

‎src/it/projects/MSITE-582/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ under the License.
4141
<plugin>
4242
<artifactId>maven-site-plugin</artifactId>
4343
<version>@project.version@</version>
44-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
45-
<dependency>
46-
<groupId>org.apache.maven.doxia</groupId>
47-
<artifactId>doxia-module-markdown</artifactId>
48-
<version>1.7</version>
49-
</dependency>
50-
</dependencies>
5144
</plugin>
5245
</plugins>
5346
</pluginManagement>

‎src/it/projects/MSITE-609/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ under the License.
4949
<plugin>
5050
<artifactId>maven-site-plugin</artifactId>
5151
<version>@project.version@</version>
52-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
53-
<dependency>
54-
<groupId>org.apache.maven.doxia</groupId>
55-
<artifactId>doxia-module-markdown</artifactId>
56-
<version>1.7</version>
57-
</dependency>
58-
</dependencies>
5952
</plugin>
6053
</plugins>
6154
</build>

‎src/it/projects/MSITE-658/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ under the License.
4646
<configuration>
4747
<locales>en,de</locales>
4848
</configuration>
49-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
50-
<dependency>
51-
<groupId>org.apache.maven.doxia</groupId>
52-
<artifactId>doxia-module-markdown</artifactId>
53-
<version>1.7</version>
54-
</dependency>
55-
</dependencies>
5649
</plugin>
5750
</plugins>
5851
</pluginManagement>

‎src/it/projects/MSITE-723/pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
25-
25+
2626
<groupId>maven-site-index-test</groupId>
2727
<artifactId>MSITE-723</artifactId>
2828
<version>1.0-SNAPSHOT</version>
@@ -64,13 +64,6 @@ under the License.
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-site-plugin</artifactId>
6666
<version>@project.version@</version>
67-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
68-
<dependency>
69-
<groupId>org.apache.maven.doxia</groupId>
70-
<artifactId>doxia-module-markdown</artifactId>
71-
<version>1.7</version>
72-
</dependency>
73-
</dependencies>
7467
</plugin>
7568
</plugins>
7669
</build>

‎src/it/projects/default-reports/verify.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
sitedir = new File( basedir, 'target/site' );
2222

23+
assert new File( sitedir, 'dependency-info.html' ).exists();
2324
assert new File( sitedir, 'index.html' ).exists();
24-
assert new File( sitedir, 'team-list.html' ).exists();
25-
assert new File( sitedir, 'dependencies.html' ).exists();
25+
assert new File( sitedir, 'plugin-management.html' ).exists();
26+
assert new File( sitedir, 'plugins.html' ).exists();
27+
assert new File( sitedir, 'project-info.html' ).exists();
28+
assert new File( sitedir, 'summary.html' ).exists();

‎src/it/projects/failure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ under the License.
9999
<plugins>
100100
<plugin>
101101
<artifactId>maven-changelog-plugin</artifactId>
102-
<version>2.2</version>
102+
<version>2.3</version>
103103
</plugin>
104104
</plugins>
105105
</reporting>

‎src/it/projects/full-reporting/pom.xml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ under the License.
2525
<parent>
2626
<groupId>org.apache.maven</groupId>
2727
<artifactId>maven-parent</artifactId>
28-
<version>31</version>
28+
<version>34</version>
2929
</parent>
3030

3131
<groupId>org.apache.maven.plugins.site.its</groupId>
@@ -34,6 +34,11 @@ under the License.
3434

3535
<name>maven-site-plugin IT: full reporting</name>
3636

37+
<issueManagement>
38+
<system>default</system>
39+
<url>http://localhost/issues</url>
40+
</issueManagement>
41+
3742
<dependencies>
3843
<dependency>
3944
<groupId>junit</groupId>
@@ -93,13 +98,13 @@ under the License.
9398
<reports>
9499
<report>index</report>
95100
<report>summary</report>
96-
<report>license</report>
97-
<report>project-team</report>
101+
<report>licenses</report>
102+
<report>team</report>
98103
<report>scm</report>
99-
<report>issue-tracking</report>
100-
<report>mailing-list</report>
104+
<report>issue-management</report>
105+
<report>mailing-lists</report>
101106
<report>dependencies</report>
102-
<report>cim</report>
107+
<report>ci-management</report>
103108
<report>plugin-management</report>
104109
<report>plugins</report>
105110
</reports>
@@ -124,6 +129,11 @@ under the License.
124129
<artifactId>maven-checkstyle-plugin</artifactId>
125130
<version>@checkstylePluginVersion@</version>
126131
</plugin>
132+
<plugin>
133+
<groupId>org.codehaus.mojo</groupId>
134+
<artifactId>taglist-maven-plugin</artifactId>
135+
<version>3.0.0</version>
136+
</plugin>
127137
</plugins>
128138
</reporting>
129139

‎src/it/projects/full-reporting/verify.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ assert new File( sitedir, 'xref/index.html' ).exists();
3838
assert new File( sitedir, 'xref-test/index.html' ).exists();
3939

4040
assert new File( sitedir, 'taglist.html' ).exists();
41-
assert new File( sitedir, 'team-list.html' ).exists();
41+
assert new File( sitedir, 'team.html' ).exists();
4242

4343
assert new File( sitedir, 'dependencies.html' ).exists();
4444
content = new File( sitedir, 'dependencies.html' ).text;
4545
assert content.contains( 'junit:junit:jar:3.8.2' );
4646

4747
// check reports order
4848
String[] reports = [ 'index', // <report>index</report>
49-
'project-summary', // <report>summary</report>
50-
'license', // <report>license</report>
51-
'team-list', // <report>project-team</report>
52-
'source-repository', // <report>scm</report>
53-
'issue-tracking', // <report>issue-tracking</report>
54-
'mail-lists', // <report>mailing-list</report>
49+
'summary', // <report>summary</report>
50+
'licenses', // <report>licenses</report>
51+
'team', // <report>team</report>
52+
'scm', // <report>scm</report>
53+
'issue-management', // <report>issue-management</report>
54+
'mailing-lists', // <report>mailing-lists</report>
5555
'dependencies', // <report>dependencies</report>
56-
'integration', // <report>cim</report>
56+
'ci-management', // <report>ci-management</report>
5757
'plugin-management', // <report>plugin-management</report>
5858
'plugins' // <report>plugins</report>
5959
];

‎src/it/projects/inheritance-interpolation/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ under the License.
4949
<configuration>
5050
<generateReports>false</generateReports>
5151
</configuration>
52-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
53-
<dependency>
54-
<groupId>org.apache.maven.doxia</groupId>
55-
<artifactId>doxia-module-markdown</artifactId>
56-
<version>1.7</version>
57-
</dependency>
58-
</dependencies>
5952
</plugin>
6053
</plugins>
6154
</build>

‎src/it/projects/inheritance-interpolation/repo-parent/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ under the License.
6767
</goals>
6868
</execution>
6969
</executions>
70-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
71-
<dependency>
72-
<groupId>org.apache.maven.doxia</groupId>
73-
<artifactId>doxia-module-markdown</artifactId>
74-
<version>1.7</version>
75-
</dependency>
76-
</dependencies>
7770
</plugin>
7871
</plugins>
7972
</build>

‎src/it/projects/inheritedMenus/parentAsRef/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ under the License.
4646
<groupId>org.apache.maven.plugins</groupId>
4747
<artifactId>maven-site-plugin</artifactId>
4848
<version>@project.version@</version>
49-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
50-
<dependency>
51-
<groupId>org.apache.maven.doxia</groupId>
52-
<artifactId>doxia-module-markdown</artifactId>
53-
<version>1.7</version>
54-
</dependency>
55-
</dependencies>
5649
</plugin>
5750
</plugins>
5851
</pluginManagement>

‎src/it/projects/inheritedMenus/parentNotAsRef/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ under the License.
4646
<groupId>org.apache.maven.plugins</groupId>
4747
<artifactId>maven-site-plugin</artifactId>
4848
<version>@project.version@</version>
49-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
50-
<dependency>
51-
<groupId>org.apache.maven.doxia</groupId>
52-
<artifactId>doxia-module-markdown</artifactId>
53-
<version>1.7</version>
54-
</dependency>
55-
</dependencies>
5649
</plugin>
5750
</plugins>
5851
</pluginManagement>

‎src/it/projects/inheritedMenus/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ under the License.
4040
<configuration>
4141
<generateReports>false</generateReports>
4242
</configuration>
43-
<dependencies><!-- TODO remove when prerequisite is Java 7 -->
44-
<dependency>
45-
<groupId>org.apache.maven.doxia</groupId>
46-
<artifactId>doxia-module-markdown</artifactId>
47-
<version>1.7</version>
48-
</dependency>
49-
</dependencies>
5043
</plugin>
5144
</plugins>
5245
</pluginManagement>

‎src/it/projects/report-changes-generation/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</issueManagement>
4848

4949
<properties>
50-
<changesPluginVersion>2.1</changesPluginVersion>
50+
<changesPluginVersion>2.12.1</changesPluginVersion>
5151
</properties>
5252

5353
<build>
@@ -57,9 +57,6 @@
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-changes-plugin</artifactId>
5959
<version>${changesPluginVersion}</version>
60-
<configuration>
61-
<issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
62-
</configuration>
6360
</plugin>
6461
</plugins>
6562
</pluginManagement>
@@ -96,9 +93,6 @@
9693
<groupId>org.apache.maven.plugins</groupId>
9794
<artifactId>maven-changes-plugin</artifactId>
9895
<version>${changesPluginVersion}</version>
99-
<configuration>
100-
<issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
101-
</configuration>
10296
<reportSets>
10397
<reportSet>
10498
<reports>

‎src/it/projects/report-changes-generation/src/changes/changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
</action>
4343
<action dev="you" type="update" system="bugzilla">
4444
Handle different issue systems.
45-
<fixes issue="bug-12345"/>
45+
<fixes issue="BUG-12345"/>
4646
<dueto name="John Doe" email="john@doe.com"/>
4747
</action>
4848
<action dev="him" type="update">

0 commit comments

Comments
 (0)