Skip to content

Commit 53561fb

Browse files
committed
[MPIR-424] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
1 parent a91b480 commit 53561fb

16 files changed

+37
-46
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ under the License.
124124
<mavenVersion>3.2.5</mavenVersion>
125125
<scmVersion>1.13.0</scmVersion>
126126
<aetherVersion>1.0.0.v20140518</aetherVersion>
127-
<sitePluginVersion>3.12.0</sitePluginVersion>
127+
<sitePluginVersion>3.12.1</sitePluginVersion>
128128
<fluidoSkinVersion>1.11.1</fluidoSkinVersion>
129129
<surefire.version>2.22.2</surefire.version>
130130
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
@@ -135,12 +135,12 @@ under the License.
135135
<dependency>
136136
<groupId>org.apache.maven.reporting</groupId>
137137
<artifactId>maven-reporting-api</artifactId>
138-
<version>3.1.0</version>
138+
<version>3.1.1</version>
139139
</dependency>
140140
<dependency>
141141
<groupId>org.apache.maven.reporting</groupId>
142142
<artifactId>maven-reporting-impl</artifactId>
143-
<version>3.1.0</version>
143+
<version>3.2.0</version>
144144
<exclusions>
145145
<exclusion>
146146
<groupId>org.apache.maven</groupId>

src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.ResourceBundle;
3535

3636
import org.apache.maven.artifact.repository.ArtifactRepository;
37-
import org.apache.maven.doxia.tools.SiteTool;
3837
import org.apache.maven.execution.MavenSession;
3938
import org.apache.maven.model.Plugin;
4039
import org.apache.maven.plugins.annotations.Component;
@@ -67,14 +66,6 @@ public abstract class AbstractProjectInfoReport
6766
// Mojo components
6867
// ----------------------------------------------------------------------
6968

70-
/**
71-
* SiteTool component.
72-
*
73-
* @since 2.1
74-
*/
75-
@Component
76-
protected SiteTool siteTool;
77-
7869
/**
7970
* Artifact Resolver component.
8071
*/
@@ -103,20 +94,6 @@ public abstract class AbstractProjectInfoReport
10394
@Parameter( defaultValue = "${session}", readonly = true, required = true )
10495
private MavenSession session;
10596

106-
/**
107-
* Local Repository.
108-
*/
109-
@Parameter( property = "localRepository", required = true, readonly = true )
110-
protected ArtifactRepository localRepository;
111-
112-
/**
113-
* Remote repositories used for the project.
114-
*
115-
* @since 2.1
116-
*/
117-
@Parameter( property = "project.remoteArtifactRepositories" )
118-
protected List<ArtifactRepository> remoteRepositories;
119-
12097
/**
12198
* Plugin repositories used for the project.
12299
*

src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public abstract class AbstractProjectInfoTestCase
4949
extends AbstractMojoTestCase
5050
{
5151
private ArtifactStubFactory artifactStubFactory;
52-
52+
5353
/**
5454
* The default locale is English.
5555
*/
@@ -77,7 +77,7 @@ protected void setUp()
7777

7878
artifactStubFactory = new DependencyArtifactStubFactory( getTestFile( "target" ), true, false );
7979
artifactStubFactory.getWorkingDir().mkdirs();
80-
80+
8181
// Set the default Locale
8282
Locale.setDefault( DEFAULT_LOCALE );
8383
}
@@ -180,7 +180,7 @@ protected AbstractProjectInfoReport createReportMojo( String goal, File pluginXm
180180
{
181181
AbstractProjectInfoReport mojo = (AbstractProjectInfoReport) lookupMojo( goal, pluginXmlFile );
182182
assertNotNull( "Mojo found.", mojo );
183-
183+
184184
LegacySupport legacySupport = lookup( LegacySupport.class );
185185
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
186186
DefaultRepositorySystemSession repoSession =
@@ -199,11 +199,10 @@ protected File generateReport( AbstractProjectInfoReport mojo, File pluginXmlFil
199199
mojo.execute();
200200

201201
ProjectBuilder builder = lookup( ProjectBuilder.class );
202-
202+
203203
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
204204
buildingRequest.setRepositorySession( lookup( LegacySupport.class ).getRepositorySession() );
205205

206-
assertNotNull( "Local repository", mojo.localRepository );
207206
testMavenProject = builder.build( pluginXmlFile, buildingRequest ).getProject();
208207

209208
File outputDir = mojo.getReportOutputDirectory();

src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464
assertTrue( response.getContentLength() > 0 );
6565

6666
// Test the Page title
67-
String expectedTitle = getString( "report.ci-management.title" );
67+
String expectedTitle = prepareTitle( "ci mangement project info",
68+
getString( "report.ci-management.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the texts

src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464
assertTrue( response.getContentLength() > 0 );
6565

6666
// Test the Page title
67-
String expectedTitle = getString( "report.dependencies.title" );
67+
String expectedTitle = prepareTitle( "dependencies project info",
68+
getString( "report.dependencies.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the tables

src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public void testReport()
6363
assertTrue( response.getContentLength() > 0 );
6464

6565
// Test the Page title
66-
String expectedTitle = getString( "report.dependency-convergence.reactor.title" );
66+
String expectedTitle = prepareTitle( "dependency convergence project info",
67+
getString( "report.dependency-convergence.reactor.title" ) );
6768
assertEquals( expectedTitle, response.getTitle() );
6869

6970
// Test the texts

src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464
assertTrue( response.getContentLength() > 0 );
6565

6666
// Test the Page title
67-
String expectedTitle = getString( "report.dependency-management.title" );
67+
String expectedTitle = prepareTitle( "dependency management project info",
68+
getString( "report.dependency-management.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the tables

src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464

6565
// Test the Page title
6666
// Index does not have a 'name' but 'title' only
67-
String expectedTitle = getString( "report.index.title" );
67+
String expectedTitle = prepareTitle( "index project info",
68+
getString( "report.index.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the texts

src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464
assertTrue( response.getContentLength() > 0 );
6565

6666
// Test the Page title
67-
String expectedTitle = getString( "report.issue-management.title" );
67+
String expectedTitle = prepareTitle( "issue management project info",
68+
getString( "report.issue-management.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the links

src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public void testReport()
6464
assertTrue( response.getContentLength() > 0 );
6565

6666
// Test the Page title
67-
String expectedTitle = getString( "report.licenses.title" );
67+
String expectedTitle = prepareTitle( "licenses project info",
68+
getString( "report.licenses.title" ) );
6869
assertEquals( expectedTitle, response.getTitle() );
6970

7071
// Test the texts
@@ -98,7 +99,8 @@ public void testReportLinksOnly()
9899
assertTrue( response.getContentLength() > 0 );
99100

100101
// Test the Page title
101-
String expectedTitle = getString( "report.licenses.title" );
102+
String expectedTitle = prepareTitle( "licenses project info",
103+
getString( "report.licenses.title" ) );
102104
assertEquals( expectedTitle, response.getTitle() );
103105

104106
// Test the texts

0 commit comments

Comments
 (0)