Skip to content

[MSHARED-1034] Upgrade plugins and components in ITs #11

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

Merged
asfgit merged 1 commit into from
Feb 10, 2022
Merged

[MSHARED-1034] Upgrade plugins and components in ITs #11

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
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
<aetherVersion>1.0.0.v20140518</aetherVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-06-16T19:43:55Z</project.build.outputTimestamp>
<sitePluginVersion>3.10.0</sitePluginVersion>
<projectInfoReportsPluginVersion>3.2.1</projectInfoReportsPluginVersion>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/it/aether/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.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
<version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
Expand All @@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
4 changes: 2 additions & 2 deletions src/it/forked-lifecycle/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.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
<version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
Expand All @@ -53,7 +53,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
5 changes: 3 additions & 2 deletions src/it/pluginManagement_dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
Expand All @@ -62,7 +62,7 @@ under the License.
</pluginManagement>
</build>
<reporting>
<plugins>
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<reportSets>
Expand All @@ -76,6 +76,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
Expand Down
8 changes: 4 additions & 4 deletions src/it/reportConfig/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.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.2</version>
<version>3.1.0</version>
</dependency>
</dependencies>

Expand All @@ -52,7 +52,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7</version>
<version>@sitePluginVersion@</version>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
Expand All @@ -70,14 +70,14 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<version>@projectInfoReportsPluginVersion@</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
</reportSets>
</reportSets>
</plugin>
</plugins>
</reporting>
Expand Down
3 changes: 1 addition & 2 deletions src/it/reportConfig/src/main/java/org/apache/maven/shared/it/ConfigurationReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*/

import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
Expand All @@ -31,7 +30,7 @@
/**
* Report that displays effective parameter values: used to check how report values
* are inherited/overridden from build.pluginManagement and not build.plugins.
*
*
* @goal test
* @phase site
*/
Expand Down