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>

0 commit comments

Comments
 (0)