Skip to content

Backport Update to parent 47 to 3.x branch (#1235) #1237

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

Open
Bukama wants to merge 1 commit into
base: maven-site-plugin-3.x
Choose a base branch
from
Open

Backport Update to parent 47 to 3.x branch (#1235) #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>45</version>
<!-- When updating this, also update the parent version of IT "full_reporting" -->
<version>47</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -168,7 +169,7 @@ under the License.
</contributors>

<prerequisites>
<maven>${mavenVersion}</maven>
<maven>3.6.3</maven>
</prerequisites>

<scm>
Expand Down Expand Up @@ -202,20 +203,12 @@ under the License.
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
<checkstylePluginVersion>3.5.0</checkstylePluginVersion>
<javadocPluginVersion>3.10.1</javadocPluginVersion>
<pmdPluginVersion>3.25.0</pmdPluginVersion>
<jxrPluginVersion>3.5.0</jxrPluginVersion>
<projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
<surefirePluginVersion>3.5.1</surefirePluginVersion>
<mavenPluginPluginVersion>3.15.0</mavenPluginPluginVersion>
<taglistPluginVersion>3.2.1</taglistPluginVersion>
<antrunPluginVersion>3.1.0</antrunPluginVersion>
<mavenReportingImplVersion>4.0.0</mavenReportingImplVersion>
<fluidoSkinVersion>2.0.0-M11</fluidoSkinVersion>
<project.build.outputTimestamp>2024-10-18T12:11:03Z</project.build.outputTimestamp>
<!-- remove with parent pom upgrade -->
<version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-159/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-265/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-354/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-456/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-458/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
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 @@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
<configuration>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions src/it/projects/MSITE-484/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
Expand All @@ -72,7 +72,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
8 changes: 4 additions & 4 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 @@ -42,12 +42,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>@version.maven-compiler-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -57,7 +57,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -68,7 +68,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
</plugin>
</plugins>
</reporting>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-504/maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@mavenPluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
<configuration>
<goalPrefix>MSITE-504</goalPrefix>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-504/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
7 changes: 4 additions & 3 deletions src/it/projects/MSITE-506/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.0</version>
<version>@versions.junit5@</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -57,9 +57,10 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
<configuration>
<includeDependencySources>true</includeDependencySources>
<!-- This makes the build fail, because no Javadocs can be generated for the modular JUnit 5)
<includeDependencySources>true</includeDependencySources>-->
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
<reportSets>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-507/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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 @@ -57,7 +57,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
<reportSets>
<reportSet>
<id>single</id>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-548/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-548/root/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-582/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-604/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-609/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
4 changes: 2 additions & 2 deletions src/it/projects/MSITE-627/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>@mavenPluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@mavenPluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-658/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
4 changes: 2 additions & 2 deletions src/it/projects/MSITE-665/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand All @@ -82,7 +82,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@javadocPluginVersion@</version>
<version>@version.maven-javadoc-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
4 changes: 2 additions & 2 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 @@ -44,7 +44,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>@antrunPluginVersion@</version>
<version>@version.maven-antrun-plugin@</version>
<executions>
<execution>
<id>copy-site-files</id>
Expand Down Expand Up @@ -73,7 +73,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
6 changes: 3 additions & 3 deletions src/it/projects/MSITE-842/project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>@mavenPluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -72,7 +72,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@mavenPluginPluginVersion@</version>
<version>@version.maven-plugin-tools@</version>
<configuration>
<goalPrefix>MSITE-842</goalPrefix>
</configuration>
Expand All @@ -91,7 +91,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<configuration>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSITE-856/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
6 changes: 1 addition & 5 deletions src/it/projects/default-reports-excluded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ under the License.
<description>check that MPIR is enabled by default even if not configured</description>
<url>http://maven.apache.org</url>

<properties>
<projectInfoReportsPluginVersion>@projectInfoReportsPluginVersion@</projectInfoReportsPluginVersion>
</properties>

<build>
<plugins>
<plugin>
Expand All @@ -45,7 +41,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/default-reports/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/effective-site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets combine.self="override">
<reportSet>
<reports>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/empty-report-set/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<version>@version.maven-project-info-reports-plugin@</version>
<reportSets>
<!-- this should suppress the default reports -->
<reportSet/>
Expand Down
Loading