This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch doxia-upgrades in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 0c46e3f8212a34d513409a1ab26bc9d57e5c2cbe Author: Michael Osipov <[email protected]> AuthorDate: Mon Apr 30 17:49:28 2018 +0200 [MPIR-345] Upgrade to Doxia 1.8 Partially submitted by Sylwester Lachiewicz <[email protected]> This closes #4 --- pom.xml | 2 +- .../maven/report/projectinfo/AbstractProjectInfoReport.java | 8 ++++---- .../report/projectinfo/DependencyConvergenceReport.java | 12 ++++++------ .../dependencies/renderer/DependenciesRenderer.java | 9 ++++----- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index b1de515..2745037 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ under the License. </distributionManagement> <properties> - <doxiaVersion>1.6</doxiaVersion> + <doxiaVersion>1.8</doxiaVersion> <doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion> <mavenVersion>3.0</mavenVersion> <scmVersion>1.9.5</scmVersion> diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java index b027415..f5d045f 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java @@ -134,7 +134,7 @@ public abstract class AbstractProjectInfoReport */ @Parameter( defaultValue = "${project}", readonly = true, required = true ) protected MavenProject project; - + @Parameter( defaultValue = "${session}", readonly = true, required = true ) private MavenSession session; @@ -154,7 +154,7 @@ public abstract class AbstractProjectInfoReport /** * The reactor projects. - * + * * @since 2.10 */ @Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true ) @@ -319,7 +319,7 @@ public abstract class AbstractProjectInfoReport { return project; } - + protected MavenSession getSession() { return session; @@ -327,7 +327,7 @@ public abstract class AbstractProjectInfoReport /** * Reactor projects - * + * * @return List of projects */ protected List<MavenProject> getReactorProjects() diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java index f6738b4..31697d4 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java +++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java @@ -35,8 +35,8 @@ import java.util.TreeMap; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.model.Dependency; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; @@ -237,7 +237,7 @@ public class DependencyConvergenceReport * * @param locale * @param sink - * @param conflictingDependencyMap + * @param result */ private void generateConvergence( Locale locale, Sink sink, DependencyAnalyzeResult result ) { @@ -320,7 +320,7 @@ public class DependencyConvergenceReport for ( String version : artifactMap.keySet() ) { sink.tableRow(); - sink.tableCell( new SinkEventAttributeSet( new String[] { SinkEventAttributes.WIDTH, "25%" } ) ); + sink.tableCell( new SinkEventAttributeSet( SinkEventAttributes.WIDTH, "25%" ) ); sink.text( version ); sink.tableCell_(); @@ -545,7 +545,7 @@ public class DependencyConvergenceReport * * @param locale * @param sink - * @param dependencyMap + * @param result */ private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult result ) { @@ -748,11 +748,11 @@ public class DependencyConvergenceReport ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest( getSession().getProjectBuildingRequest() ); - + for ( MavenProject reactorProject : reactorProjects ) { buildingRequest.setProject( reactorProject ); - + DependencyNode node = getNode( buildingRequest ); this.projectMap.put( reactorProject, node ); diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java index e87b4b5..d8e2c71 100644 --- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java +++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java @@ -41,8 +41,8 @@ import java.util.TreeSet; import org.apache.maven.artifact.Artifact; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.HtmlTools; import org.apache.maven.model.License; import org.apache.maven.plugin.logging.Log; @@ -145,7 +145,7 @@ public class DependenciesRenderer } /** - * + * /** * Default constructor. * @@ -161,7 +161,7 @@ public class DependenciesRenderer * @param projectBuilder {@link ProjectBuilder} * @param buildingRequest {@link ProjectBuildingRequest} */ - public DependenciesRenderer( Sink sink, Locale locale, I18N i18n, Log log, + public DependenciesRenderer( Sink sink, Locale locale, I18N i18n, Log log, Dependencies dependencies, DependencyNode dependencyTreeNode, DependenciesReportConfiguration config, RepositoryUtils repoUtils, RepositorySystem repositorySystem, ProjectBuilder projectBuilder, @@ -682,8 +682,7 @@ public class DependenciesRenderer { if ( title != null ) { - SinkEventAttributes attributes = new SinkEventAttributeSet( SinkEventAttributes.TITLE, title ); - sink.tableHeaderCell( attributes ); + sink.tableHeaderCell( new SinkEventAttributeSet( SinkEventAttributes.TITLE, title ) ); } else { -- To stop receiving notification emails like this one, please contact [email protected].
