Skip to content

Commit 6171e7d

Browse files
committed
[MSITE-1023] Upgrade plugins and components (in ITs)
1 parent efd8a57 commit 6171e7d

File tree

14 files changed

+36
-32
lines changed

14 files changed

+36
-32
lines changed

pom.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,23 +196,24 @@ under the License.
196196
<javaVersion>8</javaVersion>
197197
<mavenVersion>3.6.3</mavenVersion>
198198
<!-- for dependencies -->
199-
<jettyVersion>9.4.54.v20240208</jettyVersion>
199+
<jettyVersion>9.4.56.v20240826</jettyVersion>
200200
<doxiaVersion>2.0.0</doxiaVersion>
201201
<doxiaSitetoolsVersion>2.0.0</doxiaSitetoolsVersion>
202202
<wagonVersion>3.5.3</wagonVersion>
203203
<slf4jVersion>1.7.36</slf4jVersion>
204204
<!-- for ITs -->
205-
<checkstylePluginVersion>3.3.1</checkstylePluginVersion>
206-
<javadocPluginVersion>3.6.2</javadocPluginVersion>
207-
<pmdPluginVersion>3.21.2</pmdPluginVersion>
208-
<jxrPluginVersion>3.3.2</jxrPluginVersion>
209-
<projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
210-
<surefirePluginVersion>3.2.5</surefirePluginVersion>
211-
<mavenPluginPluginVersion>3.13.0</mavenPluginPluginVersion>
212-
<mavenReportingImplVersion>4.0.0-M15</mavenReportingImplVersion>
213-
<fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion>
205+
<checkstylePluginVersion>3.5.0</checkstylePluginVersion>
206+
<javadocPluginVersion>3.10.1</javadocPluginVersion>
207+
<pmdPluginVersion>3.25.0</pmdPluginVersion>
208+
<jxrPluginVersion>3.5.0</jxrPluginVersion>
209+
<projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
210+
<surefirePluginVersion>3.5.1</surefirePluginVersion>
211+
<mavenPluginPluginVersion>3.15.0</mavenPluginPluginVersion>
212+
<taglistPluginVersion>3.2.1</taglistPluginVersion>
213+
<antrunPluginVersion>3.1.0</antrunPluginVersion>
214+
<mavenReportingImplVersion>4.0.0</mavenReportingImplVersion>
215+
<fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion>
214216
<project.build.outputTimestamp>2024-08-14T15:58:15Z</project.build.outputTimestamp>
215-
216217
</properties>
217218

218219
<dependencies>
@@ -412,7 +413,7 @@ under the License.
412413
<dependency>
413414
<groupId>org.apache.commons</groupId>
414415
<artifactId>commons-lang3</artifactId>
415-
<version>3.14.0</version>
416+
<version>3.17.0</version>
416417
</dependency>
417418

418419
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ under the License.
6565
<plugin>
6666
<groupId>org.codehaus.mojo</groupId>
6767
<artifactId>taglist-maven-plugin</artifactId>
68-
<version>3.0.0</version>
68+
<version>@taglistPluginVersion@</version>
6969
</plugin>
7070
</plugins>
7171
</reporting>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>3.11.0</version>
45+
<version>3.13.0</version>
4646
</plugin>
4747
<plugin>
4848
<groupId>org.apache.maven.plugins</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ under the License.
4444
<plugin>
4545
<groupId>org.apache.maven.plugins</groupId>
4646
<artifactId>maven-antrun-plugin</artifactId>
47-
<version>1.7</version>
47+
<version>@antrunPluginVersion@</version>
4848
<executions>
4949
<execution>
5050
<id>copy-site-files</id>

src/it/projects/MSITE-901/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ under the License.
3434
<plugin>
3535
<groupId>org.apache.maven.plugins</groupId>
3636
<artifactId>maven-pmd-plugin</artifactId>
37-
<version>3.16.0</version>
37+
<version>@pmdPluginVersion@</version>
3838
<executions>
3939
<execution>
4040
<goals>

src/it/projects/effective-site/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ under the License.
2727
<parent>
2828
<groupId>org.apache.maven.plugins</groupId>
2929
<artifactId>maven-plugins</artifactId>
30-
<version>42</version>
30+
<version>43</version>
3131
</parent>
3232

3333
<groupId>org.apache.maven.plugins.site.its</groupId>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.apache.maven</groupId>
2424
<artifactId>maven-parent</artifactId>
25-
<version>42</version>
25+
<version>43</version>
2626
</parent>
2727

2828
<groupId>org.apache.maven.plugins.site.its</groupId>
@@ -37,7 +37,7 @@ under the License.
3737
</issueManagement>
3838

3939
<properties>
40-
<version.maven-fluido-skin>2.0.0-M8</version.maven-fluido-skin>
40+
<version.maven-fluido-skin>@fluidoSkinVersion@</version.maven-fluido-skin>
4141
</properties>
4242

4343
<dependencies>
@@ -74,7 +74,7 @@ under the License.
7474
<dependency>
7575
<groupId>org.apache.maven.shared</groupId>
7676
<artifactId>maven-shared-resources</artifactId>
77-
<version>5</version>
77+
<version>6</version>
7878
</dependency>
7979
</dependencies>
8080
</plugin>
@@ -143,7 +143,10 @@ under the License.
143143
<plugin>
144144
<groupId>org.codehaus.mojo</groupId>
145145
<artifactId>taglist-maven-plugin</artifactId>
146-
<version>3.0.0</version>
146+
<version>@taglistPluginVersion@</version>
147+
<configuration>
148+
<skipEmptyReport>false</skipEmptyReport>
149+
</configuration>
147150
</plugin>
148151
</plugins>
149152
</reporting>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.codehaus.gmaven</groupId>
4444
<artifactId>groovy-maven-plugin</artifactId>
45-
<version>2.0</version>
45+
<version>2.1.1</version>
4646
<executions>
4747
<execution>
4848
<!--phase>pre-site</phase-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<distUrl>scp://from.repo/dist</distUrl>
4242
<msite604.siteId>site-parent-id</msite604.siteId>
4343
<msite604.siteBase>default-repository-base-from-repo-parent</msite604.siteBase>
44-
<fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
44+
<fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
4545
</properties>
4646

4747
<distributionManagement>
@@ -56,7 +56,7 @@ under the License.
5656
<plugin>
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-site-plugin</artifactId>
59-
<version>3.12.1</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
59+
<version>3.20.0</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
6060
<configuration>
6161
<generateReports>false</generateReports>
6262
</configuration>

src/it/projects/new-configuration/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ return true;
2424
assert !new File( basedir, 'target/surefire-reports' ).exists();
2525
assert !new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
2626

27-
assert !new File( basedir, 'target/site/surefire-report.html' ).exists();
27+
assert !new File( basedir, 'target/site/surefire.html' ).exists();
2828
assert new File( basedir, 'target/site/index.html' ).exists();
2929
assert !new File( basedir, 'target/site/checkstyle.html' ).exists();
3030
assert !new File( basedir, 'target/site/cpd.html' ).exists();
@@ -39,4 +39,4 @@ assert !new File( basedir, 'target/site/team-list.html' ).exists();
3939

4040
assert !new File( basedir, 'target/site/dependencies.html' ).exists();
4141

42-
return true;
42+
return true;

src/it/projects/no-version/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' )
2525

2626
assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
2727

28-
assert new File( basedir, 'target/site/surefire-report.html' ).exists();
28+
assert new File( basedir, 'target/site/surefire.html' ).exists();
2929
assert !new File( basedir, 'target/site/index.html' ).exists();
3030

31-
return true;
31+
return true;

src/it/projects/resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ under the License.
5353
<plugins>
5454
<plugin>
5555
<artifactId>maven-antrun-plugin</artifactId>
56-
<version>3.1.0</version>
56+
<version>@antrunPluginVersion@</version>
5757
<executions>
5858
<execution>
5959
<phase>pre-site</phase>

src/it/projects/site-attach-descriptor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ under the License.
6060
</plugin>
6161
<plugin>
6262
<artifactId>maven-deploy-plugin</artifactId>
63-
<version>3.1.0</version>
63+
<version>3.1.3</version>
6464
</plugin>
6565
</plugins>
6666
</pluginManagement>

src/it/projects/surefire-report/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' )
2525

2626
assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
2727

28-
assert new File( basedir, 'target/site/surefire-report.html' ).exists();
28+
assert new File( basedir, 'target/site/surefire.html' ).exists();
2929
assert !new File( basedir, 'target/site/index.html' ).exists();
3030

31-
return true;
31+
return true;

0 commit comments

Comments
 (0)